Changeset 22229

Timestamp:

2010-06-03T10:34:12+12:00 (14 years ago)

Author:

davidb

Message:

Minor tweaks

Location:

gs2-extensions/open-office/trunk

Files:

• COMPILE-INSTALL.sh (modified) (2 diffs)
• START-UP.sh (modified) (1 diff)
• setup.bash (modified) (1 diff)

gs2-extensions/open-office/trunk/COMPILE-INSTALL.sh

@@ -6 +6 @@
 export JOD_CONVERTER=jodconverter-core-3.0-beta-3
 
+if [ "x$GEXTOPENOFFICE" != "x" ] ; then
 
-if [ "x$GEXTOOFFICE" != "x" ] ; then
+  javac -version
+  if [ $? != 0 ] ; then
+    echo "Unable to locate 'javac'"
+    echo "Have you set JAVA_HOME and put JAVA_HOME/bin in your path?"
+    exit
+  fi
+
   echo Compiling Code
 
-  pushd "$GEXTOOFFICE/build-srcpack/packages" 
+  pushd "$GEXTOPENOFFICE/build-srcpack/packages" 
 
   ./COMPILE-INSTALL.sh 
@@ -24 +31 @@
   echo ""
   echo "Installing jodconverter.jar into lib/java"
-  /bin/cp -r $GEXTOOFFICE/build-srcpack/packages/$JOD_CONVERTER/jodconverter.jar lib/java/.
+  /bin/cp -r $GEXTOPENOFFICE/build-srcpack/packages/$JOD_CONVERTER/jodconverter.jar lib/java/.
 
 
 else 
-  echo "Error: Environment variable GEXTOOFICE is not set"
+  echo "Error: Environment variable GEXTOPENOFICE is not set"
 fi
 

gs2-extensions/open-office/trunk/START-UP.sh

@@ -6 +6 @@
   echo "Starting up Open Office Server (headless mode)"
 
-  soffice "-accept=socket,host=localhost,port=8100;urp;StarOffice.ServiceManager" -nologo -headless
+  soffice "-accept=socket,host=localhost,port=8100;urp;StarOffice.ServiceManager" -headless
 
   echo "Testing to see if soffice is listening on port 8100"

gs2-extensions/open-office/trunk/setup.bash

@@ -2 +2 @@
 extdesc="the Open Office Extension"
 
-##source cascade-make/lib/cascade-lib.bash
+if [ "x$GEXTOPENOFFICE" = "x" ] ; then
+  export GEXTOPENOFFICE=`pwd`
 
-if [ "x$GEXTOOFFICE" = "x" ] ; then
-  export GEXTOOFFICE=`pwd`
+  export PATH=$GEXTOPENOFFICE/bin/script:$PATH
 
   if [ "x$GSDLEXTS" = "x" ] ; then