Updating veracity

svn path=/nixpkgs/trunk/; revision=23590

3 files changed, 32 insertions, 9 deletions

diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix
index c8cb08eef281..731514056c6d 100644
--- a/pkgs/applications/version-management/veracity/default.nix
+++ b/pkgs/applications/version-management/veracity/default.nix
@@ -18,15 +18,36 @@ rec {
   inherit (s) name;
   inherit buildInputs;
 
-  phaseNames = ["prepareMakefiles" "doMake" "doDeploy"];
+  phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "doMake" "doDeploy"];
+
+  dump0 = (a.doDump "0");
+
+  prepare_sgneeds = a.fullDepEntry (''
+    for d in bin include lib; do 
+      ensureDir "$out/sgneeds/$d"
+      for p in "${spidermonkey_1_8_0rc1}"; do
+        for f in "$p"/"$d"/*; do
+	  ln -sf "$f" "$out"/sgneeds/"$d"
+	done
+      done
+    done
+
+    ensureDir "$out/sgneeds/include/sgbrings"
+    ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js"
+    for f in "$out/sgneeds/lib/"libjs*; do
+      bn="$(basename "$f")"
+      ln -s "$f" "$out/sgneeds/lib/''${bn/libjs/libsgbrings_js}"
+    done
+
+    export SGNEEDS_DIR="$out"/sgneeds/
+  '') ["minInit" "defEnsureDir"];
 
   prepareMakefiles = a.fullDepEntry ''
-    find src -type f -exec sed -e 's@#include \([<"]\)sgbrings/js/js@#include \1js/js@g' -i '{}' ';'
     cd ..
     mkdir build
     cd build
     export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
-    cmake -G "Unix Makefiles" -D SGBRINGS_JS_INCDIR="${spidermonkey_1_8_0rc1}/include" -D SGBRINGS_JS_LIB="${spidermonkey_1_8_0rc1}/lib/libjs.a" ../veracity*
+    cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" ../veracity*
   '' ["minInit" "addInputs" "doUnpack"];
 
   doDeploy = a.fullDepEntry ''
diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
index 48a6678071c3..f909ac23568e 100644
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-for-default.nix
@@ -1,8 +1,9 @@
 rec {
-   version="0.3.0.10246";
-   name="veracity-0.3.0.10246";
-   hash="03wn6dzbjv5p50xmiznynza5c1nk38v95mzv6rk6km1ykqprnlw0";
-   url="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-0.3.0.10246.tar.gz";
+   version="0.3.1.10276";
+   name="veracity-0.3.1.10276";
+   hash="1qihrn243dlvvdg5w1vfv3g8bvpy7v0q3xc4d72k85xv8vkljkxw";
+   url="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-${version}.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/nightly/veracity-source-0.3.1.10276.tar.gz";
+  
   
 }
diff --git a/pkgs/applications/version-management/veracity/src-info-for-default.nix b/pkgs/applications/version-management/veracity/src-info-for-default.nix
index f597a59bbaf5..dac6c65e85c6 100644
--- a/pkgs/applications/version-management/veracity/src-info-for-default.nix
+++ b/pkgs/applications/version-management/veracity/src-info-for-default.nix
@@ -1,4 +1,5 @@
 {
-  downloadPage = "http://sourcegear.com/veracity/downloads.html";
+  #downloadPage = "http://sourcegear.com/veracity/downloads.html";
+  downloadPage = "http://download-us.sourcegear.com/Veracity/nightly/index.html";
   baseName = "veracity";
 }