Changeset 30258 for gs2-extensions/tdb/trunk

Timestamp:

2015-09-21T12:44:27+12:00 (9 years ago)

Author:

jmt12

Message:

Extending disable script to support Greenstone3's gs2build package as well

File:

• gs2-extensions/tdb/trunk/disable_tdb.sh (modified) (3 diffs)

gs2-extensions/tdb/trunk/disable_tdb.sh

@@ -10 +10 @@
 
 # Test that GSDLHOME is set otherwise we won't be able to find the required files
-if [ "${GSDLHOME}x" == "x" ] ; then echo 'Error! GSDLHOME not set. Please source setup.bash before running.' ; echo ; exit 0 ; fi
-if [ "${GSDLOS}x" == "x" ] ; then echo 'Error! GSDLOS not set. Please source setup.bash before running.' ; echo ; exit 0 ; fi
+if [ "${GSDLHOME}x" == "x" ]
+then
+    echo 'Error! GSDLHOME not set. Please source setup.bash before running.'
+    echo
+    exit 0
+fi
+if [ "${GSDLOS}x" == "x" ]
+then
+    echo 'Error! GSDLOS not set. Please source setup.bash before running.'
+    echo
+    exit 0
+fi
 
 # Black magic to determine the actual name of the extension folder (in case I
 # change from tdb-edit to tdb in the future (writing in hindsight))
