Skip to content

Commit

Permalink
* Put the current version in a separate file so that it can be used in
Browse files Browse the repository at this point in the history
  the release expression.
  • Loading branch information
edolstra committed Mar 2, 2009
1 parent 77847c4 commit 0bc577f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = src tests

EXTRA_DIST = COPYING README patchelf.spec patchelf.spec.in
EXTRA_DIST = COPYING README patchelf.spec patchelf.spec.in version

patchelf.spec: patchelf.spec.in
sed -e "s^@version\@^$(VERSION)^g" < patchelf.spec.in > patchelf.spec
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
@@ -1,4 +1,4 @@
AC_INIT(patchelf, m4_esyscmd([echo -n 0.5$VERSION_SUFFIX]))
AC_INIT(patchelf, m4_esyscmd([echo -n $(cat ./version)$VERSION_SUFFIX]))
AC_CONFIG_SRCDIR(Makefile.am)
AM_INIT_AUTOMAKE([dist-bzip2 foreign])

Expand Down
13 changes: 8 additions & 5 deletions release.nix
Expand Up @@ -14,13 +14,14 @@ let

releaseTools.makeSourceTarball {
name = "patchelf-tarball";
version = builtins.readFile ./version;
src = patchelfSrc;
inherit officialRelease;
};


coverage =
{ tarball ? {path = jobs.tarball {};}
{ tarball ? jobs.tarball {}
, nixpkgs ? {path = ../nixpkgs;}
}:

Expand All @@ -34,7 +35,7 @@ let


build =
{ tarball ? {path = jobs.tarball {};}
{ tarball ? jobs.tarball {}
, nixpkgs ? {path = ../nixpkgs;}
, system ? "i686-linux"
}:
Expand All @@ -56,6 +57,8 @@ let
rpm_fedora10i386 = makeRPM_i686 (diskImages: diskImages.fedora10i386) 40;
rpm_fedora10x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora10x86_64) 40;
rpm_opensuse103i386 = makeRPM_i686 (diskImages: diskImages.opensuse103i386) 40;
rpm_opensuse110i386 = makeRPM_i686 (diskImages: diskImages.opensuse110i386) 40;
rpm_opensuse110x86_64 = makeRPM_x86_64 (diskImages: diskImages.opensuse110x86_64) 40;


deb_debian40i386 = makeDeb_i686 (diskImages: diskImages.debian40i386) 40;
Expand All @@ -76,14 +79,14 @@ let

makeRPM =
system: diskImageFun: prio:
{ tarball ? {path = jobs.tarball {};}
{ tarball ? jobs.tarball {}
, nixpkgs ? {path = ../nixpkgs;}
}:

with import nixpkgs.path {inherit system;};

releaseTools.rpmBuild rec {
name = "patchelf-rpm-${diskImage.name}";
name = "patchelf-rpm";
src = tarball;
diskImage = diskImageFun vmTools.diskImages;
meta = { schedulingPriority = toString prio; };
Expand All @@ -95,7 +98,7 @@ let

makeDeb =
system: diskImageFun: prio:
{ tarball ? {path = jobs.tarball {};}
{ tarball ? jobs.tarball {}
, nixpkgs ? {path = ../nixpkgs;}
}:

Expand Down
1 change: 1 addition & 0 deletions version
@@ -0,0 +1 @@
0.5

0 comments on commit 0bc577f

Please sign in to comment.