- Revision
- 15942
- Author
- vajda
- Date
- 2007-11-28 15:19:10 -0800 (Wed, 28 Nov 2007)
Log Message
upgraded to latest PyLucene
Modified Paths
Diff
Modified: branches/64/chandler/Makefile (15941 => 15942)
--- branches/64/chandler/Makefile 2007-11-28 22:37:15 UTC (rev 15941) +++ branches/64/chandler/Makefile 2007-11-28 23:19:10 UTC (rev 15942) @@ -131,7 +131,7 @@ $(OPENJDK) \ $(CHANDLERARCHIVES)/m2crypto-$(SNAP)-0.18.2-$(BP)2.tar.gz \ $(CHANDLERARCHIVES)/PyICU-$(SNAP)-0.8-87-$(BP)1.tar.gz \ - $(CHANDLERARCHIVES)/PyLucene-$(SNAP)-2.2.0-1-363-$(BP)1.tar.gz \ + $(CHANDLERARCHIVES)/PyLucene-$(SNAP)-2.2.0-2-367-$(BP)1.tar.gz \ $(CHANDLERARCHIVES)/twisted-$(SNAP)-r18795-$(BP)3.tar.gz \ $(CHANDLERARCHIVES)/wxPython-$(SNAP)-2.8.6.1-r198-$(BP)2.tar.gz \ $(CHANDLERARCHIVES)/dateutil-$(SNAP)-1.1-$(BP)6.tar.gz \
Modified: branches/64/external/PyLucene/Makefile (15941 => 15942)
--- branches/64/external/PyLucene/Makefile 2007-11-28 22:37:15 UTC (rev 15941) +++ branches/64/external/PyLucene/Makefile 2007-11-28 23:19:10 UTC (rev 15942) @@ -1,6 +1,6 @@ -VERSION=2.2.0-1-$(SVNVER) -SVNVER=363 +VERSION=2.2.0-2-$(SVNVER) +SVNVER=367 RELVER=$(VERSION)-$(BRANCH_REV_PREFIX)1 PYLUCENE=$(BUILD_ROOT)/PyLucene SRC="" @@ -23,7 +23,6 @@ ENV= ifeq ($(DEBUG),1) -CFLAGS=-O0 DEBUG_OPT=--debug endif @@ -52,10 +51,7 @@ JAVA_HOME="$(JDK)" ifeq ($(DEBUG),1) -CFLAGS=-O0 DEBUG_OPT=--debug -else -CFLAGS= endif endif @@ -74,7 +70,8 @@ JAVA_HOME=`cygpath -aw "$(JDK)"` ifeq ($(DEBUG),1) -CFLAGS=/Od /DPy_DEBUG=1 +ENV:=$(ENV) \ + CFLAGS=/Od /DPy_DEBUG=1 DEBUG_OPT=--debug endif @@ -95,14 +92,13 @@ build: expand rm -rf $(SRC)/jcc/build rm -rf $(SRC)/build - cd $(SRC)/jcc; CFLAGS="$(CFLAGS)" $(JCC_ENV) \ + cd $(SRC)/jcc; $(ENV) $(JCC_ENV) \ $(PYTHON) setup.py build $(DEBUG_OPT) install $(ENV) $(MAKE) -C $(SRC) \ PYTHON="$(PYTHON)" \ ANT=$(ANT) \ JCC="$(PYTHON) -m jcc" \ NUM_FILES=$(NUM_FILES) \ - CFLAGS="$(CFLAGS)" \ DEBUG=$(DEBUG) \ compile install
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
