public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating veracity; adding parts of needed infrastructure for tests. Currently, a test run would fail

Browse Source 
svn path=/nixpkgs/trunk/; revision=26126
This commit is contained in:
Michael Raskin 2011-02-28 20:56:01 +00:00
parent 9e204fec07
commit e5e98b9984
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/version-management/veracity/default.nix
View File

@ -19,12 +19,21 @@ rec {
inherit (s) name; inherit (s) name;
inherit buildInputs; inherit buildInputs;
phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doDeploy"]; phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doTest" "doDeploy"];
dump0 = (a.doDump "0"); dump0 = (a.doDump "0");
doTest = a.fullDepEntry ''
sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
mkdir pseudo-home
export HOME=$PWD/pseudo-home
echo make test
'' ["doMake" "minInit"];
prepare_sgneeds = a.fullDepEntry ('' prepare_sgneeds = a.fullDepEntry (''
ensureDir "$out/sgneeds/include/spidermonkey"
for d in bin include lib; do for d in bin include lib; do
ensureDir "$out/sgneeds/$d"
ensureDir "$out/sgneeds/$d" ensureDir "$out/sgneeds/$d"
for p in "${spidermonkey_1_8_0rc1}"; do for p in "${spidermonkey_1_8_0rc1}"; do
for f in "$p"/"$d"/*; do for f in "$p"/"$d"/*; do
@ -32,6 +41,11 @@ rec {
done done
done done
done done
for p in "${spidermonkey_1_8_0rc1}/include" "${spidermonkey_1_8_0rc1}/include/js"; do
for f in "$p"/*; do
ln -sf "$f" "$out"/sgneeds/include/spidermonkey/
done
done
ensureDir "$out/sgneeds/include/sgbrings" ensureDir "$out/sgneeds/include/sgbrings"
ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js" ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js"
@ -41,6 +55,9 @@ rec {
done done
export SGNEEDS_DIR="$out"/sgneeds/ export SGNEEDS_DIR="$out"/sgneeds/
export VVTHIRDPARTY="$out"/sgneeds/
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$out/sgneeds/include"
'') ["minInit" "defEnsureDir"]; '') ["minInit" "defEnsureDir"];
prepareMakefiles = a.fullDepEntry '' prepareMakefiles = a.fullDepEntry ''
@ -48,7 +65,7 @@ rec {
mkdir build mkdir build
cd build cd build
export NIX_LDFLAGS="$NIX_LDFLAGS -lssl" export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" ../veracity* cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" -D VVTHIRDPARTY="$VVTHIRDPARTY" -D SPIDERMONKEY_INCDIR="${a.spidermonkey_1_8_0rc1}/include" -D SPIDERMONKEY_LIB="${a.spidermonkey_1_8_0rc1}/lib/libjs.so" ../veracity*
'' ["minInit" "addInputs" "doUnpack"]; '' ["minInit" "addInputs" "doUnpack"];
doDeploy = a.fullDepEntry '' doDeploy = a.fullDepEntry ''

8
pkgs/applications/version-management/veracity/src-for-default.nix
View File

@ -1,9 +1,9 @@
rec { rec {
version="0.5.7.10383"; version="0.5.7.10397";
name="veracity-0.5.7.10383"; name="veracity-0.5.7.10397";
hash="1826zr2nwd6qknvv6mw7a2x93fwi4wpabfq4ijy6am3cl55hdy51"; hash="09w1qj4wklaf7mw0vavzyqpagcd0cwqppdl8vaqqi0irddgivnq8";
url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz"; url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.7.10383.tar.gz"; advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.5.7.10397.tar.gz";
} }