[Commits] (vajda) PyLucene now part of new build on windows

[commits at osafoundation.org]

Commit by: vajda
Modified files:
external/persistence/PyLucene/db.lst None 1.1
external/persistence/PyLucene/lucene.lst None 1.1
external/persistence/PyLucene/store.lst None 1.1
external/persistence/PyLucene/Makefile 1.6 1.7
external/persistence/PyLucene/Makefile.dev 1.1 1.2
external/persistence/PyLucene/Makefile.mingw 1.1 1.2

Log message:
PyLucene now part of new build on windows


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/persistence/PyLucene/db.lst?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/PyLucene/lucene.lst?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/PyLucene/store.lst?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/PyLucene/Makefile.diff?r1=text&tr1=1.6&r2=text&tr2=1.7
http://cvs.osafoundation.org/index.cgi/external/persistence/PyLucene/Makefile.dev.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/external/persistence/PyLucene/Makefile.mingw.diff?r1=text&tr1=1.1&r2=text&tr2=1.2

Index: external/persistence/PyLucene/Makefile
diff -u external/persistence/PyLucene/Makefile:1.6 external/persistence/PyLucene/Makefile:1.7
--- external/persistence/PyLucene/Makefile:1.6	Thu Mar 18 10:02:55 2004
+++ external/persistence/PyLucene/Makefile	Thu Mar 18 18:14:31 2004
@@ -7,18 +7,37 @@
 
 ifeq ($(DEBUG),1)
 COMP_OPT=DEBUG=1
+SUFFIX=d
+_SUFFIX=_d
 else
 COMP_OPT=
+SUFFIX=
+_SUFFIX=
 endif
 
+ifeq ($(OS),Cygwin)
+OS_MAKE=Makefile.mingw
+MAKE=nmake
+else
 ifeq ($(OS),Darwin)
 OS_MAKE=Makefile.osx
 else
 OS_MAKE=Makefile.linux
 endif
+endif
 
 BUILD=build_$(SNAP)
 
+ifeq ($(OS),Cygwin)
+
+snap: 
+	cd $(BUILD_ROOT); \
+        tar -cvzf $(PYLUCENE)/$(SNAP).tar.gz \
+                  $(SNAP)/$(SITE)/PyLucene$(_SUFFIX).py \
+                  $(SNAP)/$(SITE)/_PyLucene$(_SUFFIX).pyd \
+                  $(SNAP)/bin/libdb_java42$(SUFFIX).dll
+
+else
 
 ifeq ($(OS),Darwin)
 
@@ -47,11 +66,14 @@
 
 endif
 
+endif
+
 apply: patches
 	patch -Nup0 < patches; echo ok
 
 build: apply
-	$(MAKE) -f $(OS_MAKE) GCJ=$(GCJ_HOME) $(COMP_OPT) \
+	MAKEFLAGS=; \
+	$(MAKE) -f $(OS_MAKE) GCJ=`cygpath -aw $(GCJ_HOME)` $(COMP_OPT) \
                               DBVERSION=4.2.52 VERSION=$(VERSION) \
                               all install
 

Index: external/persistence/PyLucene/Makefile.dev
diff -u external/persistence/PyLucene/Makefile.dev:1.1 external/persistence/PyLucene/Makefile.dev:1.2
--- external/persistence/PyLucene/Makefile.dev:1.1	Mon Mar 15 11:48:40 2004
+++ external/persistence/PyLucene/Makefile.dev	Thu Mar 18 18:14:31 2004
@@ -24,8 +24,8 @@
 JCC = $(GCJ_HOME)/bin/gcj
 JCCH = $(GCJ_HOME)/bin/gcjh
 
-LUCENE = $(SRCDIR)/lucene
-DB = $(SRCDIR)/../db
+LUCENE = $(SRCDIR)/lucene-$(VERSION)
+DB = $(SRCDIR)/../db/db-$(DBVERSION)
 PYTHON = /Library/Frameworks/Python.framework/Versions/2.3
 
 PYTHON_INC = $(PYTHON)/include/python2.3

Index: external/persistence/PyLucene/Makefile.mingw
diff -u external/persistence/PyLucene/Makefile.mingw:1.1 external/persistence/PyLucene/Makefile.mingw:1.2
--- external/persistence/PyLucene/Makefile.mingw:1.1	Mon Mar 15 11:48:40 2004
+++ external/persistence/PyLucene/Makefile.mingw	Thu Mar 18 18:14:31 2004
@@ -29,8 +29,8 @@
 JCC = $(GCJ)\bin\gcj
 JCCH = $(GCJ)\bin\gcjh
 
-LUCENE = $(SRCDIR)\lucene
-DB = $(SRCDIR)\..\db
+LUCENE = $(SRCDIR)\lucene-$(VERSION)
+DB = $(SRCDIR)\..\db\db-$(DBVERSION)
 
 PYTHON_INC = $(RELDIR)\bin\include
 PYTHON_SITE = $(RELDIR)\bin\Lib\site-packages