Changeset 30257 for gs2-extensions/tdb

Timestamp:

2015-09-21T12:43:47+12:00 (9 years ago)

Author:

jmt12

Message:

Correcting and optimizing for GS3 (which needs fewer paths to be included)

File:

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

gs2-extensions/tdb/trunk/enable_tdb.sh

@@ -52 +52 @@
     then
     # - No Extension variables yet - add them in with TDB parts
-    sed -i 's:AR = ar:# Support for adding in extension classes\nEXT_DEFINES = -DUSE_TDB\nEXT_INCLUDES = -I$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/include -I$(GSDL_DIR)/ext/'${EXTNAME}'/src/lib\nEXT_SOURCES = tdbclass.cpp\nEXT_OBJECTS = tdbclass.o\n\n&:' "${MAKEFILE}"
+    sed -i 's:AR = ar:# Support for adding in extension classes\nEXT_DEFINES = -DUSE_TDB\nEXT_INCLUDES = -I'${EXTDIR}'/'${GSDLOS}'/include\nEXT_SOURCES = tdbclass.cpp\nEXT_OBJECTS = tdbclass.o\n\n&:' "${MAKEFILE}"
     sed -i 's:DEFS = @DEFS@ .*:& $(EXT_DEFINES):' "${MAKEFILE}"
     sed -i 's:INCLUDES = -I. .*:& $(EXT_INCLUDES):' "${MAKEFILE}"
@@ -60 +60 @@
     # - Extension support already present - add TDB parts
     sed -i 's:EXT_DEFINES =.*:& -DUSE_TDB:' "${MAKEFILE}"
-    sed -i 's:EXT_INCLUDES =.*:& -I$(GSDL_DIR)/ext/'${EXTNAME}'/'${GSDLOS}'/include -I$(GSDL_DIR)/ext/'${EXTNAME}'/src/lib:' "${MAKEFILE}"
+    sed -i 's:EXT_INCLUDES =.*:& -I'${EXTDIR}'/'${GSDLOS}'/include:' "${MAKEFILE}"
     sed -i 's:EXT_SOURCES =.*:& tdbclass.cpp:' "${MAKEFILE}"
     sed -i 's:EXT_OBJECTS =.*:& tdbclass.o:' "${MAKEFILE}"
@@ -221 +221 @@
 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 installation.'