Changeset 28682

Show
Ignore:
Timestamp:
26.11.2013 13:13:25 (6 years ago)
Author:
davidb
Message:

Extension needs 'ruby' to run Fuseki scripts such as 's-put' so setup and CASCADE-CONFIGURE files changed to install binary specific files

Location:
gs2-extensions/apache-jena/trunk/src
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/apache-jena/trunk/src/packages/CASCADE-MAKE/FUSEKI.sh

    r28462 r28682  
    88source ../cascade-make/lib/cascade-lib.bash GEXT_JENA ../.. $* 
    99 
    10 prefix=$GEXT_JENA_INSTALLED 
     10prefix=$GEXT_JENA # Pure Java, so no need for OS dependant directory 
    1111 
    1212opt_run_untar $force_untar $auto_untar $package $version 
     
    2020if [ $install = "1"  ] ; then 
    2121 
    22   if [ ! -d "$GEXT_JENA_INSTALLED/bin" ] ; then 
    23     mkdir "$GEXT_JENA_INSTALLED/bin" 
     22  if [ ! -d "$GEXT_JENA/bin" ] ; then 
     23    mkdir "$GEXT_JENA/bin" 
    2424  fi 
    2525 
    26   if [ ! -d "$GEXT_JENA_INSTALLED/bin/script" ] ; then 
    27     mkdir "$GEXT_JENA_INSTALLED/bin/script" 
     26  if [ ! -d "$GEXT_JENA/bin/script" ] ; then 
     27    mkdir "$GEXT_JENA/bin/script" 
    2828  fi 
    2929 
     
    3434  echo "====" 
    3535  echo "= Installing server-side scripts" 
    36   /bin/cp fuseki-server $GEXT_JENA_INSTALLED/bin/script/. 
    37   chmod a+rx $GEXT_JENA_INSTALLED/bin/script/fuseki-server 
    38   /bin/cp fuseki-server.bat $GEXT_JENA_INSTALLED/bin/script/. 
    39   chmod a+rx $GEXT_JENA_INSTALLED/bin/script/fuseki-server.bat 
     36  /bin/cp fuseki-server $GEXT_JENA/bin/script/. 
     37  chmod a+rx $GEXT_JENA/bin/script/fuseki-server 
     38  /bin/cp fuseki-server.bat $GEXT_JENA/bin/script/. 
     39  chmod a+rx $GEXT_JENA/bin/script/fuseki-server.bat 
    4040 
    41   /bin/cp fuseki $GEXT_JENA_INSTALLED/bin/script/. 
    42   chmod a+rx $GEXT_JENA_INSTALLED/bin/script/fuseki 
     41  /bin/cp fuseki $GEXT_JENA/bin/script/. 
     42  chmod a+rx $GEXT_JENA/bin/script/fuseki 
    4343 
    44   /bin/cp fuseki-server.jar $GEXT_JENA_INSTALLED/. 
    45   chmod a+r $GEXT_JENA_INSTALLED/fuseki-server.jar 
     44  /bin/cp fuseki-server.jar $GEXT_JENA/. 
     45  chmod a+r $GEXT_JENA/fuseki-server.jar 
    4646 
    4747  echo "= Installing client-side scripts" 
    48   /bin/cp s-* $GEXT_JENA_INSTALLED/bin/script/. 
    49   chmod a+rx $GEXT_JENA_INSTALLED/bin/script/s-* 
     48  /bin/cp s-* $GEXT_JENA/bin/script/. 
     49  chmod a+rx $GEXT_JENA/bin/script/s-* 
    5050 
    5151 
    5252  echo "= Installing configuration files" 
    53 #  /bin/cp config.ttl $GEXT_JENA_INSTALLED/. 
    54 #  chmod a+r $GEXT_JENA_INSTALLED/config.ttl 
     53#  /bin/cp config.ttl $GEXT_JENA/. 
     54#  chmod a+r $GEXT_JENA/config.ttl 
    5555 
    56   /bin/cp -r pages $GEXT_JENA_INSTALLED/etc/. 
    57   chmod -R a+r $GEXT_JENA_INSTALLED/etc/pages 
     56  /bin/cp -r pages $GEXT_JENA/etc/. 
     57  chmod -R a+r $GEXT_JENA/etc/pages 
    5858 
    59   /bin/cp log4j.properties $GEXT_JENA_INSTALLED/. 
    60   chmod a+r $GEXT_JENA_INSTALLED/log4j.properties 
     59  /bin/cp log4j.properties $GEXT_JENA/. 
     60  chmod a+r $GEXT_JENA/log4j.properties 
    6161 
    6262  echo "====" 
  • gs2-extensions/apache-jena/trunk/src/setup.bash

    r28415 r28682  
    2525if [ "x$GEXT_JENA" = "x" ] ; then 
    2626  export GEXT_JENA=`pwd` 
    27   export GEXT_JENA_INSTALLED=$GEXT_JENA # Pure Java, so no need for OS dependant directory 
     27  export GEXT_JENA_INSTALLED=$GEXT_JENA/$GSDLOS  
    2828 
    2929  export FUSEKI_HOME=$GEXT_JENA 
     
    3333  fi 
    3434 
    35 #  if [ -d "$GEXT_JENA_INSTALLED/bin" ] ; then 
    36 #    export PATH=$GEXT_JENA_INSTALLED/bin:$PATH 
    37 #  fi 
     35  if [ -d "$GEXT_JENA_INSTALLED/bin" ] ; then 
     36    export PATH=$GEXT_JENA_INSTALLED/bin:$PATH 
     37  fi 
    3838 
    3939 
    40 #  if [ -d "$GEXT_JENA/lib" ] ; then 
    41 #    if [ "$GSDLOS" = "linux" ] ; then 
    42 #      export LD_LIBRARY_PATH=$GEXT_JENA/lib:$LD_LIBRARY_PATH 
    43 #    elif [ "$GSDLOS" = "darwin" ] ; then 
    44 #      export DYLD_LIBRARY_PATH=$GEXT_JENA/lib:$DYLD_LIBRARY_PATH 
    45 #    fi 
    46 #  fi 
     40  if [ -d "$GEXT_JENA/lib" ] ; then 
     41    if [ "$GSDLOS" = "linux" ] ; then 
     42      export LD_LIBRARY_PATH=$GEXT_JENA/lib:$LD_LIBRARY_PATH 
     43    elif [ "$GSDLOS" = "darwin" ] ; then 
     44      export DYLD_LIBRARY_PATH=$GEXT_JENA/lib:$DYLD_LIBRARY_PATH 
     45    fi 
     46  fi 
    4747 
    4848  extdir=${GEXT_JENA##*/}