Changeset 35534

Timestamp:

2021-09-30T15:46:55+13:00 (3 years ago)

Author:

anupama

Message:

Updating GS2 compile script: 1. Kathy/Dr Bainbridge have now turned -fPIC on where it's needed so that we don't need to set it in CFLAGS and other flags. This means makegs2.sh doesn't need to set these flags any more, nor display any message that it's done so. 2. Makegs2.sh now does what release-kits rk2 installer does: rename PDFv2Plugin.pm to PDFv2Plugin.tmp so that pluginfo.pl can run and therefore GLI can start properly. PDFv2Plugin is dependent on the PDFBoxConverter extension, which does not come installed by default in GS2.

File:

• main/trunk/greenstone2/makegs2.sh (modified) (3 diffs)

main/trunk/greenstone2/makegs2.sh

@@ -47 +47 @@
 bitness=`uname -m`
 # if we're 64 bit, add -fPIC to CFLAGS. Check if bitness contains substring "64"
-if [[ $bitness == *"64"* ]]; then
-  export CFLAGS="-fPIC $CFLAGS"
-  echo "64 bit unix system, incl -fPIC in CFLAGS so it is now: $CFLAGS"
-fi
+#if [[ $bitness == *"64"* ]]; then
+#  export CFLAGS="-fPIC $CFLAGS"
+#  echo "64 bit unix system, incl -fPIC in CFLAGS so it is now: $CFLAGS"
+#fi
 
 # Compile by chaining the commands with && so it stops at that stage after an error
@@ -79 +79 @@
     echo "@@@ Error compiling up Greenstone. Return status: $status"
 fi
-if [[ $bitness == *"64"* ]]; then
-    echo ""
-    echo "This unix is 64 bit. So added -fPIC to CFLAGS, which is now: $CFLAGS"
-fi
+#if [[ $bitness == *"64"* ]]; then
+#    echo ""
+#    echo "This unix is 64 bit. So added -fPIC to CFLAGS, which is now: $CFLAGS"
+#fi
 echo "****************************************"    
 
@@ -160 +160 @@
    rm -rf ext/imagemagick.tar.gz   
 fi
+
+
+# PDFv2Plugin needs PDFBoxConverter extension, which doesn't come installed in GS2 by default
+# But without it, the PDFv2Plugin won't work and pluginfo.pl -describeall will break,
+# GLI will have issues launching. So repeat what the GS2 installer does:
+# rename PDFv2Plugin.pm to PDFv2Plugin.tmp and show user a message on how to make it functional.
+echo ""
+echo "   Renaming PDFv2Plugin to make it unfunctional."
+echo "   To make it functional, install the PDFBoxConverter extension for Greenstone"
+echo "   and then rename the PDFv2Plugin.tmp file to PDFv2Plugin.pm"
+echo ""
+mv perllib/plugins/PDFv2Plugin.pm perllib/plugins/PDFv2Plugin.tmp
+