Changeset 35347 in osm for applications/editors

Timestamp:

2020-03-03T20:59:53+01:00 (5 years ago)

Author:

simon04

Message:

see #josm18845 - Introduce ${josm.resources.dir}

Location:

applications/editors/josm/i18n

Files:

• build.xml (modified) (5 diffs)
• convwiki.pl (modified) (1 diff)

applications/editors/josm/i18n/build.xml

@@ -3 +3 @@
     <!-- compilation properties -->
     <property name="josm.build.dir" value="../core"/>
-    <property name="josm.presets" value="${josm.build.dir}/resources/data/defaultpresets.xml"/>
+    <property name="josm.resources.dir" value="${josm.build.dir}/resources"/>
+    <property name="josm.presets" value="${josm.resources.dir}/data/defaultpresets.xml"/>
     <property name="plugin.dir" value="../plugins"/>
     <property name="maps.srcfile" value="https://josm.openstreetmap.de/maps"/>
@@ -9 +10 @@
     <property name="surveyor.srcfile" value="${plugin.dir}/surveyor/resources/surveyor.xml"/>
     <property name="i18n.build.dir" value="build"/>
-    <property name="i18n.install.dir" value="${josm.build.dir}/resources/data"/>
+    <property name="i18n.install.dir" value="${josm.resources.dir}/data"/>
     <property name="pluginlist.install.dir" value="${josm.build.dir}/nodist/data/trans"/>
     <property name="po.build.dir" value="${i18n.build.dir}"/>
@@ -39 +40 @@
         </exec>
         <exec executable="perl" failonerror="true">
+            <env key="TAGGING_PRESET_XSD" value="${josm.resources.dir}/data/tagging-preset.xsd"/>
             <arg line="convwiki.pl ${wiki.srcfile} ${i18n.build.dir}/josmfiles ${i18n.build.dir}/josmfiles.zip"/>
         </exec>
@@ -70 +72 @@
             <fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
             <fileset dir="${i18n.build.dir}" includes="trans_presets.java"/>
-            <fileset dir="${josm.build.dir}/resources/data/validator" includes="*.mapcss"/>
-            <fileset dir="${josm.build.dir}/resources/styles/standard" includes="*.mapcss"/>
+            <fileset dir="${josm.resources.dir}/data/validator" includes="*.mapcss"/>
+            <fileset dir="${josm.resources.dir}/styles/standard" includes="*.mapcss"/>
             <fileset dir="${i18n.build.dir}" includes="trans_maps.java"/>
             <!-- data.pot -->
@@ -90 +92 @@
             <fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
             <fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
-            <fileset dir="${josm.build.dir}/resources/data/validator" includes="*.mapcss"/>
-            <fileset dir="${josm.build.dir}/resources/styles/standard" includes="*.mapcss"/>
+            <fileset dir="${josm.resources.dir}/data/validator" includes="*.mapcss"/>
+            <fileset dir="${josm.resources.dir}/styles/standard" includes="*.mapcss"/>
         </gettext-extract>
     </target>

applications/editors/josm/i18n/convwiki.pl

@@ -34 +34 @@
     system "mv \"$name\" \"$name.orig\"";
     my ($path, $xmlname) = ($1, $2);
-    my $res = `xmllint --format --schema ../core/resources/data/tagging-preset.xsd \"$name.orig\" --encode utf-8 --output \"$name\" 2>&1`;
+    my $res = `xmllint --format --schema $ENV{'TAGGING_PRESET_XSD'} \"$name.orig\" --encode utf-8 --output \"$name\" 2>&1`;
     print $res if $res !~ /\.orig validates/;
     system "perl convpreset.pl \"$name\" >\"${path}trans_$xmlname\"";