Skip to content
Commits on Source (10)
Show whitespace changes
Inline Side-by-side
.classpath
View file @ 87a959a5
......@@ -22,7 +22,7 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="test/lib/jmockit-1.41.jar">
<classpathentry kind="lib" path="test/lib/jmockit-1.43.jar">
<attributes>
<attribute name="test" value="true"/>
</attributes>
......
.travis.yml
View file @ 87a959a5
language: java
script: (eval "$ANT_INVOCATION $(test $TRAVIS_JDK_VERSION = openjdk8 && echo -DnoJavaFX=true) test-unit-hardfail")
os: linux
dist: trusty
script:
- ant -version
- $ANT_INVOCATION -DnoJavaFX=true test-unit-hardfail
- "grep -L ', Failures: 0, Errors: 0, ' test/report/*.txt | xargs cat"
env:
- ANT_INVOCATION="xvfb-run ant -Dtest.headless=false"
- ANT_INVOCATION="ant -Dtest.headless=true"
jdk:
- oraclejdk9
- oraclejdk8
- openjdk8
- openjdk11
os: linux
dist: trusty
matrix:
include:
- os: osx
osx_image: xcode9.2
osx_image: xcode9.3
jdk: ~
env: ANT_INVOCATION="ant -Dtest.headless=true"
- os: osx
osx_image: xcode10
jdk: ~
env: ANT_INVOCATION="ant -Dtest.headless=true"
- os: windows
language: shell
jdk: oraclejdk11
env: ANT_INVOCATION="ant -Dtest.headless=true"
before_install:
- >
case "${TRAVIS_OS_NAME:-linux}" in
linux)
;;
osx)
brew update
brew install ant
;;
esac;
- wget https://www.apache.org/dist/ant/binaries/apache-ant-1.10.5-bin.tar.gz
- tar -xzvf apache-ant-1.10.5-bin.tar.gz
- export PATH=`pwd`/apache-ant-1.10.5/bin:$PATH
- if [ "$TRAVIS_OS_NAME" == "windows" ] ; then choco install jdk11 && export JAVA_HOME="/c/Program Files/Java/jdk-11" ; fi
REVISION
View file @ 87a959a5
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
revision="14289"
kind="dir"
path="trunk">
path="trunk"
revision="14382"
kind="dir">
<url>https://josm.openstreetmap.de/svn/trunk</url>
<relative-url>^/trunk</relative-url>
<repository>
......@@ -11,9 +11,9 @@
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
revision="14289">
revision="14382">
<author>Don-vip</author>
<date>2018-10-01T21:59:36.173861Z</date>
<date>2018-10-28T21:27:31.020528Z</date>
</commit>
</entry>
</info>
build.xml
View file @ 87a959a5
......@@ -49,6 +49,7 @@
<property name="jacoco.includes" value="org.openstreetmap.josm.*" />
<property name="jacoco.inclbootstrapclasses" value="false" />
<property name="jacoco.inclnolocationclasses" value="false" />
<property name="junit.printsummary" value="on" />
<!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
default: 9 -->
......@@ -493,9 +494,9 @@ Build-Date: ${build.tstamp}
<echo message="Running @{testfamily}@{testITsuffix} tests with JUnit"/>
<jacoco:coverage destfile="${test.dir}/jacoco@{testITsuffix}.exec" enabled="@{coverage}" includes="${jacoco.includes}"
inclbootstrapclasses="${jacoco.inclbootstrapclasses}" inclnolocationclasses="${jacoco.inclnolocationclasses}">
<junit printsummary="yes" fork="true" forkmode="once" failureproperty="test.@{testfamily}@{testITsuffix}.failed">
<junit printsummary="${junit.printsummary}" fork="true" forkmode="once" failureproperty="test.@{testfamily}@{testITsuffix}.failed">
<jvmarg value="-Dfile.encoding=UTF-8"/>
<jvmarg value="-javaagent:${test.dir}/lib/jmockit-1.41.jar"/>
<jvmarg value="-javaagent:${test.dir}/lib/jmockit-1.43.jar"/>
<jvmarg value="--add-modules" if:set="isJava9" unless:set="isJava11" />
<jvmarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" />
<jvmarg value="--add-exports" if:set="isJava9" />
......
data/defaultpresets.xml
View file @ 87a959a5
......@@ -5978,21 +5978,21 @@
zh_TW.href="https://wiki.openstreetmap.org/wiki/Zh-hant:Tag:amenity=toilets" />
<space />
<key key="amenity" value="toilets" />
<combo key="access" text="Access rights" values="yes,permissive,customers" />
<optional>
<combo key="access" text="Access rights" values="yes,permissive,customers" />
<checkgroup columns="3">
<check key="female" text="Female" text_context="restroom" />
<check key="male" text="Male" text_context="restroom" />
<check key="unisex" text="Unisex" text_context="restroom" />
</checkgroup>
<combo key="toilets:disposal" text="Type" values="flush,pitlatrine,chemical,bucket" />
<combo key="drinking_water" text="Drinking Water" values="yes,no,seasonal" />
<text key="description" text="Description" />
<reference ref="fee" />
<text key="operator" text="Operator" />
<combo key="toilets:position" text="Usage Position" values="seated,seated;urinal,squat,urinal" />
<combo key="diaper" text="Diaper" values="yes,no,room,1,2,3,4,5" text_context="toilets" />
<reference ref="wheelchair" />
<check key="drinking_water" text="Drinking Water" />
</optional>
</item> <!-- Toilets/Restrooms -->
<item name="Shower" icon="presets/service/shower.svg" type="node,closedway" preset_name_label="true">
......@@ -6797,7 +6797,7 @@
<text key="name" text="Name" />
<combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,sled,sleigh,snow_park" match="keyvalue"/>
<optional>
<combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" />
<combo key="piste:difficulty" text="Difficulty" values="novice,easy,intermediate,advanced,expert,freeride" values_context="piste:difficulty" values_searchable="true" values_sort="false" />
<combo key="piste:grooming" text="Grooming" values="classic,mogul,skating,classic;skating,scooter,backcountry" values_context="piste:grooming" />
</optional>
</item> <!-- Skiing -->
......@@ -7865,7 +7865,7 @@
<combo key="generator:type" text="Generator Type" values="bioreactor,reciprocating_engine,steam_generator" />
<reference ref="power_output" />
</item> <!-- Waste Power Generator -->
<item name="Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway" preset_name_label="true">
<item name="Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="hydro" />
<reference ref="power_generator" />
<combo key="generator:method" text="Method" values_context="generator method" values="run-of-the-river,water-pumped-storage,water-storage" />
......@@ -7877,7 +7877,7 @@
</combo>
<reference ref="power_output" />
</item> <!-- Water Turbine -->
<item name="Tidal Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway" preset_name_label="true">
<item name="Tidal Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
<key key="generator:source" value="tidal" />
<reference ref="power_generator" />
<combo key="generator:method" text="Method" values_context="generator method" values="barrage,stream" />
......@@ -7948,7 +7948,7 @@
<reference ref="ref_operator_branch" />
<reference ref="optional_transformer_rating_phases_devices_windings" />
</item> <!-- Power Transformer -->
<item name="Power Switchgear" icon="presets/power/switchgear.svg" type="closedway" preset_name_label="true">
<item name="Power Switchgear" icon="presets/power/switchgear.svg" type="closedway,multipolygon" preset_name_label="true">
<link href="https://wiki.openstreetmap.org/wiki/Tag:power=switchgear"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:power=switchgear" />
<space />
......@@ -10140,7 +10140,7 @@
<reference ref="name_operator_oh_wheelchair" />
<reference ref="link_contact_address" />
</item> <!-- Locksmith -->
<item name="Electrician" type="node,closedway,multipolygon" preset_name_label="true">
<item name="Electrician" icon="presets/craft/electrician.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="https://wiki.openstreetmap.org/wiki/Tag:craft=electrician"
cs.href="https://wiki.openstreetmap.org/wiki/Cs:Tag:craft=electrician"
de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:craft=electrician"
......
data/validator/combinations.mapcss
View file @ 87a959a5
......@@ -212,16 +212,16 @@ way[incline ][!highway][!railway][aeroway!~/^(runway|taxiway)
group: tr("missing tag");
}
/* {0.tag} together with {1.key}, see #16464, #10837, #14034, #9389, #11977, #13156 */
/* {0.tag} together with {1.key}, see #16464, #10837, #14034, #9389, #11977, #13156, #16888 */
*[internet_access=no][internet_access:fee],
node[power=transformer][voltage],
node[transformer=distribution][voltage][power=pole],
*[amenity=vending_machine][shop],
*[noname?][name],
way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath],
way[oneway=yes][/:forward/][!traffic_sign:forward][bicycle:forward!=use_sidepath],
way[oneway=-1 ][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath],
way[oneway=-1 ][/:forward/][!traffic_sign:forward][bicycle:forward!=use_sidepath] {
way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][oneway:bicycle!=no][oneway:psv!=no],
way[oneway=yes][/:forward/ ][!traffic_sign:forward ][bicycle:forward!=use_sidepath ][oneway:bicycle!=no][oneway:psv!=no],
way[oneway=-1 ][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][oneway:bicycle!=no][oneway:psv!=no],
way[oneway=-1 ][/:forward/ ][!traffic_sign:forward ][bicycle:forward!=use_sidepath ][oneway:bicycle!=no][oneway:psv!=no] {
throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.key}");
group: tr("suspicious tag combination");
}
......@@ -232,7 +232,9 @@ way[highway=footway][oneway=no] {
group: tr("suspicious tag combination");
}
/* {0.tag} together with {1.tag}, see #16147, #10186 */
/* {0.tag} together with {1.tag}, see #16861, #16147, #10186 */
way[segregated][bicycle=no],
way[segregated][foot=no],
way[man_made=pipeline][tunnel=flooded],
way[waterway=canal][tunnel=yes],
way[highway=footway][bicycle=designated] {
......
data/validator/geometry.mapcss
View file @ 87a959a5
......@@ -52,7 +52,7 @@ node[boundary=administrative] {
throwWarning: tr("{0} on a node. Should be used on a way or relation.", "{0.tag}");
}
/* {0} on a node, should be an area; #10679 #16528 */
/* {0} on a node, should be an area; #10679 #16528 #16792 */
node[golf=green],
node[golf=bunker],
node[golf=fairway],
......@@ -77,6 +77,7 @@ node[man_made=bridge],
node[man_made=breakwater],
node[aeroway=apron],
node[power=plant],
node[power=switchgear],
node[building:part],
node[source:outline] {
throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
......
data/validator/highway.mapcss
View file @ 87a959a5
......@@ -61,6 +61,7 @@ way.major_road[!ref][!destination:ref][noref!=yes][junction!=roundabout] {
assertNoMatch: "way highway=primary noref=yes";
}
way[highway=yes],
way[highway=road] {
throwWarning: tr("Unspecific highway type");
assertMatch: "way highway=road";
......
data/validator/ignoretags.cfg
View file @ 87a959a5
......@@ -325,7 +325,7 @@ K:type=tmc
K:type=TMC
;
; Tags not yet decided (to remove from this section when added or deprecated)
; see josm tickets: 10759 16315 16658
; see josm tickets: 10759 16315 16658 16793
;
K:man_made=mast
K:amenity=childcare
......@@ -334,3 +334,4 @@ K:indoor=room
K:indoor=corridor
K:highway=corridor
K:historic=citywalls
K:crossing=zebra
\ No newline at end of file
data/validator/numeric.mapcss
View file @ 87a959a5
......@@ -89,7 +89,7 @@
assertNoMatch: "node maxheight=3.5";
assertNoMatch: "node maxheight=4";
}
*[maxheight][maxheight !~ /^(([1-9][0-9]*(\.[0-9]+)?( (m|ft))?)|([0-9]+\'(([0-9]|10|11)(\.[0-9]*)?\")?)|none|default)$/]!.maxheight_separator_autofix {
*[maxheight][maxheight !~ /^(([1-9][0-9]*(\.[0-9]+)?( (m|ft))?)|([0-9]+\'(([0-9]|10|11)(\.[0-9]*)?\")?)|none|default|below_default)$/]!.maxheight_separator_autofix {
throwWarning: tr("unusual value of {0}: meters is default; point is decimal separator; if units, put space then unit", "{0.key}");
assertMatch: "node maxheight=something";
assertMatch: "node maxheight=-5";
......
data_nodist/trans/README 0 → 100644
View file @ 87a959a5
Translations of plugin descriptions for https://josm.openstreetmap.de/plugin
debian/changelog
View file @ 87a959a5
josm (0.0.svn14382+dfsg-1~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
-- Bas Couwenberg <sebastic@debian.org> Sat, 03 Nov 2018 07:55:43 +0100
josm (0.0.svn14382+dfsg-1) unstable; urgency=medium
* New tested snapshot.
* Use embedded svgsalamander for setImageDataInlineOnly symbol.
* Add license & copyright for svgsalamander sources.
* Refresh patches.
* Remove obsolete jars from CLASSPATH.
-- Bas Couwenberg <sebastic@debian.org> Mon, 29 Oct 2018 10:42:53 +0100
josm (0.0.svn14289+dfsg-1~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
......
debian/control
View file @ 87a959a5
......@@ -18,7 +18,6 @@ Build-Depends: debhelper (>= 9~),
libgettext-ant-tasks-java,
libgettext-commons-java (>= 0.9.6),
liboauth-signpost-java (>= 1.2),
libsvgsalamander-java,
libterm-readkey-perl,
openjfx
Standards-Version: 4.2.1
......@@ -35,7 +34,6 @@ Depends: default-jre (>= 2:1.8) | java8-runtime,
libcommons-logging-java,
libgettext-commons-java (>= 0.9.6),
liboauth-signpost-java (>= 1.2),
libsvgsalamander-java,
openjfx,
proj-data,
${misc:Depends}
......
debian/copyright
View file @ 87a959a5
......@@ -80,6 +80,10 @@ Copyright: 2002-2017, Drew Noakes
2002-2011, Andreas Ziermann
License: Apache-2.0
Files: src/com/kitfox/*
Copyright: 2004-2005, Mark McKay
License: BSD-2-Clause
Files: src/gnu/*
Copyright: 1987-1997, Free Software Foundation, Inc.
1998, Aaron M. Renn <arenn@urbanophile.com>
......
debian/patches/00-build.patch
View file @ 87a959a5
......@@ -17,7 +17,7 @@ Forwarded: not-needed
<property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
<property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
<property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
@@ -71,10 +72,23 @@
@@ -72,10 +73,22 @@
<isset property="isJava9"/>
</condition>
<path id="groovy.classpath">
......@@ -31,7 +31,6 @@ Forwarded: not-needed
+ <path id="classpath">
+ <fileset dir="/usr/share/java">
+ <include name="gettext-commons.jar"/>
+ <include name="svgSalamander.jar"/>
+ <include name="signpost-core.jar"/>
+ <include name="commons-codec.jar"/>
+ <include name="commons-compress.jar"/>
......@@ -43,7 +42,7 @@ Forwarded: not-needed
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
@@ -141,10 +155,9 @@
@@ -142,10 +155,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
......@@ -56,7 +55,7 @@ Forwarded: not-needed
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
@@ -155,8 +168,10 @@
@@ -156,8 +168,10 @@
<echo file="${revision.dir}/REVISION">
# automatically generated by JOSM build.xml - do not edit
Revision: ${version.entry.commit.revision}
......@@ -68,7 +67,7 @@ Forwarded: not-needed
</echo>
</target>
<!--
@@ -176,7 +191,7 @@ Build-Date: ${build.tstamp}
@@ -177,7 +191,7 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="${build.dir}"/>
<copy file="LICENSE" todir="${build.dir}"/>
<!-- create josm-custom.jar -->
......@@ -77,7 +76,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>
@@ -186,6 +201,8 @@ Build-Date: ${build.tstamp}
@@ -187,6 +201,8 @@ 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"/>
......@@ -86,7 +85,7 @@ Forwarded: not-needed
<!-- Java 9 stuff. Entries are safely ignored by Java 8 -->
<attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509 java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi javafx.graphics/com.sun.javafx.application jdk.deploy/com.sun.deploy.config" />
<attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
@@ -260,43 +277,21 @@ Build-Date: ${build.tstamp}
@@ -261,43 +277,21 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
......@@ -133,7 +132,7 @@ Forwarded: not-needed
<exclude name="org/apache/commons/jcs/JCS.java"/>
<exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/>
<exclude name="org/apache/commons/jcs/access/PartitionedCacheAccess.java"/>
@@ -317,22 +312,15 @@ Build-Date: ${build.tstamp}
@@ -318,22 +312,15 @@ Build-Date: ${build.tstamp}
<exclude name="org/apache/commons/jcs/utils/net/**"/>
<exclude name="org/apache/commons/jcs/utils/props/**"/>
<exclude name="org/apache/commons/jcs/utils/servlet/**"/>
......@@ -159,7 +158,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
@@ -346,19 +334,14 @@ Build-Date: ${build.tstamp}
@@ -347,19 +334,14 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xlint:unchecked"/>
<!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
<compilerarg value="-XDignore.symbol.file"/>
......@@ -180,7 +179,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
@@ -372,7 +355,6 @@ Build-Date: ${build.tstamp}
@@ -373,7 +355,6 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xlint:unchecked"/>
<!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
<compilerarg value="-XDignore.symbol.file"/>
......@@ -188,7 +187,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
<exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
</javac>
@@ -387,6 +369,7 @@ Build-Date: ${build.tstamp}
@@ -388,6 +369,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
......@@ -196,7 +195,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
@@ -422,6 +405,7 @@ Build-Date: ${build.tstamp}
@@ -423,6 +405,7 @@ Build-Date: ${build.tstamp}
<delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
<delete file="${epsg.output}"/>
<delete file="${pmd.dir}/cache"/>
......@@ -204,7 +203,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
@@ -984,6 +968,7 @@ Build-Date: ${build.tstamp}
@@ -985,6 +968,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${base.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
......@@ -223,31 +222,31 @@ Forwarded: not-needed
<property name="josm.presets" value="${josm.build.dir}/data/defaultpresets.xml"/>
<property name="plugin.dir" value="../plugins"/>
<property name="maps.srcfile" value="https://josm.openstreetmap.de/maps"/>
@@ -13,8 +13,8 @@
<property name="i18n_data.install.dir" value="${josm.build.dir}/data_nodist/trans"/>
@@ -14,8 +14,8 @@
<property name="po.build.dir" value="${i18n.build.dir}"/>
<property name="ant.build.javac.target" value="1.5"/>
<property name="gettext.keywords" value="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3"/>
- <property name="gettexttasks.jar" value="lib/gettext-ant-tasks-0.9.7.jar"/>
- <property name="antcontrib.jar" value="lib/ant-contrib-1.0b3.jar"/>
+ <property name="gettexttasks.jar" value="/usr/share/java/gettext-ant-tasks.jar"/>
+ <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
<property name="grand.jar" value="lib/grand-1.9.5.jar"/>
<target name="init" description="Loads the Ant gettext and contrib tasks">
<taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/>
<!-- for the <foreach> possibility -->
@@ -87,7 +87,7 @@
@@ -90,7 +90,7 @@
<arg line="po/core.pot po/maplist.pot po/presets.pot"/>
</exec>
<delete file="po/josm.raw.pot"/>
</target>
- <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="trans_.java,init">
- <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="init">
+ <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="builddir,init">
<gettext-extract keysFile="core.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
<gettext-extract keysFile="core.pot" poDirectory="po" keywords="${gettext.keywords} --exclude-file=excludes.pot">
<fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
<fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
@@ -129,9 +129,14 @@
<delete file="${po.build.dir}/data.pot"/>
<delete file="${po.build.dir}/plugins.raw.pot"/>
@@ -121,9 +121,14 @@
<fileset dir="${i18n.build.dir}" includes="trans_tag2link.java"/>
</gettext-extract>
</target>
- <target name="build" depends="pot,allpot">
- <target name="build" depends="pot">
- <antcall target="buildcore"/>
- <antcall target="buildplugins"/>
+ <target name="build.check">
......@@ -261,7 +260,19 @@ Forwarded: not-needed
</target>
<target name="buildplugins" depends="init">
<foreach param="path" target="plugintrans" parallel="true" maxThreads="8">
@@ -194,15 +199,14 @@
@@ -141,9 +146,9 @@
<antcall target="coretrans"/>
<antcall target="pluginlisttrans"/>
</target>
- <target name="coretrans" depends="po/core+maplist+presets.pot">
+ <target name="coretrans" depends="po/core.pot">
<exec executable="perl" failonerror="true">
- <arg line="i18n.pl --potfile=po/core+maplist+presets.pot --basedir=${i18n.install.dir}/ po/*.po"/>
+ <arg line="i18n.pl --potfile=po/core.pot --basedir=${i18n.install.dir}/ po/*.po"/>
</exec>
</target>
<target name="pluginlisttrans" depends="po/pluginlist.pot">
@@ -186,15 +191,14 @@
</else>
</if>
</target>
......@@ -272,12 +283,12 @@ Forwarded: not-needed
+ </target>
<target name="clean">
<delete dir="${i18n.build.dir}"/>
- <delete file="po/josm.pot"/>
- <delete file="build.dot"/>
- <delete file="build.png"/>
- <delete>
- <fileset dir="po" includes="*.*~" defaultexcludes="false"/>
- </delete>
- <delete>
- <fileset dir="po" includes="*.po" defaultexcludes="false"/>
- <fileset dir="po" includes="*.pot" defaultexcludes="false"/>
- </delete>
+ <delete file="build-timestamp"/>
</target>
......
debian/patches/06-move_data_out_of_jar.patch
View file @ 87a959a5
......@@ -41,7 +41,7 @@ Forwarded: not-needed
/**
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
@@ -223,11 +223,17 @@ public class CachedFile implements Close
@@ -225,11 +225,17 @@ public class CachedFile implements Close
File file = getFile();
if (file == null) {
if (name != null && name.startsWith("resource://")) {
......
debian/rules
View file @ 87a959a5
#!/usr/bin/make -f
export JAVA_HOME=/usr/lib/jvm/default-java
export CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/signpost-core.jar:/usr/share/java/jmapviewer.jar:/usr/share/java/json.jar
export CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/signpost-core.jar:/usr/share/java/jmapviewer.jar
SVNREPO := https://josm.openstreetmap.de/svn/trunk
SVNI18NREPO := https://svn.openstreetmap.org/applications/editors/josm/i18n/
......@@ -73,7 +73,7 @@ get-orig-source:
@echo Downloading josm from ${SVNREPO}
svn export -r ${SVNREV} ${SVNREPO} ${DESTDIR}
@echo Removing duplicated code
rm -rf ${DESTDIR}/src/com/google ${DESTDIR}/src/com/kitfox ${DESTDIR}/src/oauth ${DESTDIR}/src/org/apache/commons/compress ${DESTDIR}/src/org/apache/commons/logging
rm -rf ${DESTDIR}/src/com/google ${DESTDIR}/src/oauth ${DESTDIR}/src/org/apache/commons/compress ${DESTDIR}/src/org/apache/commons/logging
@echo Fetching revision metadata
svn info --xml -r ${SVNREV} ${SVNREPO} > ${DESTDIR}/REVISION
@echo Fetching internalization data
......
i18n/.tx/config
View file @ 87a959a5
[main]
host = https://www.transifex.com
lang_map = ca@valencia: ca-valencia
[josm.core]
file_filter = po/<lang>/core.po
......@@ -7,9 +8,21 @@ source_file = po/core.pot
source_lang = en
type = PO
[josm.data]
file_filter = po/<lang>/data.po
source_file = po/data.pot
[josm.maplist]
file_filter = po/<lang>/maplist.po
source_file = po/maplist.pot
source_lang = en
type = PO
[josm.pluginlist]
file_filter = po/<lang>/pluginlist.po
source_file = po/pluginlist.pot
source_lang = en
type = PO
[josm.presets]
file_filter = po/<lang>/presets.po
source_file = po/presets.pot
source_lang = en
type = PO
......