Changeset 13777

Timestamp:

2007-01-24T10:48:33+13:00 (17 years ago)

Author:

kjdon

Message:

merged the indexers branch. mg, mgpp, lucene and unac now live in indexers repository

Location:

trunk/gsdl

Files:

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

trunk/gsdl/Makefile.in

@@ -47 +47 @@
 ALLFILES = $(OBJECTS)
 
-INSTALLDIRS = src/recpt src/txt2db src/db2txt src/hashfile src/getpw packages/mg src/phind/generate packages src/mgpp src/oaiservr
+# indexers are treated slightly differently as we don't want to do make all/install
+INDEXERSDIR = indexers
+# all directories to be compiled
+COMPILEDIRS = packages lib src/txt2db src/db2txt src/hashfile src/getpw src/phind/generate src/colservr src/recpt src/oaiservr
+# a subset of the directories get installed
+INSTALLDIRS = packages src/recpt src/txt2db src/db2txt src/hashfile src/getpw src/phind/generate src/oaiservr
 
 MODULEDIRS = @MODULEDIRS@
 
-OTHERDIRS = packages packages/mg lib src/mgpp src/colservr src/recpt src/txt2db src/db2txt src/hashfile src/getpw src/phind/generate src/oaiservr
 
+# we don't want to compile the java stuff in indexers for gs2
 all:
