[sword-cvs] r1677 - in trunk: . bindings/corba/java
bindings/corba/orbitcpp include src/modules/texts/rawtext
src/modules/texts/ztext utilities/diatheke
scribe at crosswire.org
scribe at crosswire.org
Thu Sep 9 13:25:53 MST 2004
Author: scribe
Date: 2004-09-09 13:25:53 -0700 (Thu, 09 Sep 2004)
New Revision: 1677
Modified:
trunk/bindings/corba/java/Makefile
trunk/bindings/corba/java/testclient
trunk/bindings/corba/orbitcpp/Makefile
trunk/include/config.h
trunk/src/modules/texts/rawtext/rawtext.cpp
trunk/src/modules/texts/ztext/ztext.cpp
trunk/usrinst.sh
trunk/utilities/diatheke/corediatheke.cpp
trunk/utilities/diatheke/diatheke.cpp
Log:
Lucene updates.
Makefile cleanup in orbitcpp bindings
Modified: trunk/bindings/corba/java/Makefile
===================================================================
--- trunk/bindings/corba/java/Makefile 2004-08-25 18:29:45 UTC (rev 1676)
+++ trunk/bindings/corba/java/Makefile 2004-09-09 20:25:53 UTC (rev 1677)
@@ -1,12 +1,12 @@
-instbase=/var/tomcat
-webapp=swordweb
+TOMCAT_HOME=/home/tomcat/jakarta-tomcat
+instdir=/home/swordweb/livehtml
all: src/org/crosswire/sword/orb/SWMgr.java classes/org/crosswire/sword/orb/SwordOrb.class
src/org/crosswire/sword/orb/SWMgr.java: ../swordorb.idl
idlj -pkgTranslate swordorb org.crosswire.sword.orb -td src ../swordorb.idl
classes/org/crosswire/sword/orb/SwordOrb.class: src/org/crosswire/sword/orb/SwordOrb.java
- javac -classpath ${instbase}/common/lib/servlet-api.jar -d classes -sourcepath src src/org/crosswire/sword/orb/*.java src/org/crosswire/util/*.java
+ javac -classpath ${TOMCAT_HOME}/common/lib/servlet-api.jar -d classes -sourcepath src src/org/crosswire/sword/orb/*.java src/org/crosswire/util/*.java
clean:
@@ -18,4 +18,4 @@
rm -rf classes/*
install:
- cp -a classes/org/ ${instbase}/webapps/${webapp}/WEB-INF/classes/
+ cp -a classes/org/ ${instdir}/WEB-INF/classes/
Modified: trunk/bindings/corba/java/testclient
===================================================================
--- trunk/bindings/corba/java/testclient 2004-08-25 18:29:45 UTC (rev 1676)
+++ trunk/bindings/corba/java/testclient 2004-09-09 20:25:53 UTC (rev 1677)
@@ -1,2 +1,3 @@
#!/bin/sh
-java -cp /var/tomcat/common/lib/servlet-api.jar:classes org.crosswire.sword.orb.SwordOrb $*
+TOMCAT_HOME=/home/tomcat/jakarta-tomcat
+java -cp $TOMCAT_HOME/common/lib/servlet-api.jar:classes org.crosswire.sword.orb.SwordOrb $*
Modified: trunk/bindings/corba/orbitcpp/Makefile
===================================================================
--- trunk/bindings/corba/orbitcpp/Makefile 2004-08-25 18:29:45 UTC (rev 1676)
+++ trunk/bindings/corba/orbitcpp/Makefile 2004-09-09 20:25:53 UTC (rev 1677)
@@ -1,47 +1,52 @@
all: server testclient
#comment these out if you didn't compile sword with lucene support
-#luceneflags=-DUSELUCENE
-#lucenelibs=-lclucene
+CXXFLAGS += -DUSELUCENE
+CFLAGS += -DUSELUCENE
+LIBS += -lclucene
+
+#comment these out if you didn't compile sword with ICU support
+LIBS += -licui18n -licuuc -licudata -lpthread -licuio
+
+#comment out for release
+#CXXFLAGS += -g -O0
+#CFLAGS += -g -O0
+#LDFLAGS += -g -O0
#----------------------------------
-LIBS += ${lucenelibs}
-CFLAGS += ${luceneflags}
-CXXFLAGS += ${luceneflags}
-
server: swordorb-common.o server.cpp swordorb-impl.o swordorb-cpp.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-cpp-skels.o swordorb-skels.o swordorb-cpp.o
- g++ -g -I. -I../../../include -I/usr/include/orbitcpp-2.0/ `orbit2-config --cflags` -o server server.cpp swordorb-impl.o swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-cpp-skels.o swordorb-skels.o `orbit2-config --libs` -lORBit-2-cpp -lsword -lz ${LIBS}
+ $(CXX) $(CXXFLAGS) -I. -I../../../include -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -o server server.cpp swordorb-impl.o swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-cpp-skels.o swordorb-skels.o `orbit2-config --libs` -lORBit-2-cpp -lsword -lz ${LIBS}
testclient: testclient.cpp swordorb-impl.cpp swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-skels.o swordorb-cpp-skels.o
- g++ -I. -I../../../include -I/usr/include/orbitcpp-2.0/ `orbit2-config --cflags` -o testclient testclient.cpp swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-skels.o swordorb-cpp-skels.o `orbit2-config --libs` -lORBit-2-cpp
+ $(CXX) $(CXXFLAGS) -I. -I../../../include -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -o testclient testclient.cpp swordorb-common.o swordorb-cpp-common.o swordorb-stubs.o swordorb-cpp-stubs.o swordorb-skels.o swordorb-cpp-skels.o `orbit2-config --libs` -lORBit-2-cpp
swordorb-cpp.o: swordorb-cpp.cc
- g++ -I. -I../../../include -I/usr/include/orbitcpp-2.0/ `orbit2-config --cflags` -g -c swordorb-cpp.cc
+ $(CXX) $(CXXFLAGS) -I. -I../../../include -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-cpp.cc
swordorb-impl.o: swordorb-impl.cpp
- g++ -g -I. -I../../../include -I/usr/include/orbitcpp-2.0/ `orbit2-config --cflags` -g -c swordorb-impl.cpp
+ $(CXX) $(CXXFLAGS) -I. -I../../../include -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-impl.cpp
swordorb-common.o: swordorb-common.c
- gcc -I. -I../../../include -I/usr/include/orbitcpp-2.0/ `orbit2-config --cflags` -g -c swordorb-common.c
+ $(CC) $(CFLAGS) -I. -I../../../include -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-common.c
swordorb-common.c: ./../swordorb.idl
orbit-idl-2 -l c ./../swordorb.idl
orbit-idl-2 -l cpp ./../swordorb.idl
swordorb-cpp-common.o: swordorb-cpp-common.cc
- g++ -I. -I../../../include -I/usr/include/orbitcpp-2.0/ `orbit2-config --cflags` -g -c swordorb-cpp-common.cc
+ $(CXX) $(CXXFLAGS) -I. -I../../../include -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-cpp-common.cc
swordorb-stubs.o: swordorb-stubs.c
- gcc -I. -I../../../include -I/usr/include/orbitcpp-2.0/ `orbit2-config --cflags` -g -c swordorb-stubs.c
+ $(CC) $(CFLAGS) -I. -I../../../include -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-stubs.c
swordorb-cpp-stubs.o: swordorb-cpp-stubs.cc
- g++ -I. -I../../../include -I/usr/include/orbitcpp-2.0/ `orbit2-config --cflags` -g -c swordorb-cpp-stubs.cc
+ $(CXX) $(CXXFLAGS) -I. -I../../../include -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-cpp-stubs.cc
swordorb-skels.o: swordorb-skels.c
- gcc -I. -I../../../include -I/usr/include/orbitcpp-2.0/ `orbit2-config --cflags` -g -c swordorb-skels.c
+ $(CC) $(CFLAGS) -I. -I../../../include -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-skels.c
swordorb-cpp-skels.o: swordorb-cpp-skels.cc
- g++ -I. -I../../../include -I/usr/include/orbitcpp-2.0/ `orbit2-config --cflags` -g -c swordorb-cpp-skels.cc
+ $(CXX) $(CXXFLAGS) -I. -I../../../include -I/usr/local/include/orbitcpp-2.0/ `orbit2-config --cflags` -c swordorb-cpp-skels.cc
clean:
rm -f *.h *.cc *.o *.c server testclient
Modified: trunk/include/config.h
===================================================================
--- trunk/include/config.h 2004-08-25 18:29:45 UTC (rev 1676)
+++ trunk/include/config.h 2004-09-09 20:25:53 UTC (rev 1677)
@@ -7,9 +7,6 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
-/* Define to 1 if you have the `ftplib' library (-lftplib). */
-/* #undef HAVE_LIBFTPLIB */
-
/* Define to 1 if you have the `z' library (-lz). */
#define HAVE_LIBZ 1
Modified: trunk/src/modules/texts/rawtext/rawtext.cpp
===================================================================
--- trunk/src/modules/texts/rawtext/rawtext.cpp 2004-08-25 18:29:45 UTC (rev 1676)
+++ trunk/src/modules/texts/rawtext/rawtext.cpp 2004-09-09 20:25:53 UTC (rev 1677)
@@ -6,6 +6,7 @@
#include <stdio.h>
#include <fcntl.h>
+#include <sysdata.h>
#ifndef __GNUC__
#include <io.h>
@@ -19,7 +20,7 @@
#include <regex.h> // GNU
#ifdef USELUCENE
-#include <CLucene/CLucene.h>
+#include <CLucene.h>
using namespace lucene::search;
using namespace lucene::queryParser;
#else
Modified: trunk/src/modules/texts/ztext/ztext.cpp
===================================================================
--- trunk/src/modules/texts/ztext/ztext.cpp 2004-08-25 18:29:45 UTC (rev 1676)
+++ trunk/src/modules/texts/ztext/ztext.cpp 2004-09-09 20:25:53 UTC (rev 1677)
@@ -8,6 +8,8 @@
#include <stdio.h>
#include <fcntl.h>
+#include <sysdata.h>
+
#ifndef __GNUC__
#include <io.h>
#else
@@ -21,7 +23,7 @@
#ifdef USELUCENE
-#include <CLucene/CLucene.h>
+#include <CLucene.h>
using namespace lucene::search;
using namespace lucene::queryParser;
#endif
Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh 2004-08-25 18:29:45 UTC (rev 1676)
+++ trunk/usrinst.sh 2004-09-09 20:25:53 UTC (rev 1677)
@@ -4,12 +4,14 @@
OPTIONS="--disable-shared $OPTIONS"
OPTIONS="--without-conf $OPTIONS"
OPTIONS="--sysconfdir=/etc $OPTIONS"
+OPTIONS="--with-icu $OPTIONS"
#OPTIONS="--with-vcl $OPTIONS"
-OPTIONS="--enable-debug $OPTIONS"
+#OPTIONS="--enable-debug $OPTIONS"
#OPTIONS="--enable-profile $OPTIONS"
-OPTIONS="--without-lucene $OPTIONS"
-OPTIONS="--enable-tests $OPTIONS"
+OPTIONS="--with-lucene $OPTIONS"
+#OPTIONS="--enable-tests $OPTIONS"
+
CPPFLAGS="$CFLAGS $CPPFLAGS -DUSBINARY" ./configure $OPTIONS $*
echo ""
Modified: trunk/utilities/diatheke/corediatheke.cpp
===================================================================
--- trunk/utilities/diatheke/corediatheke.cpp 2004-08-25 18:29:45 UTC (rev 1676)
+++ trunk/utilities/diatheke/corediatheke.cpp 2004-09-09 20:25:53 UTC (rev 1677)
@@ -208,12 +208,10 @@
else
manager.setGlobalOption("Transliteration", "Primary Readings");
-#ifdef _ICU_
if (optionfilters & OP_TRANSLITERATOR && script)
manager.setGlobalOption("Transliteration", script);
else
manager.setGlobalOption("Transliteration", "Off");
-#endif
if (querytype == QT_SEARCH) {
Modified: trunk/utilities/diatheke/diatheke.cpp
===================================================================
--- trunk/utilities/diatheke/diatheke.cpp 2004-08-25 18:29:45 UTC (rev 1676)
+++ trunk/utilities/diatheke/diatheke.cpp 2004-09-09 20:25:53 UTC (rev 1677)
@@ -201,7 +201,6 @@
i++;
}
}
-#ifdef _ICU_
else if (!stricmp("-t", argv[i])) {
if (i+1 <= argc) {
script = argv[i+1];
@@ -209,7 +208,6 @@
i++;
}
}
-#endif
}
More information about the sword-cvs
mailing list