[Bf-blender-cvs] [d76d314] master: Install_deps: add an '--info' path option to store BUILD_NOTES.txt...
Bastien Montagne
noreply at git.blender.org
Fri Sep 19 15:14:45 CEST 2014
Commit: d76d3144b4cf366cf3932a1c11476ecb0baeab05
Author: Bastien Montagne
Date: Fri Sep 19 15:12:25 2014 +0200
Branches: master
https://developer.blender.org/rBd76d3144b4cf366cf3932a1c11476ecb0baeab05
Install_deps: add an '--info' path option to store BUILD_NOTES.txt...
Still defaults to current dir!
===================================================================
M build_files/build_environment/install_deps.sh
===================================================================
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index c1b2fd9..f081f43 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -25,10 +25,12 @@
ARGS=$( \
getopt \
-o s:i:t:h \
---long source:,install:,tmp:,threads:,help,no-sudo,with-all,with-opencollada,ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,\
+--long source:,install:,tmp:,info:,threads:,help,no-sudo,with-all,with-opencollada,\
+ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,\
force-all,force-python,force-numpy,force-boost,force-ocio,force-oiio,force-llvm,force-osl,force-opencollada,\
-force-ffmpeg,skip-python,skip-numpy,skip-boost,skip-ocio,skip-oiio,skip-llvm,skip-osl,skip-ffmpeg,\
-skip-opencollada,required-numpy: \
+force-ffmpeg,\
+skip-python,skip-numpy,skip-boost,skip-ocio,skip-oiio,skip-llvm,skip-osl,skip-ffmpeg,skip-opencollada,\
+required-numpy: \
-- "$@" \
)
@@ -38,6 +40,7 @@ SRC="$HOME/src/blender-deps"
INST="/opt/lib"
TMP="/tmp"
CWD=$PWD
+INFO_PATH = CWD
# Do not install some optional, potentially conflicting libs by default...
WITH_ALL=false
@@ -74,6 +77,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
--tmp=<path>
Use a specific temp path (defaults to '\$TMP').
+ --info=<path>
+ Use a specific info path (to store BUILD_NOTES.txt, defaults to '\$INFO_PATH').
+
-t n, --threads=n
Use a specific number of threads when building the libraries (auto-detected as '\$THREADS').
@@ -320,6 +326,9 @@ while true; do
--tmp)
TMP="$2"; shift; shift; continue
;;
+ --info)
+ INFO_PATH="$2"; shift; shift; continue
+ ;;
-t|--threads)
THREADS="$2"; shift; shift; continue
;;
@@ -3098,9 +3107,9 @@ else
exit 1
fi
-print_info | tee BUILD_NOTES.txt
+print_info | tee $INFO_PATH/BUILD_NOTES.txt
PRINT ""
-PRINT "This information has been written to BUILD_NOTES.txt"
+PRINT "This information has been written to $INFO_PATH/BUILD_NOTES.txt"
PRINT ""
# Switch back to user language.
More information about the Bf-blender-cvs
mailing list