Author: MarcWeber Date: 2010-06-15 19:00:48 +0000 (Tue, 15 Jun 2010) New Revision: 22282
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22282&view=rev Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh Log: generic/setup.sh: remove duplication: - add generic showCommand function which prints a command before running it - add runMake which is using that function passing the makefile if set make all make invokations use runMake Changes: Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh =================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh 2010-06-15 18:00:56 UTC (rev 22281) +++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh 2010-06-15 19:00:48 UTC (rev 22282) @@ -73,7 +73,16 @@ addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@" } +cmd(){ + echo "cmd: $@" + "$@" +} +runMake(){ + cmd make ${makefile:+-f $makefile} "$@" +} + + ###################################################################### # Initialisation. @@ -601,9 +610,7 @@ return fi - echo "make flags: $makeFlags ${makeflagsarr...@]} $buildFlags ${buildflagsarr...@]}" - make ${makefile:+-f $makefile} \ - $makeFlags "${makeflagsarr...@]}" \ + runMake $makeFlags "${makeflagsarr...@]}" \ $buildFlags "${buildflagsarr...@]}" runHook postBuild @@ -613,9 +620,7 @@ checkPhase() { runHook preCheck - echo "check flags: $makeFlags ${makeflagsarr...@]} $checkFlags ${checkflagsarr...@]}" - make ${makefile:+-f $makefile} \ - $makeFlags "${makeflagsarr...@]}" \ + runMake $makeFlags "${makeflagsarr...@]}" \ $checkFlags "${checkflagsarr...@]}" ${checkTarget:-check} runHook postCheck @@ -663,8 +668,7 @@ ensureDir "$prefix" installTargets=${installTargets:-install} - echo "install flags: $installTargets $makeFlags ${makeflagsarr...@]} $installFlags ${installflagsarr...@]}" - make ${makefile:+-f $makefile} $installTargets \ + runMake $installTargets \ $makeFlags "${makeflagsarr...@]}" \ $installFlags "${installflagsarr...@]}" @@ -740,8 +744,7 @@ distPhase() { runHook preDist - echo "dist flags: $distFlags ${distflagsarr...@]}" - make ${makefile:+-f $makefile} $distFlags "${distflagsarr...@]}" ${distTarget:-dist} + runMake $distFlags "${distflagsarr...@]}" ${distTarget:-dist} if test "$dontCopyDist" != 1; then ensureDir "$out/tarballs" _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
