Changeset 32368 in osm

Timestamp:

2016-06-23T00:40:31+02:00 (8 years ago)

Author:

donvip

Message:

seachart - make the build portable

Location:

applications/editors/josm/plugins/seachart

Files:

• .classpath (modified) (1 diff)
• .project (modified) (1 diff)
• jbasemap (modified) (1 prop)
• jbasemap/build.xml (modified) (3 diffs)
• jbasemap/src/render (deleted)
• jbasemap/src/s57 (deleted)
• jbasemap/src/symbols (deleted)
• jicons (modified) (1 prop)
• jicons/build.xml (modified) (3 diffs)
• jicons/src/render (deleted)
• jicons/src/s57 (deleted)
• jicons/src/symbols (deleted)
• josmtos57 (modified) (1 prop)
• josmtos57/build.xml (modified) (2 diffs)
• josmtos57/src/josmtos57/Josmtos57.java (modified) (1 diff)
• josmtos57/src/s57 (deleted)
• jplotter (modified) (1 prop)
• jplotter/build.xml (modified) (2 diffs)
• jrender (modified) (1 prop)
• jrender/build.xml (modified) (2 diffs)
• jrender/src/render (deleted)
• jrender/src/s57 (deleted)
• jrender/src/symbols (deleted)
• js57toosm (modified) (1 prop)
• js57toosm/build.xml (modified) (2 diffs)
• js57toosm/src/s57 (deleted)
• libs (added)
• libs/batik-awt-util-1.8.jar (added)
• libs/batik-dom-1.8.jar (added)
• libs/batik-ext-1.8.jar (added)
• libs/batik-svggen-1.8.jar (added)
• libs/batik-util-1.8.jar (added)
• libs/batik-xml-1.8.jar (added)
• libs/commons-lang3-3.4.jar (added)

applications/editors/josm/plugins/seachart/.classpath

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+        <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="jbasemap/src"/>
         <classpathentry kind="src" path="jicons/src"/>
         <classpathentry kind="src" path="jplotter/src"/>
         <classpathentry kind="src" path="jrender/src"/>
         <classpathentry kind="src" path="js57toosm/src"/>
-        <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="josmtos57/src"/>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+        <classpathentry kind="lib" path="libs/batik-svggen-1.8.jar"/>
+        <classpathentry kind="lib" path="libs/batik-dom-1.8.jar"/>
+        <classpathentry kind="lib" path="libs/batik-util-1.8.jar"/>
+        <classpathentry kind="lib" path="libs/batik-awt-util-1.8.jar"/>
+        <classpathentry kind="lib" path="libs/batik-ext-1.8.jar"/>
+        <classpathentry kind="lib" path="libs/batik-xml-1.8.jar"/>
+        <classpathentry kind="lib" path="libs/commons-lang3-3.4.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

applications/editors/josm/plugins/seachart/.project

@@ -11 +11 @@
                         </arguments>
                 </buildCommand>
+                <buildCommand>
+                        <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
         </buildSpec>
         <natures>

applications/editors/josm/plugins/seachart/jbasemap/build.xml

@@ -1 +1 @@
 <project name="jbasemap" default="dist" basedir=".">
   <property name="src" location="src"/>
+  <property name="srcmain" location="../src"/>
   <property name="build" location="build"/>
   <property name="jarfile" location="./jbasemap.jar"/>
-  <property name="batik.dir" value="/usr/local/bin/batik-1.7/"/>
+  <property name="batik.dir" value="../libs/"/>
   <path id="classpath">
     <fileset dir="${batik.dir}" includes="**/batik*.jar"/>
   </path>
-            
+
   <target name="init">
     <mkdir dir="${build}"/>
@@ -13 +14 @@
 
   <target name="compile" depends="init" description="compile the source " >
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
   </target>
 
@@ -22 +23 @@
         <attribute name="Class-Path" value="$jarfile"/>
       </manifest>
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-svggen.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-dom.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-util.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-awt-util.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-ext.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-xml.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-svggen-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-dom-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-util-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-awt-util-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-ext-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-xml-1.8.jar" />
     </jar>
   </target>

applications/editors/josm/plugins/seachart/jicons/build.xml

@@ -1 +1 @@
 <project name="jicons" default="dist" basedir=".">
   <property name="src" location="src"/>
+  <property name="srcmain" location="../src"/>
   <property name="build" location="build"/>
   <property name="jarfile" location="./jicons.jar"/>
