You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2009/03/11 22:50:04 UTC
svn commit: r752643 - in /lucene/pylucene/branches/pylucene_2_4: Makefile
jcc/setup.py
Author: vajda
Date: Wed Mar 11 21:50:03 2009
New Revision: 752643
URL: http://svn.apache.org/viewvc?rev=752643&view=rev
Log:
trunk rev 752638 merge into pylucene_2_4 branch
Modified:
lucene/pylucene/branches/pylucene_2_4/Makefile
lucene/pylucene/branches/pylucene_2_4/jcc/setup.py
Modified: lucene/pylucene/branches/pylucene_2_4/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_2_4/Makefile?rev=752643&r1=752642&r2=752643&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_2_4/Makefile (original)
+++ lucene/pylucene/branches/pylucene_2_4/Makefile Wed Mar 11 21:50:03 2009
@@ -14,7 +14,7 @@
# site-packages directory.
#
-VERSION=2.4.1-rc1
+VERSION=2.4.1-rc2
LUCENE_SVN_VER=HEAD
LUCENE_VER=2.4.1
LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/java/tags/lucene_2_4_1
@@ -238,6 +238,6 @@
cd distrib; openssl md5 < $(ARCHIVE) > $(ARCHIVE).md5
stage:
- scp -p $(ARCHIVE) $(ARCHIVE).asc $(ARCHIVE).md5 \
- people.apache.org:public_html/staging_area
+ cd distrib; scp -p $(ARCHIVE) $(ARCHIVE).asc $(ARCHIVE).md5 \
+ people.apache.org:public_html/staging_area
Modified: lucene/pylucene/branches/pylucene_2_4/jcc/setup.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_2_4/jcc/setup.py?rev=752643&r1=752642&r2=752643&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_2_4/jcc/setup.py (original)
+++ lucene/pylucene/branches/pylucene_2_4/jcc/setup.py Wed Mar 11 21:50:03 2009
@@ -166,7 +166,7 @@
enable_shared = False
-def main(debug):
+def main(debug, build):
_jcc_argsep = os.environ.get('JCC_ARGSEP', os.pathsep)
@@ -195,16 +195,17 @@
else:
_javac = JAVAC[platform]
- config = file(os.path.join(os.path.dirname(os.path.abspath(__file__)),
- 'jcc', 'config.py'), 'w')
- print >>config
- print >>config, 'INCLUDES=%s' %(_includes)
- print >>config, 'CFLAGS=%s' %(_cflags)
- print >>config, 'DEBUG_CFLAGS=%s' %(_debug_cflags)
- print >>config, 'LFLAGS=%s' %(_lflags)
- print >>config, 'SHARED=%s' %(enable_shared)
- print >>config
- config.close()
+ if build:
+ config = file(os.path.join(os.path.dirname(os.path.abspath(__file__)),
+ 'jcc', 'config.py'), 'w')
+ print >>config
+ print >>config, 'INCLUDES=%s' %(_includes)
+ print >>config, 'CFLAGS=%s' %(_cflags)
+ print >>config, 'DEBUG_CFLAGS=%s' %(_debug_cflags)
+ print >>config, 'LFLAGS=%s' %(_lflags)
+ print >>config, 'SHARED=%s' %(enable_shared)
+ print >>config
+ config.close()
extensions = []
@@ -314,4 +315,4 @@
if __name__ == "__main__":
- main('--debug' in sys.argv)
+ main('--debug' in sys.argv, 'build' in sys.argv)