From bf22cef8d94defb615bb5c3ee17d827d94704b8e Mon Sep 17 00:00:00 2001 From: don bright Date: Tue, 10 Jul 2012 23:48:29 -0500 Subject: rewrite to be compatible with ubuntu 'dash' shell diff --git a/scripts/linux-build-dependencies.sh b/scripts/linux-build-dependencies.sh index 0faf67a..bfc7880 100755 --- a/scripts/linux-build-dependencies.sh +++ b/scripts/linux-build-dependencies.sh @@ -205,7 +205,7 @@ if [ ! -f $OPENSCADDIR/openscad.pro ]; then exit 0 fi -source ./scripts/setenv-linbuild.sh +. ./scripts/setenv-linbuild.sh # '.' is equivalent to 'source' SRCDIR=$BASEDIR/src DEPLOYDIR=$BASEDIR if [ ! $NUMCPU ]; then @@ -219,7 +219,7 @@ fi echo "Using basedir:" $BASEDIR echo "Using deploydir:" $DEPLOYDIR echo "Using srcdir:" $SRCDIR -echo "Number of CPUs for parallel builds:" $NUMCPU +echo "Number of CPUs for parallel builds:" $NUMCPU "(export NUMCPU=x to modify)" mkdir -p $SRCDIR $DEPLOYDIR if [ ! "`command -v curl`" ]; then @@ -234,13 +234,15 @@ fi # Singly build CGAL or OpenCSG # (Most systems have all libraries available as packages except CGAL/OpenCSG) # (They can be built singly here by passing a command line arg to the script) -if [ $1 = "cgal-use-sys-libs" ]; then - build_cgal 4.0 use-sys-libs - exit -fi -if [ $1 = "opencsg" ]; then - build_opencsg 1.3.2 - exit +if [ $1 ]; then + if [ $1 = "cgal-use-sys-libs" ]; then + build_cgal 4.0 use-sys-libs + exit + fi + if [ $1 = "opencsg" ]; then + build_opencsg 1.3.2 + exit + fi fi diff --git a/scripts/opensuse-build-dependencies.sh b/scripts/opensuse-build-dependencies.sh new file mode 100755 index 0000000..623d7d0 --- /dev/null +++ b/scripts/opensuse-build-dependencies.sh @@ -0,0 +1,8 @@ +echo "tested on OpenSUSE 12. If this fails try 'old linux' build (see README.md)" + +sudo zypper install libeigen2-devel mpfr-devel gmp-devel boost-devel \ + libqt4-devel glew-devel cmake git + +echo "now copy/paste the following to install CGAL and OpenCSG from source:" +echo "sudo BASEDIR=/usr/local ./scripts/linux-build-dependencies.sh cgal-use-sys-libs" +echo "sudo BASEDIR=/usr/local ./scripts/linux-build-dependencies.sh opencsg" diff --git a/scripts/opensuse-get-dependencies.sh b/scripts/opensuse-get-dependencies.sh deleted file mode 100755 index 623d7d0..0000000 --- a/scripts/opensuse-get-dependencies.sh +++ /dev/null @@ -1,8 +0,0 @@ -echo "tested on OpenSUSE 12. If this fails try 'old linux' build (see README.md)" - -sudo zypper install libeigen2-devel mpfr-devel gmp-devel boost-devel \ - libqt4-devel glew-devel cmake git - -echo "now copy/paste the following to install CGAL and OpenCSG from source:" -echo "sudo BASEDIR=/usr/local ./scripts/linux-build-dependencies.sh cgal-use-sys-libs" -echo "sudo BASEDIR=/usr/local ./scripts/linux-build-dependencies.sh opencsg" -- cgit v0.10.1