[Git][debian-gis-team/josm][experimental] Exclude javax files when building JOSM.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Tue Jun 6 19:25:12 BST 2023
Bas Couwenberg pushed to branch experimental at Debian GIS Project / josm
Commits:
3a6be8b0 by Bas Couwenberg at 2023-06-06T20:25:04+02:00
Exclude javax files when building JOSM.
- - - - -
2 changed files:
- debian/changelog
- debian/patches/00-build.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+josm (0.0.svn18746+dfsg-1~exp3) UNRELEASED; urgency=medium
+
+ * Exclude javax files when building JOSM.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 06 Jun 2023 20:24:10 +0200
+
josm (0.0.svn18746+dfsg-1~exp2) experimental; urgency=medium
* Add patch to use javax.json instead of jakarta.json.
=====================================
debian/patches/00-build.patch
=====================================
@@ -93,7 +93,7 @@ Forwarded: not-needed
<jar destfile="${dist.jar}" basedir="${build.dir}" level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
-@@ -182,30 +195,129 @@ Build-Date: ${build.tstamp}
+@@ -182,30 +195,131 @@ Build-Date: ${build.tstamp}
<attribute name="Permissions" value="all-permissions"/>
<attribute name="Codebase" value="josm.openstreetmap.de"/>
<attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
@@ -145,7 +145,9 @@ Forwarded: not-needed
+ </target>
+ <target name="compile-cots" depends="init,javacc-openinghoursparser" description="Compile third-party dependencies not retrieved with Ivy">
+ <!-- COTS -->
-+ <javac srcdir="${src.dir}" classpathref="classpath" includes="ch/**,com/**,javax/**,oauth/signpost/**,org/apache/commons/**,org/glassfish/**,org/jetbrains/annotations/**,org/tukaani/**" excludes="**/package-info.java" nowarn="on" encoding="iso-8859-1"
++ <javac srcdir="${src.dir}" classpathref="classpath"
++ includes="ch/**,com/**,javax/**,oauth/signpost/**,org/apache/commons/**,org/glassfish/**,org/jetbrains/annotations/**,org/tukaani/**"
++ excludes="**/package-info.java" nowarn="on" encoding="iso-8859-1"
+ destdir="${build.dir}" release="${java.lang.version}" debug="on" includeAntRuntime="false">
+ <!-- get rid of "internal proprietary API" warning -->
+ <compilerarg value="-XDignore.symbol.file"/>
@@ -228,7 +230,7 @@ Forwarded: not-needed
</target>
<macrodef name="call-javac-compile">
<attribute name="sourcepath" default=""/>
-@@ -285,23 +397,56 @@ Build-Date: ${build.tstamp}
+@@ -285,23 +399,56 @@ Build-Date: ${build.tstamp}
</call-javac-compile>
</sequential>
</macrodef>
@@ -267,7 +269,7 @@ Forwarded: not-needed
<call-javac-compile-mrjar release="21"/>
+-->
+ <javac sourcepath="" srcdir="${src.dir}" fork="yes" classpathref="classpath"
-+ excludes="ch/**,com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/jetbrains/annotations/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**,**/package-info.java"
++ excludes="ch/**,com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/jetbrains/annotations/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**,**/package-info.java"
+ destdir="${build.dir}" release="${java.lang.version}" debug="on" includeantruntime="false" encoding="UTF-8">
+ <compilerarg value="-Xlint:cast"/>
+ <compilerarg value="-Xlint:deprecation"/>
@@ -286,7 +288,7 @@ Forwarded: not-needed
</target>
<target name="create-resources" depends="create-revision" description="Create generated resource files">
<copy todir="${resources.dir}">
-@@ -325,6 +470,7 @@ Build-Date: ${build.tstamp}
+@@ -325,6 +472,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -294,7 +296,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init" description="Generate API documentation from JOSM source files">
<javadoc destdir="javadoc"
-@@ -363,6 +509,7 @@ Build-Date: ${build.tstamp}
+@@ -363,6 +511,7 @@ Build-Date: ${build.tstamp}
<delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
<delete file="${epsg.output}"/>
<delete file="${pmd.dir}/cache"/>
@@ -302,7 +304,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -980,6 +1127,7 @@ Build-Date: ${build.tstamp}
+@@ -980,6 +1129,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${resources.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
@@ -310,7 +312,7 @@ Forwarded: not-needed
</classpath>
<arg value="${base.dir}"/>
</java>
-@@ -1043,12 +1191,14 @@ Build-Date: ${build.tstamp}
+@@ -1043,12 +1193,14 @@ Build-Date: ${build.tstamp}
<move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-with-all-dependencies.png"/>
</target>
<target name="resolve" depends="init-ivy" unless="resolve.notRequired" description="Resolve Ivy dependencies">
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/commit/3a6be8b01ad3f3790b0738b43d00f4100daf41c9
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/commit/3a6be8b01ad3f3790b0738b43d00f4100daf41c9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20230606/42fac775/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list