1 |
ali_bush 09/06/18 10:51:12 |
2 |
|
3 |
Added: jython-2.5.0-build.patch |
4 |
Log: |
5 |
Version Bump. New slot as seems to break at least one existing package. Tests still do not work :| |
6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 dev-java/jython/files/jython-2.5.0-build.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/files/jython-2.5.0-build.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jython/files/jython-2.5.0-build.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: jython-2.5.0-build.patch |
15 |
=================================================================== |
16 |
--- build.xml.old 2009-06-18 19:12:11.000000000 +1200 |
17 |
+++ build.xml 2009-06-18 19:14:11.000000000 +1200 |
18 |
@@ -158,7 +158,8 @@ |
19 |
<pathelement path="${extlibs.dir}/asm-3.1.jar" /> |
20 |
<pathelement path="${extlibs.dir}/asm-commons-3.1.jar" /> |
21 |
<pathelement path="${extlibs.dir}/constantine-0.4.jar" /> |
22 |
- <pathelement path="${extlibs.dir}/jna-posix.jar"/> |
23 |
+ <pathelement path="${extlibs.dir}/jna-posix.jar"/> |
24 |
+ <pathelement path="${extlibs.dir}/ant.jar" /> |
25 |
</path> |
26 |
|
27 |
<available property="informix.present" classname="com.informix.jdbc.IfxDriver" classpath="${informix.jar}" /> |
28 |
@@ -236,17 +237,8 @@ |
29 |
<condition property="do.checkout" value="true"> |
30 |
<istrue value="${has.repositories.connection}" /> |
31 |
</condition> |
32 |
- |
33 |
- <!-- classpath for svn ant task --> |
34 |
- <path id="svn.classpath"> |
35 |
- <pathelement path="${java.class.path}" /> |
36 |
- <fileset dir="${svnant.jar.dir}"> |
37 |
- <include name="*.jar"/> |
38 |
- </fileset> |
39 |
- </path> |
40 |
- <!-- taskdef for svn ant task --> |
41 |
- <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="svn.classpath" /> |
42 |
</target> |
43 |
+ |
44 |
<target name="full-check" depends="full-preinit, init, dump-env"> |
45 |
<!-- Require all of the optional jars for a full build --> |
46 |
<fail unless="informix.present" message="informix jar not present" /> |
47 |
@@ -347,6 +339,16 @@ |
48 |
</target> |
49 |
|
50 |
<target name="checkout" depends="prepare" if="do.checkout"> |
51 |
+ <!-- classpath for svn ant task --> |
52 |
+ <path id="svn.classpath"> |
53 |
+ <pathelement path="${java.class.path}" /> |
54 |
+ <fileset dir="${svnant.jar.dir}"> |
55 |
+ <include name="*.jar"/> |
56 |
+ </fileset> |
57 |
+ </path> |
58 |
+ <!-- taskdef for svn ant task --> |
59 |
+ <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="svn.classpath" /> |
60 |
+ |
61 |
<svn javahl="${javahl.dir}" > |
62 |
<checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.installer.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.installer.dir}" /> |
63 |
<checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/${svn.code.dir}" revision="${svn.revision}" destPath="${svn.checkout.dir}/${svn.code.dir}" /> |