Package: josm-plugins / 0.0.svn33112+ds-1

00-fix_build-common.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
Description: fix build-common.xml
Author: David Paleino <dapal@debian.org>
Forwarded: not-needed

---
 build-common.xml |   13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

--- a/build-common.xml
+++ b/build-common.xml
@@ -12,7 +12,7 @@
 -->
 <project name="plugin_common" basedir="." xmlns:jacoco="antlib:org.jacoco.ant">
 
-    <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
+    <property name="josm"                   location="/usr/share/josm/josm.jar"/>
     <property name="josm.test.build.dir"    location="../../core/test/build"/>
     <property name="error_prone_ant.jar"    location="../00_core_tools/error_prone_ant-2.0.14.jar"/>
     <property name="checkstyle.jar"         location="../00_core_tools/checkstyle/checkstyle-7.4-all.jar"/>
@@ -23,11 +23,10 @@
     <property name="plugin.src.dir"         location="src"/>
     <property name="plugin.lib.dir"         location="lib"/>
     <!-- this is the directory where the plugin jar is copied to -->
-    <property name="plugin.dist.dir"        location="../../dist"/>
+    <property name="plugin.dist.dir"        location="../dist"/>
     <property name="ant.build.javac.target" value="1.8"/>
     <property name="ant.build.javac.source" value="1.8"/>
     <property name="plugin.jar"             location="${plugin.dist.dir}/${ant.project.name}.jar"/>
-    <property name="javac.compiler"         value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
 
     <!-- For Windows-specific stuff -->
     <condition property="isWindows">
@@ -75,14 +74,9 @@
     </target>
     <target name="compile" depends="init, pre-compile" unless="skip-compile">
         <echo message="compiling sources for ${plugin.jar} ..."/>
-        <javac compiler="${javac.compiler}" srcdir="src" debug="true" destdir="${plugin.build.dir}" includeantruntime="false" encoding="UTF-8">
-            <compilerclasspath>
-                <pathelement location="${error_prone_ant.jar}"/>
-            </compilerclasspath>
+        <javac srcdir="src" debug="true" destdir="${plugin.build.dir}" includeantruntime="false" encoding="UTF-8">
             <compilerarg value="-Xlint:deprecation"/>
             <compilerarg value="-Xlint:unchecked"/>
-            <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
-            <compilerarg value="-Xep:InsecureCryptoUsage:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
             <classpath refid="plugin.classpath"/>
         </javac>
@@ -284,10 +278,13 @@
         </tstamp>
         <echo file="REVISION.XML"><![CDATA[<info><entry><commit revision="UNKNOWN"><date>${current.time}</date></commit></entry></info>]]></echo>
     </target>
+    <!--
     <target name="revision" depends="init-svn-revision-xml, init-git-svn-revision-xml, init-git-revision-xml, init-revision-fallback" unless="skip-revision">
       <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
       <delete file="REVISION.XML"/>
     </target>
+    -->
+    <target name="revision" />
     <!--
     **********************************************************
     ** clean - clean up the build environment