-  <property name="batik.dir" value="/usr/local/bin/batik-1.7/"/>
+  <property name="batik.dir" value="../libs/"/>
   <path id="classpath">
     <fileset dir="${batik.dir}" includes="**/batik*.jar"/>
   </path>
-            
+
   <target name="init">
     <mkdir dir="${build}"/>
@@ -13 +14 @@
 
   <target name="compile" depends="init" description="compile the source " >
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
   </target>
 
@@ -22 +23 @@
         <attribute name="Class-Path" value="$jarfile"/>
       </manifest>
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-svggen.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-dom.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-util.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-awt-util.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-ext.jar" />
-      <zipgroupfileset dir="${batik.dir}" includes="**/batik-xml.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-svggen-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-dom-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-util-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-awt-util-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-ext-1.8.jar" />
+      <zipgroupfileset dir="${batik.dir}" includes="**/batik-xml-1.8.jar" />
     </jar>
   </target>

applications/editors/josm/plugins/seachart/josmtos57/build.xml

@@ -1 +1 @@
 <project name="josmtos57" default="dist" basedir=".">
   <property name="src" location="src"/>
+  <property name="srcmain" location="../src"/>
   <property name="build" location="build"/>
   <property name="jarfile" location="./josmtos57.jar"/>
-  
+
   <target name="init">
     <mkdir dir="${build}"/>
   </target>
-  
+
   <target name="compile" depends="init" description="compile the source">
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}"/>
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}"/>
   </target>
-  
+
   <target name="dist" depends="compile" description="generate the distribution">
     <jar jarfile="${jarfile}" basedir="${build}" manifestencoding="UTF-8">
@@ -20 +21 @@
     </jar>
   </target>
-  
+
   <target name="clean" description="clean up">
     <delete dir="${build}"/>

applications/editors/josm/plugins/seachart/josmtos57/src/josmtos57/Josmtos57.java

@@ -86 +86 @@
                         in = new BufferedReader(new FileReader(new File(args[0])));
                         try {
-                                S57osm.OSMmap(in, map);
+                                S57osm.OSMmap(in, map, true);
                         } catch (Exception e) {
                                 System.err.println("Input data error");

applications/editors/josm/plugins/seachart/jplotter/build.xml

@@ -1 +1 @@
 <project name="jplotter" default="dist" basedir=".">
   <property name="src" location="src"/>
+  <property name="srcmain" location="../src"/>
   <property name="build" location="build"/>
   <property name="jarfile" location="./jplotter.jar"/>
@@ -9 +10 @@
 
   <target name="compile" depends="init" description="compile the source " >
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}"/>
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}"/>
   </target>
 

applications/editors/josm/plugins/seachart/jrender/build.xml

@@ -1 +1 @@
 <project name="jrender" default="dist" basedir=".">
   <property name="src" location="src"/>
+  <property name="srcmain" location="../src"/>
   <property name="build" location="build"/>
   <property name="jarfile" location="./jrender.jar"/>
-  <property name="batik.dir" value="/usr/local/bin/batik-1.7/"/>
+  <property name="batik.dir" value="../libs/"/>
   <path id="classpath">
     <fileset dir="${batik.dir}" includes="**/batik*.jar"/>
   </path>
-            
+
   <target name="init">
     <mkdir dir="${build}"/>
@@ -13 +14 @@
 
   <target name="compile" depends="init" description="compile the source " >
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
   </target>
 

applications/editors/josm/plugins/seachart/js57toosm/build.xml

@@ -1 +1 @@
 <project name="js57toosm" default="dist" basedir=".">
   <property name="src" location="src"/>
+  <property name="srcmain" location="../src"/>
   <property name="build" location="build"/>
   <property name="jarfile" location="./js57toosm.jar"/>
-  <property name="lang.dir" value="/usr/local/bin/commons-lang3-3.4/"/>
+  <property name="lang.dir" value="../libs/"/>
   <path id="classpath">
     <fileset dir="${lang.dir}" includes="**/commons-lang3-3.4.jar"/>
   </path>
-  
+
   <target name="init">
     <mkdir dir="${build}"/>
   </target>
-  
+
   <target name="compile" depends="init" description="compile the source">
-    <javac includeantruntime="false" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
+    <javac includeantruntime="false" sourcepath="${srcmain}" srcdir="${src}" destdir="${build}" classpathref="classpath" encoding="UTF-8" />
   </target>
   
@@ -25 +26 @@
     </jar>
   </target>
-  
+
   <target name="clean" description="clean up">
     <delete dir="${build}"/>