Gentoo Archives: gentoo-commits

From: "Jean-Noel Rivasseau (elvanor)" <elvanor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/cglib/files: 2.2-beta-nojarjar.patch cglib-2.2-build.patch words.txt 2.2-nojarjar.patch
Date: Thu, 03 Sep 2009 10:35:04
Message-Id: E1MjETL-0006df-MA@stork.gentoo.org
1 elvanor 09/09/03 15:43:39
2
3 Added: 2.2-beta-nojarjar.patch cglib-2.2-build.patch
4 words.txt
5 Removed: 2.2-nojarjar.patch
6 Log:
7 Bump to cglib-2.2.
8 (Portage version: 2.1.6.13/cvs/Linux i686)
9
10 Revision Changes Path
11 1.1 dev-java/cglib/files/2.2-beta-nojarjar.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/cglib/files/2.2-beta-nojarjar.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/cglib/files/2.2-beta-nojarjar.patch?rev=1.1&content-type=text/plain
15
16 Index: 2.2-beta-nojarjar.patch
17 ===================================================================
18 diff -ur work.old/build.xml work/build.xml
19 --- work.old/build.xml 2008-02-17 18:33:06.000000000 +0200
20 +++ work/build.xml 2008-02-17 18:33:26.000000000 +0200
21 @@ -124,14 +124,6 @@
22 <exclude name="samples/**" />
23 </jar>
24
25 - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
26 - <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
27 - <zipfileset dir="lib" includes="asm*.txt"/>
28 - <zipfileset src="lib/asm.jar" excludes="META-INF"/>
29 - <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
30 - <include name="**/*"/>
31 - <exclude name="samples/**"/>
32 - </jarjar>
33 </target>
34
35 <target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
36
37
38
39 1.1 dev-java/cglib/files/cglib-2.2-build.patch
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/cglib/files/cglib-2.2-build.patch?rev=1.1&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/cglib/files/cglib-2.2-build.patch?rev=1.1&content-type=text/plain
43
44 Index: cglib-2.2-build.patch
45 ===================================================================
46 --- build.xml.orig 2009-09-02 16:27:55.000000000 +0200
47 +++ build.xml 2009-09-03 17:24:23.000000000 +0200
48 @@ -73,7 +73,7 @@
49 <target depends="prepare" description="Compile shareable components"
50 name="compile">
51 <javac debug="${compile.debug}" deprecation="${compile.deprecation}" destdir="${build.home}/classes" optimize="${compile.optimize}" srcdir="${source.home}"
52 - target="${compile.target}" bootclasspath="${compile.bootclasspath}" extdirs="${compile.extdirs}" source="${compile.source}">
53 + target="${compile.target}" extdirs="${compile.extdirs}" source="${compile.source}">
54 <classpath refid="compile.classpath"/>
55 <compilerarg compiler="jikes" value="-nowarn"/>
56 </javac>
57 @@ -122,16 +122,7 @@
58 <jar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-${component.version}.jar" >
59 <include name="**/*"/>
60 <exclude name="samples/**" />
61 - </jar>
62 -
63 - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
64 - <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
65 - <zipfileset dir="lib" includes="asm*.txt"/>
66 - <zipfileset src="lib/asm-3.1.jar" excludes="META-INF"/>
67 - <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
68 - <include name="**/*"/>
69 - <exclude name="samples/**"/>
70 - </jarjar>
71 + </jar>
72 </target>
73
74 <target depends="compile,javadoc" description="Create docs and source distribution" name="srcjar">
75 @@ -239,16 +230,7 @@
76 failonerror="${test.failonerror}"
77 fork="yes"
78 >
79 -
80 - <!-- jvmarg value="-Xrunhprof:heap=all,file=debug.txt"/ -->
81 - <!-- <jvmarg value="-verbose:gc"/> -->
82 - <!-- <jvmarg value="-verbose:class"/> -->
83 - <!-- <jvmarg value="-Xprof"/> -->
84 - <!-- <jvmarg value="-server"/> -->
85 - <!-- <sysproperty key="cglib.debugLocation" value="debug"/> -->
86 - <!-- <jvmarg value="-Djava.security.policy==java.policy" /> -->
87 - <!-- <jvmarg value="-Djava.security.manager" /> -->
88 -
89 + <sysproperty key="cglib.debugLocation" value="${debugLocation}"/>
90 <arg value="${test.entry}"/>
91 <classpath>
92 <pathelement path="${build.home}/classes"/>
93
94
95
96 1.1 dev-java/cglib/files/words.txt
97
98 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/cglib/files/words.txt?rev=1.1&view=markup
99 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/cglib/files/words.txt?rev=1.1&content-type=text/plain
100
101 Index: words.txt
102 ===================================================================
103 Casuarinaceae
104 hylomorphic
105 granitize
106 biddably
107 repulsive
108 amphimictical
109 trio
110 toxodont
111 nonreigning
112 dragbar
113 Moronidae
114 unlanguishing
115 metabolizable
116 Osmerus
117 goran
118 spiritfulness
119 tetrachloromethane
120 baobab
121 caroline
122 radioconductor
123 imband
124 crinoline
125 circummundane
126 incontractile
127 forerank
128 modernization
129 meal
130 fishman
131 underbuy
132 pertain
133 equiped
134 cockal
135 unshrined
136 Harb
137 heterotaxis
138 commensurableness
139 baggy
140 sarcophilous
141 tankard
142 acervuline
143 unverifiably
144 premidnight
145 strangles
146 vitellus
147 Socratean
148 flock
149 scourage
150 feverlike
151 citharist
152 harn