Author: sandervanderburg
Date: Fri Dec 24 15:06:54 2010
New Revision: 25273
URL: https://svn.nixos.org/websvn/nix/?rev=25273&sc=1
Log:
- Added release.nix
- Fixed some headers in the automake files
Added:
disnix/dydisnix/trunk/release.nix
Modified:
disnix/dydisnix/trunk/src/divide/Makefile.am
disnix/dydisnix/trunk/src/minsetcover/Makefile.am
disnix/dydisnix/trunk/src/multiwaycut/Makefile.am
Added: disnix/dydisnix/trunk/release.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ disnix/dydisnix/trunk/release.nix Fri Dec 24 15:06:54 2010 (r25273)
@@ -0,0 +1,37 @@
+{ nixpkgs ? /etc/nixos/nixpkgs }:
+
+let
+ jobs = rec {
+ tarball =
+ { dydisnix ? {outPath = ./.; rev = 1234;}
+ , officialRelease ? false
+ , disnix ? (import ../../disnix/trunk/release.nix {}).build {}
+ }:
+
+ with import nixpkgs {};
+
+ releaseTools.sourceTarball {
+ name = "dydisnix-tarball";
+ version = builtins.readFile ./version;
+ src = dydisnix;
+ inherit officialRelease;
+
+ buildInputs = [ pkgconfig disnix getopt libxml2 glib ];
+ };
+
+ build =
+ { tarball ? jobs.tarball {}
+ , system ? "x86_64-linux"
+ , disnix ? (import ../../disnix/trunk/release.nix {}).build {}
+ }:
+
+ with import nixpkgs { inherit system; };
+
+ releaseTools.nixBuild {
+ name = "dydisnix";
+ src = tarball;
+
+ buildInputs = [ pkgconfig disnix getopt libxml2 glib ];
+ };
+ };
+in jobs
Modified: disnix/dydisnix/trunk/src/divide/Makefile.am
==============================================================================
--- disnix/dydisnix/trunk/src/divide/Makefile.am Fri Dec 24 14:04:10
2010 (r25272)
+++ disnix/dydisnix/trunk/src/divide/Makefile.am Fri Dec 24 15:06:54
2010 (r25273)
@@ -1,6 +1,7 @@
AM_CPPFLAGS = -ggdb
bin_PROGRAMS = dydisnix-divide
+noinst_HEADERS = divide.h
dydisnix_divide_SOURCES = divide.c main.c
dydisnix_divide_LDADD = ../libservices/libservices.la
../libinfproperties/libinfproperties.la ../libmapping/libmapping.la
Modified: disnix/dydisnix/trunk/src/minsetcover/Makefile.am
==============================================================================
--- disnix/dydisnix/trunk/src/minsetcover/Makefile.am Fri Dec 24 14:04:10
2010 (r25272)
+++ disnix/dydisnix/trunk/src/minsetcover/Makefile.am Fri Dec 24 15:06:54
2010 (r25273)
@@ -1,6 +1,7 @@
AM_CPPFLAGS = -ggdb
bin_PROGRAMS = dydisnix-minsetcover
+noinst_HEADERS = minsetcover.h
dydisnix_minsetcover_SOURCES = minsetcover.c main.c
dydisnix_minsetcover_LDADD = ../libservices/libservices.la
../libinfproperties/libinfproperties.la ../libmapping/libmapping.la
../libinvmapping/libinvmapping.la
Modified: disnix/dydisnix/trunk/src/multiwaycut/Makefile.am
==============================================================================
--- disnix/dydisnix/trunk/src/multiwaycut/Makefile.am Fri Dec 24 14:04:10
2010 (r25272)
+++ disnix/dydisnix/trunk/src/multiwaycut/Makefile.am Fri Dec 24 15:06:54
2010 (r25273)
@@ -1,6 +1,7 @@
AM_CPPFLAGS = -ggdb
bin_PROGRAMS = dydisnix-multiwaycut
+noinst_HEADERS = multiwaycut.h
dydisnix_multiwaycut_SOURCES = multiwaycut.c main.c
dydisnix_multiwaycut_LDADD = ../libmapping/libmapping.la
../libinvmapping/libinvmapping.la
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
