Gentoo Archives: gentoo-commits

From: "Ralph Sennhauser (sera)" <sera@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/jffi/files: jffi_maven-build.xml jffi-1.0.11_no-werror.patch
Date: Thu, 12 Jan 2012 09:52:58
Message-Id: 20120112095245.C8B172004B@flycatcher.gentoo.org
1 sera 12/01/12 09:52:45
2
3 Added: jffi_maven-build.xml jffi-1.0.11_no-werror.patch
4 Log:
5 Version bump.
6 Switch to https://github.com/jnr as project home.
7 No longer use netbeans build system.
8 Use slot coresponding to .so version.
9
10 (Portage version: 2.1.10.44/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.1 dev-java/jffi/files/jffi_maven-build.xml
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/files/jffi_maven-build.xml?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/files/jffi_maven-build.xml?rev=1.1&content-type=text/plain
17
18 Index: jffi_maven-build.xml
19 ===================================================================
20 <?xml version="1.0" encoding="UTF-8"?>
21
22 <!-- ====================================================================== -->
23 <!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
24 <!-- ====================================================================== -->
25
26 <!-- ====================================================================== -->
27 <!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
28 <!-- ====================================================================== -->
29 <!-- -->
30 <!-- Any modifications will be overwritten. -->
31 <!-- -->
32 <!-- Generated by Maven Ant Plugin on 1/9/12 9:52 AM -->
33 <!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
34 <!-- -->
35 <!-- ====================================================================== -->
36
37 <project name="jffi-from-maven" default="package" basedir=".">
38
39 <!-- ====================================================================== -->
40 <!-- Build environment properties -->
41 <!-- ====================================================================== -->
42
43 <property file="${user.home}/.m2/maven.properties"/>
44 <property file="maven-build.properties"/>
45
46 <property name="maven.build.finalName" value="jffi-1.0.11"/>
47 <property name="maven.build.dir" value="target"/>
48 <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
49 <property name="maven.build.srcDir.0" value="src/main/java"/>
50 <property name="maven.build.resourceDir.0" value="src/main/resources"/>
51 <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
52 <property name="maven.build.testDir.0" value="src/test/java"/>
53 <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
54 <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
55 <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
56
57 <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
58 <property name="maven.settings.offline" value="false"/>
59 <property name="maven.settings.interactiveMode" value="true"/>
60
61 <!-- ====================================================================== -->
62 <!-- Defining classpaths -->
63 <!-- ====================================================================== -->
64
65 <path id="build.classpath"/>
66 <path id="build.test.classpath">
67 <pathelement location="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"/>
68 </path>
69
70 <!-- ====================================================================== -->
71 <!-- Cleaning up target -->
72 <!-- ====================================================================== -->
73
74 <target name="clean" description="Clean the output directory">
75 <delete dir="${maven.build.dir}"/>
76 </target>
77
78 <!-- ====================================================================== -->
79 <!-- Compilation target -->
80 <!-- ====================================================================== -->
81
82 <target name="compile" depends="get-deps" description="Compile the code">
83 <mkdir dir="${maven.build.outputDir}"/>
84 <javac destdir="${maven.build.outputDir}"
85 nowarn="false"
86 debug="true"
87 optimize="false"
88 deprecation="true"
89 target="1.1"
90 verbose="false"
91 fork="false"
92 source="1.3">
93 <src>
94 <pathelement location="${maven.build.srcDir.0}"/>
95 </src>
96 <classpath refid="build.classpath"/>
97 </javac>
98 </target>
99
100 <!-- ====================================================================== -->
101 <!-- Test-compilation target -->
102 <!-- ====================================================================== -->
103
104 <target name="compile-tests"
105 depends="compile"
106 description="Compile the test code"
107 unless="maven.test.skip">
108 <mkdir dir="${maven.build.testOutputDir}"/>
109 <javac destdir="${maven.build.testOutputDir}"
110 nowarn="false"
111 debug="true"
112 optimize="false"
113 deprecation="true"
114 target="1.1"
115 verbose="false"
116 fork="false"
117 source="1.3">
118 <src>
119 <pathelement location="${maven.build.testDir.0}"/>
120 </src>
121 <classpath>
122 <path refid="build.test.classpath"/>
123 <pathelement location="${maven.build.outputDir}"/>
124 </classpath>
125 </javac>
126 </target>
127
128 <!-- ====================================================================== -->
129 <!-- Run all tests -->
130 <!-- ====================================================================== -->
131
132 <target name="test"
133 depends="compile-tests, junit-missing"
134 unless="junit.skipped"
135 description="Run the test cases">
136 <mkdir dir="${maven.test.reports}"/>
137 <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
138 <sysproperty key="basedir" value="."/>
139 <formatter type="xml"/>
140 <formatter type="plain" usefile="false"/>
141 <classpath>
142 <path refid="build.test.classpath"/>
143 <pathelement location="${maven.build.outputDir}"/>
144 <pathelement location="${maven.build.testOutputDir}"/>
145 </classpath>
146 <batchtest todir="${maven.test.reports}" unless="test">
147 <fileset dir="${maven.build.testDir.0}">
148 <include name="**/Test*.java"/>
149 <include name="**/*Test.java"/>
150 <include name="**/*TestCase.java"/>
151 <exclude name="**/*Abstract*Test.java"/>
152 </fileset>
153 </batchtest>
154 <batchtest todir="${maven.test.reports}" if="test">
155 <fileset dir="${maven.build.testDir.0}">
156 <include name="**/${test}.java"/>
157 <exclude name="**/*Abstract*Test.java"/>
158 </fileset>
159 </batchtest>
160 </junit>
161 </target>
162
163 <target name="test-junit-present">
164 <available classname="junit.framework.Test" property="junit.present"/>
165 </target>
166
167 <target name="test-junit-status"
168 depends="test-junit-present">
169 <condition property="junit.missing">
170 <and>
171 <isfalse value="${junit.present}"/>
172 <isfalse value="${maven.test.skip}"/>
173 </and>
174 </condition>
175 <condition property="junit.skipped">
176 <or>
177 <isfalse value="${junit.present}"/>
178 <istrue value="${maven.test.skip}"/>
179 </or>
180 </condition>
181 </target>
182
183 <target name="junit-missing"
184 depends="test-junit-status"
185 if="junit.missing">
186 <echo>=================================== WARNING ===================================</echo>
187 <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
188 <echo>===============================================================================</echo>
189 </target>
190
191 <!-- ====================================================================== -->
192 <!-- Javadoc target -->
193 <!-- ====================================================================== -->
194
195 <target name="javadoc" description="Generates the Javadoc of the application">
196 <javadoc sourcepath="${maven.build.srcDir.0}"
197 packagenames="*"
198 destdir="${maven.reporting.outputDirectory}/apidocs"
199 access="protected"
200 old="false"
201 verbose="false"
202 version="true"
203 use="true"
204 author="true"
205 splitindex="false"
206 nodeprecated="false"
207 nodeprecatedlist="false"
208 notree="false"
209 noindex="false"
210 nohelp="false"
211 nonavbar="false"
212 serialwarn="false"
213 charset="ISO-8859-1"
214 linksource="false"
215 breakiterator="false"/>
216 </target>
217
218 <!-- ====================================================================== -->
219 <!-- Package target -->
220 <!-- ====================================================================== -->
221
222 <target name="package" depends="compile,test" description="Package the application">
223 <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
224 compress="true"
225 index="false"
226 basedir="${maven.build.outputDir}"
227 excludes="**/package.html"/>
228 </target>
229
230 <!-- ====================================================================== -->
231 <!-- A dummy target for the package named after the type it creates -->
232 <!-- ====================================================================== -->
233
234 <target name="jar" depends="package" description="Builds the jar for the application"/>
235
236 <!-- ====================================================================== -->
237 <!-- Download dependencies target -->
238 <!-- ====================================================================== -->
239
240 <target name="test-offline">
241 <condition property="maven.mode.offline">
242 <equals arg1="${maven.settings.offline}" arg2="true"/>
243 </condition>
244 </target>
245
246 <target name="get-deps"
247 depends="test-offline"
248 description="Download all dependencies"
249 unless="maven.mode.offline">
250 <mkdir dir="${maven.repo.local}"/>
251 <mkdir dir="${maven.repo.local}/junit/junit/4.8.2"/>
252 <get src="http://repository.jboss.com/maven2/junit/junit/4.8.2/junit-4.8.2.jar"
253 dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
254 usetimestamp="false"
255 ignoreerrors="true"/>
256 <get src="http://snapshots.jboss.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar"
257 dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
258 usetimestamp="false"
259 ignoreerrors="true"/>
260 <get src="http://repository.jboss.org/maven2//junit/junit/4.8.2/junit-4.8.2.jar"
261 dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
262 usetimestamp="false"
263 ignoreerrors="true"/>
264 <get src="https://repository.jboss.org/nexus/content/groups/public-jboss//junit/junit/4.8.2/junit-4.8.2.jar"
265 dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
266 usetimestamp="false"
267 ignoreerrors="true"/>
268 <get src="https://oss.sonatype.org/content/repositories/snapshots/junit/junit/4.8.2/junit-4.8.2.jar"
269 dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
270 usetimestamp="false"
271 ignoreerrors="true"/>
272 <get src="http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar"
273 dest="${maven.repo.local}/junit/junit/4.8.2/junit-4.8.2.jar"
274 usetimestamp="false"
275 ignoreerrors="true"/>
276 </target>
277
278 </project>
279
280
281
282 1.1 dev-java/jffi/files/jffi-1.0.11_no-werror.patch
283
284 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/files/jffi-1.0.11_no-werror.patch?rev=1.1&view=markup
285 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jffi/files/jffi-1.0.11_no-werror.patch?rev=1.1&content-type=text/plain
286
287 Index: jffi-1.0.11_no-werror.patch
288 ===================================================================
289 diff --git a/jni/GNUmakefile b/jni/GNUmakefile
290 index efe6230..25053c7 100755
291 --- a/jni/GNUmakefile
292 +++ b/jni/GNUmakefile
293 @@ -64,7 +64,7 @@ JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
294 OFLAGS = -O2 $(JFLAGS)
295
296 # MacOS headers aren't completely warning free, so turn them off
297 -WERROR = -Werror
298 +WERROR =
299 ifneq ($(OS),darwin)
300 WFLAGS += -Wundef $(WERROR)
301 endif