Changeset 21366

Timestamp:

2009-12-16T14:11:07+13:00 (13 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

Files:

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

main/trunk/greenstone2/Makefile.in

@@ -55 +55 @@
 MODULEDIRS = @MODULEDIRS@
 
+ENABLE_JNI=@ENABLE_JNI@
+ifeq ($(ENABLE_JNI), 1)
+COMPILE_TARGET=with-jni
+else
+COMPILE_TARGET=without-jni
+endif
 
-# we don't want to compile the jni stuff in indexers for gs2
-all:
+
+# with some compilers, just calling another target is insufficient
+# so an extra echo stmt is added after each call to another target
+all:    $(COMPILE_TARGET)
+    @echo "Compile done"
+
+install: install-$(COMPILE_TARGET)
+    @echo "Install done"
+
+
+with-jni without-jni:
     for odir in $(SPECIAL_COMPILEDIRS); do \
-    echo making gs2 in $$odir; \
-    (cd $$odir && $(MAKE) $(MDEFINES) gs2) || exit 1; \
+      if test -d $$odir; then \
+        echo making $(COMPILE_TARGET) in $$odir; \
+        (cd $$odir && $(MAKE) $(MDEFINES) $(COMPILE_TARGET)) || exit 1; \
+      fi; \
     done
     for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
-      echo making $@ in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
+      if test -d $$odir; then \
+        echo making all in $$odir; \
+        (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \
+      fi; \
     done
 
-install: all
+install-with-jni install-without-jni: all
     for idir in $(SPECIAL_INSTALLDIRS); do \
-      echo installing $$idir; \
-      (cd $$idir && $(MAKE) install-gs2) || exit 1; \
+      if test -d $$idir; then \
+        echo installing $$idir $(COMPILE_TARGET); \
+        (cd $$idir && $(MAKE) install-$(COMPILE_TARGET)) || exit 1; \
+      fi; \
     done
     for idir in $(INSTALLDIRS); do \
-      echo installing $$idir; \
-      (cd $$idir && $(MAKE) install) || exit 1; \
+      if test -d $$idir; then \
+        echo installing $$idir; \
+        (cd $$idir && $(MAKE) install) || exit 1; \
+      fi; \
     done
 
 apache-for-dist:
-    (cd runtime-src/packages && $(MAKE) apache-for-dist) || exit 1;
+    if test -d runtime-src; then \
+      (cd runtime-src/packages && $(MAKE) apache-for-dist) || exit 1; \
+    fi
 
-# include the Greenstone Server Interface Makefile here
-include GSI-Makefile
+# For GS2: include the Greenstone Server Interface Makefile here
+# http://www.makelinux.net/make3/make3-CHP-3-SECT-7.html
+sinclude GSI-Makefile
 
 distclean: clean
     rm -f Makefile config.cache config.h config.log stamp-h config.status
     for subdir in $(SPECIAL_COMPILEDIRS) $(COMPILEDIRS); do \
-      echo cleaning $@ in $$subdir; \
-      (cd $$subdir && $(MAKE) distclean) || exit 1; \
+      if test -d $$subdir; then \
+        echo cleaning $@ in $$subdir; \
+        (cd $$subdir && $(MAKE) distclean) || exit 1; \
+      fi; \
     done
 
 clean:
     for subdir in $(SPECIAL_COMPILEDIRS) $(COMPILEDIRS); do \
-      echo cleaning $@ in $$subdir; \
-      (cd $$subdir && $(MAKE) clean) || exit 1; \
+      if test -d $$subdir; then \
+        echo cleaning $@ in $$subdir; \
+        (cd $$subdir && $(MAKE) clean) || exit 1; \
+      fi; \
     done
 

main/trunk/greenstone2/configure

@@ -310 +310 @@
 
 ac_subdirs_all="$ac_subdirs_all common-src build-src runtime-src"
-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 USE_APACHE_HTTPD 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 USE_APACHE_HTTPD 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=''
 
@@ -860 +860 @@
   --disable-sqlite        Disable SQLite support
   --enable-apache-httpd  Enable Apache httpd support
+  --enable-jni    Enable JNI compilation
   --disable-mg    Disable MG compilation
   --disable-mgpp        Disable MGPP compilation
@@ -1449 +1450 @@
 
 
+# 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.
@@ -7920 +7938 @@
 s,@USE_SQLITE@,$USE_SQLITE,;t t
 s,@USE_APACHE_HTTPD@,$USE_APACHE_HTTPD,;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/configure.in

@@ -81 +81 @@
 AC_SUBST(USE_APACHE_HTTPD)
 
+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/win32.mak

@@ -40 +40 @@
 ENABLE_MGPP = 1
 ENABLE_LUCENE = 1
+# jni is disabled by default as this is the default for GS2
+ENABLE_JNI = 0
 
 
@@ -77 +79 @@
 !IF $(USE_Z3950)
 MAKECMD = $(MAKECMD) USE_Z3950=1
+!ENDIF
+!IF "$(ENABLE_JNI)" == ""
+MAKECMD = $(MAKECMD) ENABLE_JNI=0
+!ELSE
+MAKECMD = $(MAKECMD) ENABLE_JNI=$(ENABLE_JNI)
 !ENDIF
 !IF "$(ENABLE_MG)" == ""