Changeset 32932 for other-projects

Timestamp:

2019-03-27T21:56:25+13:00 (5 years ago)

Author:

davidb

Message:

Update after testing

File:

• other-projects/is-sheet-music-encore/trunk/SETUP.bash (modified) (1 diff)

other-projects/is-sheet-music-encore/trunk/SETUP.bash

@@ -2 +2 @@
 #export PERL5LIB=`pwd`/venv/lib/perl5
 
-export PATH=`pwd`/perl-relocatable/bin/:$PATH
+export IS_SHEET_MUSIC_ENCORE_HOME=`pwd`
 
-export CFLAGS=-I`pwd`/openssl/include
-export CXXFLAGS=-I`pwd`/openssl/include
-export LDFLAGS=-L`pwd`/openssl/lib
+echo "Setting:"
+echo "  IS_SHEET_MUSIC_ENCORE_HOME=$IS_SHEET_MUSIC_ENCORE_HOME"
 
-export LD_LIBRARY_PATH=-L`pwd`/openssl/lib
+if [ ! -d "$IS_SHEET_MUSIC_ENCORE_HOME/perl-relocatable" ] ; then
+    echo "Installing a relocatable perl in user-space"
+    curl -sSL https://git.io/perl-install | bash -s "$IS_SHEET_MUSIC_ENCORE_HOME/perl-relocatable"
+fi
 
-echo "Set:"
+export PATH="$IS_SHEET_MUSIC_ENCORE_HOME/perl-relocatable/bin/:$PATH"
+echo "  PATH to include 'perl-relocatable'/bin"
+
+
+if [ -d "$IS_SHEET_MUSIC_ENCORE_HOME/openssl" ] ; then
+    export CFLAGS="-I$IS_SHEET_MUSIC_ENCORE_HOME/openssl/include"
+    export CXXFLAGS="-I$IS_SHEET_MUSIC_ENCORE_HOME/openssl/include"
+    export LDFLAGS="-L$IS_SHEET_MUSIC_ENCORE_HOME/openssl/lib"
+    
+    export LD_LIBRARY_PATH="$IS_SHEET_MUSIC_ENCORE_HOME/openssl/lib"
+    
+    echo "  CFLAGS, CXXFLAGS, LDFLAGS, LD_LIBRARY_PATH"
+fi
+
+#echo "Set:"
 #echo "  PERL5LIB"
-echo "  CFLAGS, CXXFLAGS, LDFLAGS"
-echo "Updated PATH"
+# echo "Updated PATH"
+#else
+#echo "Failed to find 'perl-relocatable' directory 1>&2"
+#fi
 
 # perl Makefile.PL PREFIX=/home/davidb/research/code/is-sheet-music2/venv/ LDDLFLAGS="$LDFLAGS -shared -L/usr/local/lib -fstack-protector-strong"