Gentoo Archives: gentoo-commits

From: "Thomas Sachau (tommy)" <tommy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-mail/Freemail/files: build.patch
Date: Mon, 02 Feb 2009 21:28:45
Message-Id: E1LU6LG-00070t-6S@stork.gentoo.org
1 tommy 09/02/02 21:28:30
2
3 Added: build.patch
4 Log:
5 Initial commit. Fixes bug 240447
6 (Portage version: 2.2_rc23/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 net-mail/Freemail/files/build.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/Freemail/files/build.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/Freemail/files/build.patch?rev=1.1&content-type=text/plain
13
14 Index: build.patch
15 ===================================================================
16 --- build.xml 2008-10-08 18:58:11.000000000 +0200
17 +++ build.xml.new 2008-10-08 18:59:25.000000000 +0200
18 @@ -4,64 +4,8 @@
19 <property name="src" location="src"/>
20 <property name="build" location="build"/>
21 <property name="lib" location="lib"/>
22 - <property name="deps" location="deps"/>
23 -
24 - <property name="bcdist" value="lcrypto-jdk14-138"/>
25 - <property name="freenetjarurl.url" value="http://downloads.freenetproject.org/alpha/freenet-testing-latest.jar.url"/>
26 - <property name="freenetjarurl.localpath" value="${deps}/freenet-testing-latest.jar.url"/>
27 - <property name="freenetjar" value="freenet-main.jar"/>
28 -
29 - <target name="freenetjar-check">
30 - <available file="${deps}/${freenetjar}" property="freenetjar.present" />
31 - </target>
32 -
33 - <!-- Fetching the Freenet jar here is far from optimal:
34 - Ideally we'd compile against a the freenet jar or class files
35 - which the user almost certainly has on their computer already.
36 - Unfortunately about the only sensible way of doing this would
37 - be with Maven2, and both Freenet and Freemail import code from
38 - other projects which would make things difficult and/or ugly.
39 - -->
40 - <target name="freenetjar-fetch" depends="freenetjar-check" unless="freenetjar.present">
41 - <echo>
42 - Attempting to fetch Freenet main jar - ant cannot do this reliably, so if it fails, delete ${deps}/${freenetjar} and ${freenetjarurl.localpath} and run ant again.
43 - </echo>
44 - <mkdir dir="${deps}" />
45 - <!-- loadresource directly from an HTTP URL is causing problems -->
46 - <get src="${freenetjarurl.url}"
47 - dest="${freenetjarurl.localpath}" />
48 - <loadfile property="freenetjar.url"
49 - srcFile="${freenetjarurl.localpath}" />
50 - <get src="${freenetjar.url}"
51 - dest="${deps}/${freenetjar}"
52 - verbose="true" />
53 - </target>
54 -
55 - <target name="bouncycastle-check">
56 - <available file="${deps}/${bcdist}" property="bouncycastle-dist.present" />
57 - <available file="${build}/org/bouncycastle" property="bouncycastle-bin.present" />
58 - </target>
59 -
60 - <target name="bouncycastle-fetch" depends="bouncycastle-check" unless="bouncycastle-dist.present">
61 - <mkdir dir="${deps}" />
62 - <get src="http://www.bouncycastle.org/download/${bcdist}.zip"
63 - dest="${deps}/${bcdist}.zip"
64 - verbose="true"
65 - usetimestamp="true" />
66 -
67 - <unzip src="${deps}/${bcdist}.zip" dest="${deps}" />
68 - </target>
69 -
70 - <target name="bouncycastle-compile" depends="bouncycastle-fetch" unless="bouncycastle-bin.present">
71 - <mkdir dir="build" />
72 - <javac srcdir="${deps}/${bcdist}/src" destdir="${build}" debug="on" optimize="on" source="1.4" nowarn="true">
73 - <exclude name="**/test/*" />
74 - <exclude name="org/bouncycastle/util/IPTest.java" />
75 - <exclude name="org/bouncycastle/util/AllTests.java" />
76 - </javac>
77 - </target>
78
79 - <target name="compile" depends="bouncycastle-compile, freenetjar-fetch">
80 + <target name="compile">
81 <mkdir dir="${build}"/>
82
83 <tstamp/>
84 @@ -88,6 +33,7 @@
85 <manifest>
86 <attribute name="Main-Class" value="freemail.FreemailCli"/>
87 <attribute name="Plugin-Main-Class" value="freemail.FreemailPlugin"/>
88 + <attribute name="Class-Path" value="/usr/share/bcprov/lib/bcprov.jar /usr/share/freenet/lib/freenet.jar"/>
89 <attribute name="Built-By" value="${user.name}"/>
90 <section name="common">
91 <attribute name="Implementation-Title" value="Freemail"/>