Changeset 38735

Timestamp:

2024-02-12T17:30:34+13:00 (3 months ago)

Author:

davidb

Message:

It appears we haven't run the top-level script for this extension for quite some time. These edits bring the compiling/installing scripts in line with the newer version of the file (now a .tar.gz), and the simplified directory structure

Location:

gs2-extensions/open-office/trunk/src

Files:

• COMPILE-INSTALL.sh (modified) (3 diffs)
• packages/COMPILE-INSTALL.sh (modified) (1 diff)

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

@@ -3 +3 @@
 source setup.bash
 
-export JOD_CONVERTER=jodconverter-core-3.0-beta-3
+export JOD_CONVERTER=jodconverter-core-3.0-beta-4
 
 if [ "x$GEXT_OPENOFFICE" != "x" ] ; then
@@ -17 +17 @@
   echo Compiling Code
 
-  pushd "$GEXT_OPENOFFICE/build-srcpack/packages" 
+  pushd "$GEXT_OPENOFFICE/packages" 
 
   ./COMPILE-INSTALL.sh 
@@ -31 +31 @@
   echo ""
   echo "Installing jodconverter.jar into lib/java"
-  /bin/cp -r $GEXT_OPENOFFICE/build-srcpack/packages/$JOD_CONVERTER/jodconverter.jar lib/java/.
-  /bin/cp -r $GEXT_OPENOFFICE/build-srcpack/packages/$JOD_CONVERTER/lib lib/java/.
+  /bin/cp -r $GEXT_OPENOFFICE/packages/$JOD_CONVERTER/jodconverter.jar lib/java/.
+  /bin/cp -r $GEXT_OPENOFFICE/packages/$JOD_CONVERTER/lib lib/java/.
 
 

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

@@ -1 +1 @@
 #!/bin/bash
 
-source ../../cascade-make/lib/cascade-lib.bash GEXT_OPENOFFICE ../../ $*
+source ../cascade-make/lib/cascade-lib.bash GEXT_OPENOFFICE ../ $*
 
 if [ ! -e "$JOD_CONVERTER" ] ; then
   echo "Unzipping JodConverter Core"
-  unzip "$JOD_CONVERTER-dist.zip"
+  #unzip "$JOD_CONVERTER-dist.zip"
+  tar xvzf "$JOD_CONVERTER-dist.tar.gz"
 
   cd "$JOD_CONVERTER" \