[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52428] trunk/blender/build_files/ build_environment/install_deps.sh: Grumph, forgot to uncomment some lines before committing last time :/

[Bastien Montagne]

Revision: 52428
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52428
Author:   mont29
Date:     2012-11-21 09:25:06 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Grumph, forgot to uncomment some lines before committing last time :/

Modified Paths:
--------------
    trunk/blender/build_files/build_environment/install_deps.sh

Modified: trunk/blender/build_files/build_environment/install_deps.sh
===================================================================
--- trunk/blender/build_files/build_environment/install_deps.sh	2012-11-21 09:01:49 UTC (rev 52427)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2012-11-21 09:25:06 UTC (rev 52428)
@@ -515,13 +515,13 @@
       wget -c $LLVM_SOURCE -O "$_src.tar.gz"
       wget -c $LLVM_CLANG_SOURCE -O "$_src_clang.tar.gz"
 
-#      INFO "Unpacking LLVM-$LLVM_VERSION"
-#      tar -C $SRC --transform "s,([^/]*/?)llvm-[^/]*(.*),\1LLVM-$LLVM_VERSION\2,x" \
-#          -xf $_src.tar.gz
-#      INFO "Unpacking CLANG-$LLVM_VERSION to $_src/tools/clang"
-#      tar -C $_src/tools \
-#          --transform "s,([^/]*/?)clang-[^/]*(.*),\1clang\2,x" \
-#          -xf $_src_clang.tar.gz
+      INFO "Unpacking LLVM-$LLVM_VERSION"
+      tar -C $SRC --transform "s,([^/]*/?)llvm-[^/]*(.*),\1LLVM-$LLVM_VERSION\2,x" \
+          -xf $_src.tar.gz
+      INFO "Unpacking CLANG-$LLVM_VERSION to $_src/tools/clang"
+      tar -C $_src/tools \
+          --transform "s,([^/]*/?)clang-[^/]*(.*),\1clang\2,x" \
+          -xf $_src_clang.tar.gz
 
       cd $_src
 
@@ -581,7 +581,7 @@
 
 compile_OSL() {
   # To be changed each time we make edits that would modify the compiled result!
-  osl_magic=6
+  osl_magic=7
 
   _src=$SRC/OpenShadingLanguage-$OSL_VERSION
   _inst=$INST/osl-$OSL_VERSION
@@ -612,7 +612,7 @@
 
     cd $_src
     # XXX For now, always update from latest repo...
-#    git checkout .
+    git checkout .
 
     # Always refresh the whole build!
     if [ -d build ]; then