Author: sandervanderburg Date: 2010-06-15 12:23:28 +0000 (Tue, 15 Jun 2010) New Revision: 22277
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22277&view=rev Added: nixpkgs/trunk/pkgs/build-support/dotnetenv/build-solution.nix nixpkgs/trunk/pkgs/build-support/vsenv/build-solution.nix Removed: nixpkgs/trunk/pkgs/build-support/dotnetenv/buildSolution.nix nixpkgs/trunk/pkgs/build-support/vsenv/buildSolution.nix Modified: nixpkgs/trunk/pkgs/build-support/dotnetenv/default.nix nixpkgs/trunk/pkgs/build-support/vsenv/default.nix Log: Renamed buildSolution => build-solution Changes: Copied: nixpkgs/trunk/pkgs/build-support/dotnetenv/build-solution.nix (from rev 22276, nixpkgs/trunk/pkgs/build-support/dotnetenv/buildSolution.nix) =================================================================== --- nixpkgs/trunk/pkgs/build-support/dotnetenv/build-solution.nix (rev 0) +++ nixpkgs/trunk/pkgs/build-support/dotnetenv/build-solution.nix 2010-06-15 12:23:28 UTC (rev 22277) @@ -0,0 +1,61 @@ +{stdenv, dotnetfx}: +{ name +, src +, baseDir ? "." +, slnFile +, targets ? "ReBuild" +, verbosity ? "detailed" +, options ? "/p:Configuration=Debug;Platform=Win32" +, assemblyInputs ? [] +, runtimeAssemblies ? [] +, preBuild ? "" +}: + +stdenv.mkDerivation { + inherit name src preBuild; + + buildInputs = [ dotnetfx ]; + preConfigure = '' + cd ${baseDir} + ''; + + installPhase = '' + for i in ${toString assemblyInputs} + do + windowsPath=$(cygpath --windows $i) + echo "Using assembly path: $windowsPath" + + if [ "$assemblySearchPaths" = "" ] + then + assemblySearchPaths="$windowsPath" + else + assemblySearchPaths="$assemblySearchPaths;$windowsPath" + fi + done + + echo "Assembly search paths are: $assemblySearchPaths" + + if [ "$assemblySearchPaths" != "" ] + then + echo "Using assembly search paths args: $assemblySearchPathsArg" + export AssemblySearchPaths=$assemblySearchPaths + fi + + ensureDir $out + MSBuild.exe ${slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options} + + # Create references to runtime dependencies + # !!! Should be more efficient (e.g. symlinking) + + for i in ${toString runtimeAssemblies} + do + cd $i + + for j in $(find . -type f) + do + mkdir -p $out/$(dirname $j) + cp $j $out/$(dirname $j) + done + done + ''; +} Deleted: nixpkgs/trunk/pkgs/build-support/dotnetenv/buildSolution.nix =================================================================== --- nixpkgs/trunk/pkgs/build-support/dotnetenv/buildSolution.nix 2010-06-15 12:11:40 UTC (rev 22276) +++ nixpkgs/trunk/pkgs/build-support/dotnetenv/buildSolution.nix 2010-06-15 12:23:28 UTC (rev 22277) @@ -1,61 +0,0 @@ -{stdenv, dotnetfx}: -{ name -, src -, baseDir ? "." -, slnFile -, targets ? "ReBuild" -, verbosity ? "detailed" -, options ? "/p:Configuration=Debug;Platform=Win32" -, assemblyInputs ? [] -, runtimeAssemblies ? [] -, preBuild ? "" -}: - -stdenv.mkDerivation { - inherit name src preBuild; - - buildInputs = [ dotnetfx ]; - preConfigure = '' - cd ${baseDir} - ''; - - installPhase = '' - for i in ${toString assemblyInputs} - do - windowsPath=$(cygpath --windows $i) - echo "Using assembly path: $windowsPath" - - if [ "$assemblySearchPaths" = "" ] - then - assemblySearchPaths="$windowsPath" - else - assemblySearchPaths="$assemblySearchPaths;$windowsPath" - fi - done - - echo "Assembly search paths are: $assemblySearchPaths" - - if [ "$assemblySearchPaths" != "" ] - then - echo "Using assembly search paths args: $assemblySearchPathsArg" - export AssemblySearchPaths=$assemblySearchPaths - fi - - ensureDir $out - MSBuild.exe ${slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options} - - # Create references to runtime dependencies - # !!! Should be more efficient (e.g. symlinking) - - for i in ${toString runtimeAssemblies} - do - cd $i - - for j in $(find . -type f) - do - mkdir -p $out/$(dirname $j) - cp $j $out/$(dirname $j) - done - done - ''; -} Modified: nixpkgs/trunk/pkgs/build-support/dotnetenv/default.nix =================================================================== --- nixpkgs/trunk/pkgs/build-support/dotnetenv/default.nix 2010-06-15 12:11:40 UTC (rev 22276) +++ nixpkgs/trunk/pkgs/build-support/dotnetenv/default.nix 2010-06-15 12:23:28 UTC (rev 22277) @@ -1,7 +1,7 @@ {stdenv, dotnetfx}: { - buildSolution = import ./buildSolution.nix { + buildSolution = import ./build-solution.nix { inherit stdenv; dotnetfx = dotnetfx.pkg; }; Copied: nixpkgs/trunk/pkgs/build-support/vsenv/build-solution.nix (from rev 22276, nixpkgs/trunk/pkgs/build-support/vsenv/buildSolution.nix) =================================================================== --- nixpkgs/trunk/pkgs/build-support/vsenv/build-solution.nix (rev 0) +++ nixpkgs/trunk/pkgs/build-support/vsenv/build-solution.nix 2010-06-15 12:23:28 UTC (rev 22277) @@ -0,0 +1,18 @@ +{stdenv, vs}: +{ name +, src +, slnFile +, baseDir ? "." +, extraBuildInputs ? [] +}: + +stdenv.mkDerivation { + inherit name src; + installPhase = '' + cd ${baseDir} + vcbuild.exe /rebuild ${slnFile} + ensureDir $out + cp Debug/* $out + ''; + buildInputs = [ vs ] ++ extraBuildInputs; +} Deleted: nixpkgs/trunk/pkgs/build-support/vsenv/buildSolution.nix =================================================================== --- nixpkgs/trunk/pkgs/build-support/vsenv/buildSolution.nix 2010-06-15 12:11:40 UTC (rev 22276) +++ nixpkgs/trunk/pkgs/build-support/vsenv/buildSolution.nix 2010-06-15 12:23:28 UTC (rev 22277) @@ -1,18 +0,0 @@ -{stdenv, vs}: -{ name -, src -, slnFile -, baseDir ? "." -, extraBuildInputs ? [] -}: - -stdenv.mkDerivation { - inherit name src; - installPhase = '' - cd ${baseDir} - vcbuild.exe /rebuild ${slnFile} - ensureDir $out - cp Debug/* $out - ''; - buildInputs = [ vs ] ++ extraBuildInputs; -} Modified: nixpkgs/trunk/pkgs/build-support/vsenv/default.nix =================================================================== --- nixpkgs/trunk/pkgs/build-support/vsenv/default.nix 2010-06-15 12:11:40 UTC (rev 22276) +++ nixpkgs/trunk/pkgs/build-support/vsenv/default.nix 2010-06-15 12:23:28 UTC (rev 22277) @@ -1,7 +1,7 @@ {stdenv, vs}: { - buildSolution = import ./buildSolution.nix { + buildSolution = import ./build-solution.nix { inherit stdenv vs; }; } _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
