Merge branch 'AltCompilers' of https://bitbucket.org/LightDrake/singularityviewer into V2MultiWear

Conflicts:
	indra/cmake/00-Common.cmake
This commit is contained in:
Lirusaito
2012-07-09 18:45:00 -04:00
75 changed files with 2333 additions and 3015 deletions

View File

@@ -2,8 +2,8 @@
#(C) 2011 SIANA GEARZ
usage() {
echo "Usage: repackage PLATTFORM FILEIN.tar.bz2 [FILEOUT.tar.bz2]
Repackage an archive from llautobuild format into legacy format
echo "Usage: repackage PLATFORM FILEIN.tar.bz2 [FILEOUT.tar.bz2]
Repackage an archive from llautobuild format into singularity format
PLATTFORM can be one of windows, linux, mac.
"
@@ -30,17 +30,19 @@ case "$1" in
--mac|--osx|--darwin|-x|mac|osx|darwin)
MODE=osx
LIBPATH="libraries/universal-darwin/lib_release"
LIBDPATH="libraries/universal-darwin/lib_release"
LIBDPATH="libraries/universal-darwin/lib/debug"
INCPATH="libraries/universal-darwin/include"
;;
--lin|--linux|-l|linux)
MODE=linux
LIBPATH="libraries/i686-linux/lib_release_client"
LIBPATH="libraries/i686-linux/lib/release"
LIBDPATH="libraries/i686-linux/lib/debug"
INCPATH="libraries/i686-linux/include"
;;
--linux64|-6|linux64)
MODE=linux64
LIBPATH="libraries/x86_64-linux/lib_release_client"
LIBPATH="libraries/x86_64-linux/lib/release"
LIBDPATH="libraries/x86_64-linux/lib/debug"
INCPATH="libraries/x86_64-linux/include"
;;
*)
@@ -107,8 +109,8 @@ fi
echo " Packing..."
tar -cjvf "$FILEOUT" libraries LICENSES
echo " Checksum:"
cd `dirname "$FILEOUT"`
md5sum -b `basename "$FILEOUT"`
cd "`dirname "$FILEOUT"`"
md5sum -b "`basename "$FILEOUT"`"
cd "$PWD"
rm -rf "$TMP"