dnrops
/
patchelf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use the "version suffix" stuff in releaseTools.sourceTarball 

It's confusing.
This commit is contained in:
Eelco Dolstra 2013-03-06 16:58:24 +01:00
parent c9e3ba482a
commit c330f99196
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1,4 +1,4 @@
AC_INIT([patchelf], m4_esyscmd([echo -n $(cat ./version)$VERSION_SUFFIX]))
AC_INIT([patchelf], m4_esyscmd([echo -n $(cat ./version)]))
AC_CONFIG_SRCDIR([src/patchelf.cc])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2 foreign color-tests parallel-tests])

8
release.nix
View File

@ -11,12 +11,12 @@ let
tarball =
pkgs.releaseTools.sourceTarball {
pkgs.releaseTools.sourceTarball rec {
name = "patchelf-tarball";
version = builtins.readFile ./version;
versionSuffix = if officialRelease then "" else "pre${toString patchelfSrc.revCount}_${patchelfSrc.shortRev}";
version = builtins.readFile ./version + (if officialRelease then "" else "pre${toString patchelfSrc.revCount}_${patchelfSrc.shortRev}");
versionSuffix = ""; # obsolete
src = patchelfSrc;
inherit officialRelease;
preAutoconf = "echo ${version} > version";
postDist = ''
cp README $out/
echo "doc readme $out/README" >> $out/nix-support/hydra-build-products