Changeset 21365

Timestamp:

2009-12-16T14:10:51+13:00 (14 years ago)

Author:

ak19

Message:

New configuration and compilation flag ENABLE_JNI added which will be disabled by default for GS2 since in general GS doesn't need mg and mgpp compiled up with jni. GS3's build.xml will need to explicitly set ENABLE_JNI to compile mg and mgpp with jni.

Location:

main/trunk/greenstone2/common-src

Files:

• Makefile.in (modified) (2 diffs)
• configure (modified) (4 diffs)
• configure.in (modified) (1 diff)
• win32.mak (modified) (1 diff)

main/trunk/greenstone2/common-src/Makefile.in

@@ -65 +65 @@
 
 
-all:
-    for odir in $(INDEXERSDIR) $(COMPILEDIRS) $(MODULEDIRS); do \
+with-jni without-jni: 
+    for odir in $(INDEXERSDIR); do \
       echo making $@ in $$odir; \
       (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     done
+    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
+      echo making all in $$odir; \
+      (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \
+    done
 
-install: 
+install-with-jni: 
     for odir in $(INDEXERSDIR); do \
       echo making $@ in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) install) || exit 1; \
+      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     done
     if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper.jar; then \
@@ -84 +88 @@
     done
 
-gs2: 
-    for odir in $(INDEXERSDIR); do \
-      echo making $@ in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
-    done
-    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
-      echo making all in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \
-    done
-
-install-gs2:
+install-without-jni:
     for odir in $(INDEXERSDIR); do \
       echo making $@ in $$odir; \

main/trunk/greenstone2/common-src/configure

@@ -312 +312 @@
 ac_subdirs_all="$ac_subdirs_all packages"
 ac_subdirs_all="$ac_subdirs_all indexers"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_ACCENTFOLD USE_SQLITE ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_ACCENTFOLD USE_SQLITE ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs LTLIBOBJS'
 ac_subst_files=''
 
@@ -861 +861 @@
   --disable-accentfold    Disable Accent Folding for MGPP
   --disable-sqlite        Disable SQLite support
+  --enable-jni    Enable JNI compilation
   --disable-mg        Disable MG compilation
   --disable-mgpp        Disable MGPP compilation
@@ -1439 +1440 @@
 
 
+# Check whether --enable-jni or --disable-jni was given.
+if test "${enable_jni+set}" = set; then
+  enableval="$enable_jni"
+  ENABLE_JNI=$enableval
+else
+  ENABLE_JNI=no
+fi;
+if test $ENABLE_JNI = "yes" -o $ENABLE_JNI = "1" ; then
+  ENABLE_JNI=1
+  cat >>confdefs.h <<\_ACEOF
+#define ENABLE_JNI
+_ACEOF
+
+else
+  ENABLE_JNI=0
+fi
+
+
 # Check whether --enable-mg or --disable-mg was given.
 if test "${enable_mg+set}" = set; then
@@ -7885 +7904 @@
 s,@ENABLE_ACCENTFOLD@,$ENABLE_ACCENTFOLD,;t t
 s,@USE_SQLITE@,$USE_SQLITE,;t t
+s,@ENABLE_JNI@,$ENABLE_JNI,;t t
 s,@ENABLE_MG@,$ENABLE_MG,;t t
 s,@ENABLE_MGPP@,$ENABLE_MGPP,;t t

main/trunk/greenstone2/common-src/configure.in

@@ -75 +75 @@
 AC_DEFINE(USE_SQLITE, $USE_SQLITE)
 AC_SUBST(USE_SQLITE)
+
+dnl
+dnl Set compilation of JNI parts of MG and MGPP indexers (disabled by default, which is GS2's default behaviour)
+dnl
+AC_ARG_ENABLE(jni, [  --enable-jni    Enable JNI compilation], ENABLE_JNI=$enableval, ENABLE_JNI=no)
+if test $ENABLE_JNI = "yes" -o $ENABLE_JNI = "1" ; then
+  ENABLE_JNI=1
+  AC_DEFINE(ENABLE_JNI,[])
+else
+  ENABLE_JNI=0
+fi
+AC_SUBST(ENABLE_JNI)
 
 dnl

main/trunk/greenstone2/common-src/win32.mak

@@ -192 +192 @@
     set ENABLE_LUCENE=$(ENABLE_LUCENE)
 
-    if EXIST "$(GSDLHOME)\runtime-src" call winMake.bat all gs2
-    if EXIST "$(GSDLHOME)\runtime-src" call winMake.bat install gs2
-    if NOT EXIST "$(GSDLHOME)\runtime-src" call winMake.bat all
-    if NOT EXIST "$(GSDLHOME)\runtime-src" call winMake.bat install
+!IF "$(ENABLE_JNI)" == "1"
+    call winMake.bat all with-jni
+    call winMake.bat install with-jni
+!ELSE
+    call winMake.bat all without-jni
+    call winMake.bat install without-jni
+!ENDIF
 
     set DEBUG=