Changeset 28413 for gs2-extensions

Timestamp:

2013-10-14T14:59:56+13:00 (11 years ago)

Author:

davidb

Message:

Pure Java solution. Make install directory top-level

File:

• gs2-extensions/apache-jena/trunk/src/gs3-setup.sh (modified) (1 diff)

gs2-extensions/apache-jena/trunk/src/gs3-setup.sh

@@ -6 +6 @@
 fulldir=${fulldir%/.}
 
+if test -z $GSDLOS ; then
+  GSDLOS=`uname -s | tr '[A-Z]' '[a-z]'`
+  # check for running bash under Cygwin
+  if test "`echo $GSDLOS | sed 's/cygwin//'`" != "$GSDLOS" ;
+  then
+    GSDLOS=windows
+  fi
+  # check for running bash under MinGW/MSys
+  if test "`echo $GSDLOS | sed 's/mingw//'`" != "$GSDLOS" ;
+  then
+    GSDLOS=windows
+  fi
+  echo "GSDLOS was not set.  Setting it to '$GSDLOS'"
+  export GSDLOS
+fi
+
+
 if [ "x$GEXT_JENA" = "x" ] ; then
   export GEXT_JENA=`pwd`
+  export GEXT_JENA_INSTALLED=$GEXT_JENA # Pure Java, so no need for OS dependant directory
 
-  if [ -d "$GEXT_JENA/bin/script" ] ; then
-    export PATH=$GEXT_JENA/bin/script:$PATH
+  export FUSEKI_HOME=$GEXT_JENA
+
+  if [ -d "$GEXT_JENA_INSTALLED/bin/script" ] ; then
+    export PATH=$GEXT_JENA_INSTALLED/bin/script:$PATH
   fi
 
-  if [ -d "$GEXT_JENA/lib" ] ; then
-    if [ "$GSDLOS" = "linux" ] ; then
-      export LD_LIBRARY_PATH=$GEXT_JENA/lib:$LD_LIBRARY_PATH
-    elif [ "$GSDLOS" = "darwin" ] ; then
-      export DYLD_LIBRARY_PATH=$GEXT_JENA/lib:$DYLD_LIBRARY_PATH
-    fi
-  fi
+#  if [ -d "$GEXT_JENA_INSTALLED/bin" ] ; then
+#    export PATH=$GEXT_JENA_INSTALLED/bin:$PATH
+#  fi
+
+
+#  if [ -d "$GEXT_JENA/lib" ] ; then
+#    if [ "$GSDLOS" = "linux" ] ; then
+#      export LD_LIBRARY_PATH=$GEXT_JENA/lib:$LD_LIBRARY_PATH
+#    elif [ "$GSDLOS" = "darwin" ] ; then
+#      export DYLD_LIBRARY_PATH=$GEXT_JENA/lib:$DYLD_LIBRARY_PATH
+#    fi
+#  fi
 
   extdir=${GEXT_JENA##*/}