Author: ranger
Date: Tue Jun 27 18:00:05 2006
New Revision: 151
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=151&repname=user%3a+ranger>
Log:
jython 2.3 runs!
Modified:
trunk/experimental/common/main/finkinfo/languages/jython.info
trunk/experimental/common/main/finkinfo/languages/jython.patch
Modified: trunk/experimental/common/main/finkinfo/languages/jython.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/languages/jython.info&rev=151&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/languages/jython.info (original)
+++ trunk/experimental/common/main/finkinfo/languages/jython.info Tue Jun 27
18:00:05 2006
@@ -1,37 +1,33 @@
Package: jython
-Version: 2.2
-Revision: 0.alpha1.2
+Version: 2.3
+Revision: 0.20060627.1
CustomMirror: <<
nam-US: http://ranger.befunk.com/fink
nam-US: http://astrange.ithinksw.net/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
Type: java(1.4)
-Source: mirror:custom:jython-cvs.tar.bz2
-Source-MD5: b36026e31a3065681eddb99a526cd4c3
-SourceDirectory: %n
-Source2: mirror:custom:python-release22-maint-cvs.tar.bz2
-Source2-MD5: 2b81cfa5288d88349cdfc86da4ec33d5
-Source2ExtractDir: %n
+Source: mirror:custom:jython-2.3-20060627.tar.bz2
+Source-MD5: e15058ca1e3efdc29b5ca9a9d8c568a2
+SourceDirectory: jython-%v-cvs
+Source2: http://python.org/ftp/python/2.3.5/Python-2.3.5.tgz
+Source2-MD5: 7a1ecc1196c5c0e9d4eef90ba684c4e9
+Source2ExtractDir: jython-%v-cvs
Patch: %n.patch
-BuildDepends: fink (>= 0.22.2-1), ht2html, jakarta-oro, jakarta-servletapi,
mysql-java, postgresql-java | postgresql-ssl-java, python22 | python22-nox,
pyxml-py22, readline-java, system-java14-dev
-Depends: jakarta-oro, jakarta-servletapi, mysql-java, postgresql-java |
postgresql-ssl-java, readline-java, system-java14 | system-java15
+BuildDepends: fink (>= 0.22.2-1), ht2html, jakarta-oro, jakarta-servletapi,
mysql-java, postgresql-java | postgresql-ssl-java, python23, pyxml-py23,
readline-java, system-java14-dev
+Depends: jakarta-oro, jakarta-servletapi, mysql-java, postgresql-java |
postgresql-ssl-java, python23, pyxml-py23, readline-java, system-java14 |
system-java15
CompileScript: <<
#!/bin/sh -xe
- find . -name \*.jar -exec rm -rf {} \; || :
- find . -type d -name CVS -exec rm -rf {} \; || :
- rm -rf org/apache || :
- perl -p -i -e 's|execon|apply|g' build.xml
- ant copy-dist -Dpython.lib=./python/dist/src/Lib -DPyXmlHome=%p/lib/python2.2
- ant -Dpython.home="%p/bin" -Dht2html.dir="%p/lib/ht2html" doc
- ant javadoc
+ find . -name \*.jar -exec rm -rf {} \; || :
+ find . -type d -name CVS -exec rm -rf {} \; || :
+ export ARGS="-Dpython.home=./Python-2.3.5
-Dpython.lib=./Python-2.3.5/Lib -DPyXmlHome=%p/lib/python2.3
-Dht2html.dir=%p/lib/ht2html -DjavaccHome=%p
-Djavacc.jar=%p/share/java/javacc/javacc.jar -Ddeveloper-build-called=true
-Dfull-build=true -Dpython.exe=%p/bin/python2.3"
+ ant $ARGS copy-dist
<<
InstallScript: <<
#!/bin/sh -xe
# documentation
- rm -rf Doc/Makefile Doc/api
install -d -m 755 %i/share/doc/%n
mv dist/Doc/javadoc %i/share/doc/%n/
Modified: trunk/experimental/common/main/finkinfo/languages/jython.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/languages/jython.patch&rev=151&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/languages/jython.patch (original)
+++ trunk/experimental/common/main/finkinfo/languages/jython.patch Tue Jun 27
18:00:05 2006
@@ -1,30 +1,12 @@
-diff -uNr jython-2.1.0.orig/org/python/core/PySystemState.java
jython-2.1.0.orig-patched/org/python/core/PySystemState.java
---- jython-2.1.0.orig/org/python/core/PySystemState.java 2001-12-31
06:18:18.000000000 -0500
-+++ jython-2.1.0.orig-patched/org/python/core/PySystemState.java
2004-07-08 11:06:45.000000000 -0400
-@@ -298,8 +298,8 @@
- }
- try {
- addRegistryFile(new File(prefix, "registry"));
-- File homeFile = new File(registry.getProperty("user.home"),
-- ".jython");
-+ File homeFile = new File(new
File(registry.getProperty("user.home"),
-+ ".jython"), "registry");
- addRegistryFile(homeFile);
- } catch (Exception exc) {
- ;
-@@ -441,8 +441,13 @@
- }
- cachedir = new File(props.getProperty("python.cachedir", "cachedir"));
- if (!cachedir.isAbsolute()) {
-- cachedir = new File(PySystemState.prefix, cachedir.getPath());
-- }
-+ File jythondir = new File(System.getProperty("user.home"),
".jython");
-+
-+ if (!jythondir.isDirectory()) {
-+ jythondir.mkdirs();
-+ }
-+
-+ cachedir = new File(jythondir, cachedir.getPath()); }
- }
+diff -uNr jython-2.3-cvs/build.xml jython-2.3-cvs-new/build.xml
+--- jython-2.3-cvs/build.xml 2006-06-27 00:48:41.000000000 -0400
++++ jython-2.3-cvs-new/build.xml 2006-06-27 10:32:07.000000000 -0400
+@@ -516,7 +516,7 @@
+ <!-- copy the CPython license -->
+ <echo>copy CPython LICENSE from ${python.home} to
${dist.dir}/LICENSE_CPython.txt</echo>
+ <!-- +++ TODO: checkout the CPython LICENSE (not: .txt) and copy from
there -->
+- <copy file="${python.home}/LICENSE.txt"
tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
++ <copy file="${python.home}/LICENSE"
tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
- private static void initPackages(Properties props) {
+ <!-- sources: todir has to correspond with
installer/**/JarInstaller.java -->
+ <echo>copy sources from ${jython.base.dir}</echo>
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