+EXTDIR=${PWD}
 EXTNAME=${PWD##*/}
 
-echo ' - removing TDB support from common function library'
+printf ' * Removing TDB support from common function library... '
 # - Makefile.in
 MAKEFILE="${GSDLHOME}/common-src/src/lib/Makefile.in"
 sed -i 's:\(EXT_DEFINES\s*=.*\)\s-DUSE_TDB\(.*\):\1\2:' "${MAKEFILE}"
-sed -i 's:\(EXT_INCLUDES\s*=.*\)\s-I$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/include\s*-I$(GSDL_DIR)/ext/'${EXTNAME}'/src/lib\(.*\):\1\2:' "${MAKEFILE}"
+sed -i 's:\(EXT_INCLUDES\s*=.*\)\s-I'${EXTDIR}'/'${GSDLOS}'/include\(.*\):\1\2:' "${MAKEFILE}"
 sed -i 's:\(EXT_SOURCES\s*=.*\)\stdbclass.cpp\(.*\):\1\2:' "${MAKEFILE}"
 sed -i 's:\(EXT_OBJECTS\s*=.*\)\stdbclass.o\(.*\):\1\2:' "${MAKEFILE}"
@@ -32 +43 @@
 rm -f "${GSDLHOME}/common-src/src/lib/tdbclass.o"
 rm -f "${GSDLHOME}/common-src/src/lib/gsdllib.a"
+echo 'Done!'
 
+if [ "${GSDL3HOME}x" == "x" ]
+then
+    printf ' * Removing TDB support from collection server... '
+    # - Makefile.in
+    MAKEFILE="${GSDLHOME}/runtime-src/src/colservr/Makefile.in"
+    sed -i 's:\(EXT_DEFINES\s*=.*\)\s-DUSE_TDB\(.*\):\1\2:' "${MAKEFILE}"
+    sed -i 's:\(EXT_INCLUDES\s*=.*\)\s-I$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/include\s*-I$(GSDL_DIR)/ext/'${EXTNAME}'/src/lib\(.*\):\1\2:' "${MAKEFILE}"
+    rm -f "${GSDLHOME}/runtime-src/src/colservr/Makefile"
+    # - collectset.cpp
+    # BUG: leaves behind the newlines...
+    SRCFILE="${GSDLHOME}/runtime-src/src/colservr/collectset.cpp"
+    sed -i '/^#include "tdbclass.h" \/\/TDB/ d' "${SRCFILE}"
+    sed -i '/^[ ]*if (infodbtype == "tdb") {db_ptr = new tdbclass(gsdlhome);} \/\/TDB/ d' "${SRCFILE}"
+    sed -i '/^[ ]*if (infodbtype == "tdbserver") {db_ptr = new tdbclass(gsdlhome);} \/\/TDBServer/ d' "${SRCFILE}"
+    # - collectserver.cpp
+    SRCFILE="${GSDLHOME}/runtime-src/src/colservr/collectserver.cpp"
+    sed -i '/^if (infodbtype == "tdb") { } \/\/ TDB Do nothing/ d' "${SRCFILE}"
+    sed -i '/^if (infodbtype == "tdbserver") { } \/\/ TDBServer Do nothing/ d' "${SRCFILE}"
+    # - Remove compiled files
+    rm -f "${GSDLHOME}/runtime-src/src/colservr/gsdlcolservr.a"
+    echo 'Done!'
 
-echo ' - removing TDB support from collection server'
-# - Makefile.in
-MAKEFILE="${GSDLHOME}/runtime-src/src/colservr/Makefile.in"
-sed -i 's:\(EXT_DEFINES\s*=.*\)\s-DUSE_TDB\(.*\):\1\2:' "${MAKEFILE}"
-sed -i 's:\(EXT_INCLUDES\s*=.*\)\s-I$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/include\s*-I$(GSDL_DIR)/ext/'${EXTNAME}'/src/lib\(.*\):\1\2:' "${MAKEFILE}"
-rm -f "${GSDLHOME}/runtime-src/src/colservr/Makefile"
-# - collectset.cpp
-# BUG: leaves behind the newlines...
-SRCFILE="${GSDLHOME}/runtime-src/src/colservr/collectset.cpp"
-sed -i '/^#include "tdbclass.h" \/\/TDB/ d' "${SRCFILE}"
-sed -i '/^[ ]*if (infodbtype == "tdb") {db_ptr = new tdbclass(gsdlhome);} \/\/TDB/ d' "${SRCFILE}"
-sed -i '/^[ ]*if (infodbtype == "tdbserver") {db_ptr = new tdbclass(gsdlhome);} \/\/TDBServer/ d' "${SRCFILE}"
-# - collectserver.cpp
-SRCFILE="${GSDLHOME}/runtime-src/src/colservr/collectserver.cpp"
-sed -i '/^if (infodbtype == "tdb") { } \/\/ TDB Do nothing/ d' "${SRCFILE}"
-sed -i '/^if (infodbtype == "tdbserver") { } \/\/ TDBServer Do nothing/ d' "${SRCFILE}"
-# - Remove compiled files
-rm -f "${GSDLHOME}/runtime-src/src/colservr/gsdlcolservr.a"
+    printf ' * Removing TDB support from Greenstone receptionist... '
+    # - Makefile.in
+    MAKEFILE="${GSDLHOME}/runtime-src/src/recpt/Makefile.in"
+    sed -i 's:\(EXT_DEFINES\s*=.*\)\s-DUSE_TDB\(.*\):\1\2:' "${MAKEFILE}"
+    sed -i 's:\(EXT_INCLUDES\s*=.*\)\s-I$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/include\s*-I$(GSDL_DIR)/ext/'${EXTNAME}'/src/lib\(.*\):\1\2:' "${MAKEFILE}"
+    sed -i 's:\(EXT_LDFLAGS\s*=.*\)\s-L$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/lib\(.*\):\1\2:' "${MAKEFILE}"
+    sed -i 's:\(EXT_LIBS\s*=.*\)\s-ltdb\(.*\):\1\2:' "${MAKEFILE}"
+    rm -f "${GSDLHOME}/runtime-src/src/recpt/Makefile"
+    # - Remove compiled files
+    rm -f "${GSDLHOME}/runtime-src/src/recpt/gsdlrecpt.a"
+    rm -f "${GSDLHOME}/runtime-src/src/recpt/library.cgi"
+    rm -f "${GSDLHOME}/cgi-bin/library.cgi"
+    echo 'Done!'
 
-
-echo ' - removing TDB support from Greenstone receptionist'
-# - Makefile.in
-MAKEFILE="${GSDLHOME}/runtime-src/src/recpt/Makefile.in"
-sed -i 's:\(EXT_DEFINES\s*=.*\)\s-DUSE_TDB\(.*\):\1\2:' "${MAKEFILE}"
-sed -i 's:\(EXT_INCLUDES\s*=.*\)\s-I$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/include\s*-I$(GSDL_DIR)/ext/'${EXTNAME}'/src/lib\(.*\):\1\2:' "${MAKEFILE}"
-sed -i 's:\(EXT_LDFLAGS\s*=.*\)\s-L$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/lib\(.*\):\1\2:' "${MAKEFILE}"
-sed -i 's:\(EXT_LIBS\s*=.*\)\s-ltdb\(.*\):\1\2:' "${MAKEFILE}"
-rm -f "${GSDLHOME}/runtime-src/src/recpt/Makefile"
-# - Remove compiled files
-rm -f "${GSDLHOME}/runtime-src/src/recpt/gsdlrecpt.a"
-rm -f "${GSDLHOME}/runtime-src/src/recpt/library.cgi"
-rm -f "${GSDLHOME}/cgi-bin/library.cgi"
-
-
-echo ' - removing TDB support from OAI Server receptionist'
-# - Makefile.in
-MAKEFILE="${GSDLHOME}/runtime-src/src/oaiservr/Makefile.in"
-sed -i 's:\(EXT_DEFINES\s*=.*\)\s-DUSE_TDB\(.*\):\1\2:' "${MAKEFILE}"
-sed -i 's:\(EXT_INCLUDES\s*=.*\)\s-I$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/include\s*-I$(GSDL_DIR)/ext/'${EXTNAME}'/src/lib\(.*\):\1\2:' "${MAKEFILE}"
-sed -i 's:\(EXT_LDFLAGS\s*=.*\)\s-L$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/lib\(.*\):\1\2:' "${MAKEFILE}"
-sed -i 's:\(EXT_LIBS\s*=.*\)\s-ltdb\(.*\):\1\2:' "${MAKEFILE}"
-rm -f "${GSDLHOME}/runtime-src/src/oaiservr/Makefile"
-# - Remove compiled files
-rm -f "${GSDLHOME}/runtime-src/src/oaiservr/oaiserver.cgi"
-rm -f "${GSDLHOME}/cgi-bin/oaiserver.cgi"
+    printf ' * Removing TDB support from OAI Server receptionist... '
+    # - Makefile.in
+    MAKEFILE="${GSDLHOME}/runtime-src/src/oaiservr/Makefile.in"
+    sed -i 's:\(EXT_DEFINES\s*=.*\)\s-DUSE_TDB\(.*\):\1\2:' "${MAKEFILE}"
+    sed -i 's:\(EXT_INCLUDES\s*=.*\)\s-I$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/include\s*-I$(GSDL_DIR)/ext/'${EXTNAME}'/src/lib\(.*\):\1\2:' "${MAKEFILE}"
+    sed -i 's:\(EXT_LDFLAGS\s*=.*\)\s-L$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/lib\(.*\):\1\2:' "${MAKEFILE}"
+    sed -i 's:\(EXT_LIBS\s*=.*\)\s-ltdb\(.*\):\1\2:' "${MAKEFILE}"
+    rm -f "${GSDLHOME}/runtime-src/src/oaiservr/Makefile"
+    # - Remove compiled files
+    rm -f "${GSDLHOME}/runtime-src/src/oaiservr/oaiserver.cgi"
+    rm -f "${GSDLHOME}/cgi-bin/oaiserver.cgi"
+    echo 'Done!'
+else
+    echo ' * TDB runtime support offered via Java/JNI/TDB bridge.'
+fi
 
 echo
@@ -87 +104 @@
 echo 'rerun:'
 echo
-echo ' ./configure <any required arguments>'
-echo ' make'
-echo ' make install'
+if [ "${GSDL3HOME}x" == "x" ]
+then
+    echo ' ./configure <any required arguments>'
+    echo ' make'
+    echo ' make install'
+else
+    echo ' ant install'
+fi
 echo
 echo 'to complete TDB removal.'