-    for odir in $(OTHERDIRS) $(MODULEDIRS); do \
+    for odir in $(INDEXERSDIR); do \
+      echo making $@ in $$odir; \
+      (cd $$odir && $(MAKE) $(MDEFINES) nojava) || exit 1; \
+    done
+    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
       echo making $@ in $$odir; \
       (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
@@ -60 +69 @@
 
 install: all
-
+    for odir in $(INDEXERSDIR); do \
+      echo making $@ in $$odir; \
+      (cd $$odir && $(MAKE) $(MDEFINES) install-nojava) || exit 1; \
+    done    
     for idir in $(INSTALLDIRS); do \
       echo installing $$idir; \
@@ -68 +80 @@
 # added test to check existence of Makefile, as src/recpt is in
 # both INSTALLDIRS and OTHERDIRS - can't make distclean twice!
+# do we need this test now??
 distclean: clean
     rm -f Makefile config.cache config.h config.log stamp-h config.status
-    for subdir in $(INSTALLDIRS) $(OTHERDIRS); do \
+    for subdir in $(COMPILEDIRS); do \
       echo cleaning $@ in $$subdir; \
       (cd $$subdir && if test -e Makefile; then $(MAKE) distclean;fi) || exit 1; \
@@ -76 +89 @@
 
 clean:
-    for subdir in $(INSTALLDIRS) $(OTHERDIRS); do \
+    for subdir in $(COMPILEDIRS); do \
       echo cleaning $@ in $$subdir; \
       (cd $$subdir && if test -e Makefile; then $(MAKE) clean; fi) || exit 1; \

trunk/gsdl/configure

@@ -310 +310 @@
 #endif"
 
-ac_subdirs_all="$ac_subdirs_all packages"
+ac_subdirs_all="$ac_subdirs_all packages 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 CFLAGS CC LDFLAGS 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 MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs LTLIBOBJS'
 ac_subst_files=''
@@ -7400 +7400 @@
 # ---------------------------------------------------------------------------
 
-
-subdirs="$subdirs packages"
+# indexers needs a bindir option to get the binaries into the right place
+gsdlprefix=`pwd`
+ac_configure_args="$ac_configure_args --bindir=$gsdlprefix/bin/$gsdlos "
+
+
+subdirs="$subdirs packages indexers"
 
 
 # the list of folders in the src folder
-srclist="src/mgpp/lib/Makefile src/mgpp/text/Makefile src/mgpp/Makefile \
-          src/hashfile/Makefile src/colservr/Makefile src/recpt/Makefile src/txt2db/Makefile \
+srclist="src/hashfile/Makefile src/colservr/Makefile src/recpt/Makefile src/txt2db/Makefile \
           src/oaiservr/Makefile src/db2txt/Makefile src/getpw/Makefile src/phind/generate/Makefile"
 
-                                                                                                    ac_config_files="$ac_config_files packages/Makefile packages/mg/Makefile packages/mg/src/text/Makefile packages/mg/src/images/Makefile packages/mg/src/scripts/Makefile packages/mg/lib/Makefile lib/Makefile Makefile $srclist $moduleDirs"
+                                                  ac_config_files="$ac_config_files packages/Makefile lib/Makefile Makefile $srclist $moduleDirs"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7936 +7939 @@
   # Handling of arguments.
   "packages/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;;
-  "packages/mg/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/Makefile" ;;
-  "packages/mg/src/text/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/src/text/Makefile" ;;
-  "packages/mg/src/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/src/images/Makefile" ;;
-  "packages/mg/src/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/src/scripts/Makefile" ;;
-  "packages/mg/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/lib/Makefile" ;;
   "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;

trunk/gsdl/configure.in

@@ -417 +417 @@
 dnl not needed any more?
 dnl ac_configure_args="$ac_configure_args --build=$build --target=$target"
-AC_CONFIG_SUBDIRS(packages)
+
+# indexers needs a bindir option to get the binaries into the right place
+gsdlprefix=`pwd`
+ac_configure_args="$ac_configure_args --bindir=$gsdlprefix/bin/$gsdlos "
+AC_CONFIG_SUBDIRS(packages indexers)
 
 # the list of folders in the src folder
-srclist="src/mgpp/lib/Makefile src/mgpp/text/Makefile src/mgpp/Makefile \
-          src/hashfile/Makefile src/colservr/Makefile src/recpt/Makefile src/txt2db/Makefile \
+srclist="src/hashfile/Makefile src/colservr/Makefile src/recpt/Makefile src/txt2db/Makefile \
           src/oaiservr/Makefile src/db2txt/Makefile src/getpw/Makefile src/phind/generate/Makefile"
 
-AC_OUTPUT(packages/Makefile packages/mg/Makefile packages/mg/src/text/Makefile packages/mg/src/images/Makefile 
-          packages/mg/src/scripts/Makefile packages/mg/lib/Makefile
-      lib/Makefile Makefile $srclist $moduleDirs)
-
-
+AC_OUTPUT(packages/Makefile lib/Makefile Makefile $srclist $moduleDirs)
+
+

trunk/gsdl/win32.mak

@@ -34 +34 @@
 MDEFINES = /f win32.mak
 
-OTHERDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt packages\windows\expat\expat \
-            packages\mg\lib src\mgpp\lib lib src\colservr
+OTHERDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt \
+      packages\windows\expat\expat lib src\colservr
 
-INSTALLDIRS = packages\mg\src\text src\mgpp\text src\recpt src\oaiservr \
-          src\hashfile src\db2txt src\txt2db src\phind\generate
+INSTALLDIRS = src\hashfile src\db2txt src\txt2db src\phind\generate \
+        src\recpt src\oaiservr 
+          
 
 YAZ_DIR = packages\yaz\yaz-2.1.4\win
+INDEXERSDIR = indexers
 
 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
@@ -64 +66 @@
 MAKECLEANCMD = $(MAKE) $(MDEFINES) clean
 
-all: win32.mak $(OTHERDIRS) $(YAZ_DIRS) $(INSTALLDIRS) 
+all: win32.mak $(INDEXERSDIR) $(OTHERDIRS) $(YAZ_DIRS) $(INSTALLDIRS) 
 
-install: win32.mak $(INSTALLDIRS)
+install: win32.mak $(INDEXERSDIR) $(INSTALLDIRS)
 
 clean:
@@ -117 +119 @@
     $(MAKECLEANCMD)
     cd "$(GSDLHOME)"
-
+    cd indexers
+    call winMake.bat clean
+    cd "$(GSDLHOME)"
 
 $(OTHERDIRS): FORCE
@@ -135 +139 @@
     cd "$(GSDLHOME)"
 
+$(INDEXERSDIR): FORCE
+    cd "$@"
+    call winMake.bat all nojava
+    call winMake.bat install nojava
+    copy bin\*.exe "$(GSDLHOME)\bin\windows"
+    cd "$(GSDLHOME)"
+
 FORCE: