Ticket #12399: FixGitBuild.patch

File FixGitBuild.patch, 22.1 KB (added by kolesar, 10 years ago)

  • czechaddress/build.xml 

    diff --git a/czechaddress/build.xml b/czechaddress/build.xml
index 594d4a4..5551de0 100644
    a b  
    66    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    77    <property name="plugin.manifest" value="${plugin.build.dir}/org/openstreetmap/josm/plugins/czechaddress/MANIFEST.MF"/>
    88    <property name="ant.build.javac.target" value="1.7"/>
     9    <!--
     10    **********************************************************
     11    ** include targets that all plugins have in common
     12    **********************************************************
     13    -->
     14    <import file="../build-common.xml"/>
    915    <target name="clean" description="Removes all build files and the plugins's jar">
    1016        <delete dir="${plugin.build.dir}"/>
    1117        <delete file="${plugin.jar}"/>
    … …  
    3945    <target name="dist" depends="compile">
    4046        <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}" manifestencoding="UTF-8" manifest="${plugin.build.dir}/org/openstreetmap/josm/plugins/czechaddress/MANIFEST.MF"/>
    4147    </target>
    42     <target name="revision">
    43         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    44             <env key="LANG" value="C"/>
    45             <arg value="info"/>
    46             <arg value="--xml"/>
    47             <arg value="."/>
    48         </exec>
    49         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    50         <delete file="REVISION"/>
    51     </target>
    5248    <target name="install" depends="dist">
    5349        <property environment="env"/>
    5450        <condition property="josm.plugins.dir" value="${env.APPDATA}/JOSM/plugins" else="${user.home}/.josm/plugins">

  • dataimport/build.xml 

    diff --git a/dataimport/build.xml b/dataimport/build.xml
index e83111e..f8b9de1 100644
    a b  
    1818    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    1919    <!--
    2020    **********************************************************
     21    ** include targets that all plugins have in common
     22    **********************************************************
     23    -->
     24    <import file="../build-common.xml"/>
     25    <!--
     26    **********************************************************
    2127    ** init - initializes the build
    2228    **********************************************************
    2329    -->
    … …  
    3642            <compilerarg value="-Xlint:unchecked"/>
    3743            <classpath>
    3844                <pathelement location="${josm}"/>
    39                 <fileset dir="lib">
     45                <fileset dir="lib" erroronmissingdir="no">
    4046                    <include name="**/*.jar"/>
    4147                </fileset>
    4248            </classpath>
    … …  
    7985    </target>
    8086    <!--
    8187    **********************************************************
    82     ** revision - extracts the current revision number for the
    83     **    file build.number and stores it in the XML property
    84     **    version.*
    85     **********************************************************
    86     -->
    87     <target name="revision">
    88         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    89             <env key="LANG" value="C"/>
    90             <arg value="info"/>
    91             <arg value="--xml"/>
    92             <arg value="."/>
    93         </exec>
    94         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    95         <delete file="REVISION"/>
    96     </target>
    97     <!--
    98     **********************************************************
    9988    ** clean - clean up the build environment
    10089    **********************************************************
    10190    -->

  • ext_tools/build.xml 

    diff --git a/ext_tools/build.xml b/ext_tools/build.xml
index e1ec1c9..419cfb2 100644
    a b  
    1111    <property name="josm" location="../../core/dist/josm-custom.jar"/>
    1212    <property name="plugin.build.dir" value="build"/>
    1313    <property name="plugin.src.dir" value="src"/>
     14    <property name="plugin.resources.dir" value="resources"/>
    1415    <!-- this is the directory where the plugin jar is copied to -->
    1516    <property name="plugin.dist.dir" value="../../dist"/>
    1617    <property name="ant.build.javac.target" value="1.7"/>
    … …  
    1819    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    1920    <!--
    2021    **********************************************************
     22    ** include targets that all plugins have in common
     23    **********************************************************
     24    -->
     25    <import file="../build-common.xml"/>
     26    <!--
     27    **********************************************************
    2128    ** init - initializes the build
    2229    **********************************************************
    2330    -->
    2431    <target name="init">
    2532        <mkdir dir="${plugin.build.dir}"/>
     33        <mkdir dir="${plugin.resources.dir}"/>
    2634    </target>
    2735    <!--
    2836    **********************************************************
    … …  
    8189    </target>
    8290    <!--
    8391    **********************************************************
    84     ** revision - extracts the current revision number for the
    85     **    file build.number and stores it in the XML property
    86     **    version.*
    87     **********************************************************
    88     -->
    89     <target name="revision">
    90         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    91             <env key="LANG" value="C"/>
    92             <arg value="info"/>
    93             <arg value="--xml"/>
    94             <arg value="."/>
    95         </exec>
    96         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    97         <delete file="REVISION"/>
    98     </target>
    99     <!--
    100     **********************************************************
    10192    ** clean - clean up the build environment
    10293    **********************************************************
    10394    -->

  • globalsat/build.xml 

    diff --git a/globalsat/build.xml b/globalsat/build.xml
index 59cc4b2..2689803 100644
    a b  
    1414    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    1515    <property name="ant.build.javac.target" value="1.7"/>
    1616    <property name="RXTX" location="./libs/RXTXcomm.jar"/>
     17    <!--
     18    **********************************************************
     19    ** include targets that all plugins have in common
     20    **********************************************************
     21    -->
     22    <import file="../build-common.xml"/>
    1723    <target name="init">
    1824        <mkdir dir="${plugin.build.dir}"/>
    1925    </target>
    … …  
    4955            </manifest>
    5056        </jar>
    5157    </target>
    52     <target name="revision">
    53         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    54             <env key="LANG" value="C"/>
    55             <arg value="info"/>
    56             <arg value="--xml"/>
    57             <arg value="."/>
    58         </exec>
    59         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    60         <delete file="REVISION"/>
    61     </target>
    6258    <target name="clean">
    6359        <delete dir="${plugin.build.dir}"/>
    6460        <delete file="${plugin.jar}"/>

  • gpsblam/build.xml 

    diff --git a/gpsblam/build.xml b/gpsblam/build.xml
index 3dbce20..1bab608 100644
    a b  
    1212    **********************************************************
    1313    -->
    1414    <import file="../build-common.xml"/>
    15  
     15    <target name="init">
     16        <mkdir dir="resources"/>
     17        <mkdir dir="build"/>
     18    </target>
    1619    <!--
    1720    **********************************************************
    1821    ** dist - creates the plugin jar

  • infomode/build.xml 

    diff --git a/infomode/build.xml b/infomode/build.xml
index 50b62a1..1063d1d 100644
    a b  
    88    <property name="josm" location="../../core/dist/josm-custom.jar"/>
    99    <property name="plugin.build.dir" value="build"/>
    1010    <property name="plugin.src.dir" value="src"/>
     11    <property name="plugin.resources.dir" value="resources"/>
    1112    <!-- this is the directory where the plugin jar is copied to -->
    1213    <property name="plugin.dist.dir" value="../../dist"/>
    1314    <property name="ant.build.javac.target" value="1.7"/>
    … …  
    1516    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    1617    <!--
    1718    **********************************************************
     19    ** include targets that all plugins have in common
     20    **********************************************************
     21    -->
     22    <import file="../build-common.xml"/>
     23    <!--
     24    **********************************************************
    1825    ** init - initializes the build
    1926    **********************************************************
    2027    -->
    2128    <target name="init">
    2229        <mkdir dir="${plugin.build.dir}"/>
     30        <mkdir dir="${plugin.resources.dir}"/>
    2331    </target>
    2432    <!--
    2533    **********************************************************
    … …  
    7987    </target>
    8088    <!--
    8189    **********************************************************
    82     ** revision - extracts the current revision number for the
    83     **    file build.number and stores it in the XML property
    84     **    version.*
    85     **********************************************************
    86     -->
    87     <target name="revision">
    88         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    89             <env key="LANG" value="C"/>
    90             <arg value="info"/>
    91             <arg value="--xml"/>
    92             <arg value="."/>
    93         </exec>
    94         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    95         <delete file="REVISION"/>
    96     </target>
    97     <!--
    98     **********************************************************
    9990    ** clean - clean up the build environment
    10091    **********************************************************
    10192    -->
    … …  
    118109        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    119110    </target>
    120111    <!--
    121     ************************** Publishing the plugin *********************************** 
     112    ************************** Publishing the plugin ***********************************
    122113    -->
    123114    <!--
    124     ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
     115    ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    125116    ** property ${coreversion.info.entry.revision}
    126117    -->
    127118    <target name="core-info">
    … …  
    165156    <target name="commit-dist">
    166157        <echo>
    167158    ***** Properties of published ${plugin.jar} *****
    168     Commit message    : '${commit.message}'                   
     159    Commit message    : '${commit.message}'
    169160    Plugin-Mainversion: ${plugin.main.version}
    170161    JOSM build version: ${coreversion.info.entry.revision}
    171162    Plugin-Version    : ${version.entry.commit.revision}
    172     ***** / Properties of published ${plugin.jar} *****                   
    173                        
     163    ***** / Properties of published ${plugin.jar} *****
     164
    174165    Now commiting ${plugin.jar} ...
    175166    </echo>
    176167        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">

  • irsrectify/build.xml 

    diff --git a/irsrectify/build.xml b/irsrectify/build.xml
index 93c82a3..6554515 100644
    a b  
    1818    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    1919    <!--
    2020    **********************************************************
     21    ** include targets that all plugins have in common
     22    **********************************************************
     23    -->
     24    <import file="../build-common.xml"/>
     25    <!--
     26    **********************************************************
    2127    ** init - initializes the build
    2228    **********************************************************
    2329    -->
    … …  
    7985    </target>
    8086    <!--
    8187    **********************************************************
    82     ** revision - extracts the current revision number for the
    83     **    file build.number and stores it in the XML property
    84     **    version.*
    85     **********************************************************
    86     -->
    87     <target name="revision">
    88         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    89             <env key="LANG" value="C"/>
    90             <arg value="info"/>
    91             <arg value="--xml"/>
    92             <arg value="."/>
    93         </exec>
    94         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    95         <delete file="REVISION"/>
    96     </target>
    97     <!--
    98     **********************************************************
    9988    ** clean - clean up the build environment
    10089    **********************************************************
    10190    -->
    … …  
    118107        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    119108    </target>
    120109    <!--
    121     ************************** Publishing the plugin *********************************** 
     110    ************************** Publishing the plugin ***********************************
    122111    -->
    123112    <!--
    124         ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
     113        ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    125114        ** property ${coreversion.info.entry.revision}
    126115        **
    127116        -->
    … …  
    167156        </exec>
    168157    </target>
    169158    <!--
    170         ** commits the plugin.jar 
     159        ** commits the plugin.jar
    171160        -->
    172161    <target name="commit-dist">
    173162        <echo>
    174163    ***** Properties of published ${plugin.jar} *****
    175     Commit message    : '${commit.message}'                   
     164    Commit message    : '${commit.message}'
    176165    Plugin-Mainversion: ${plugin.main.version}
    177166    JOSM build version: ${coreversion.info.entry.revision}
    178167    Plugin-Version    : ${version.entry.commit.revision}
    179     ***** / Properties of published ${plugin.jar} *****                   
    180                        
     168    ***** / Properties of published ${plugin.jar} *****
     169
    181170    Now commiting ${plugin.jar} ...
    182171    </echo>
    183172        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">

  • no_more_mapping/build.xml 

    diff --git a/no_more_mapping/build.xml b/no_more_mapping/build.xml
index fe6eacb..8f948c3 100644
    a b  
    2020    -->
    2121    <target name="dist" depends="compile,revision">
    2222        <echo message="creating ${ant.project.name}.jar ... "/>
    23         <copy todir="${plugin.build.dir}/resources">
    24             <fileset dir="resources"/>
    25         </copy>
    2623        <copy todir="${plugin.build.dir}/images">
    2724            <fileset dir="images"/>
    2825        </copy>

  • openvisible/build.xml 

    diff --git a/openvisible/build.xml b/openvisible/build.xml
index 3306760..d3c03e6 100644
    a b  
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    66    <property name="plugin.main.version" value="7001"/>
    77    <!--
     8    **********************************************************
     9    ** include targets that all plugins have in common
     10    **********************************************************
     11    -->
     12    <import file="../build-common.xml"/>
     13    <!--
    814      ************************************************
    915      ** should not be necessary to change the following properties
    1016     -->
    … …  
    4450            </manifest>
    4551        </jar>
    4652    </target>
    47     <target name="revision">
    48         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    49             <env key="LANG" value="C"/>
    50             <arg value="info"/>
    51             <arg value="--xml"/>
    52             <arg value="."/>
    53         </exec>
    54         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    55         <delete file="REVISION"/>
    56     </target>
    5753    <target name="clean">
    5854        <delete dir="${plugin.build.dir}"/>
    5955        <delete file="${plugin.jar}"/>
    … …  
    6864        <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
    6965    </target>
    7066    <!--
    71     ************************** Publishing the plugin *********************************** 
     67    ************************** Publishing the plugin ***********************************
    7268    -->
    7369    <!--
    74         ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
     70        ** extracts the JOSM release for the JOSM version in ../core and saves it in the
    7571        ** property ${coreversion.info.entry.revision}
    7672        **
    7773        -->
    … …  
    117113        </exec>
    118114    </target>
    119115    <!--
    120         ** commits the plugin.jar 
     116        ** commits the plugin.jar
    121117        -->
    122118    <target name="commit-dist">
    123119        <echo>
    124120    ***** Properties of published ${plugin.jar} *****
    125     Commit message    : '${commit.message}'                 
     121    Commit message    : '${commit.message}'
    126122    Plugin-Mainversion: ${plugin.main.version}
    127123    JOSM build version: ${coreversion.info.entry.revision}
    128124    Plugin-Version    : ${version.entry.commit.revision}
    129     ***** / Properties of published ${plugin.jar} *****                 
    130                        
     125    ***** / Properties of published ${plugin.jar} *****
     126
    131127    Now commiting ${plugin.jar} ...
    132128    </echo>
    133129        <exec append="true" output="svn.log" executable="svn" failifexecutionfails="false">

  • osmarender/build.xml 

    diff --git a/osmarender/build.xml b/osmarender/build.xml
index f65095f..fa5375d 100644
    a b  
    2222        <copy tofile="${plugin.build.dir}/osm-map-features.xml" file="${stylesheets}/osm-map-features-z17.xml"/>
    2323    </target>
    2424
    25     <target name="revision">
    26         <exec append="false" output="REVISION" executable="perl" failifexecutionfails="false">
    27             <env key="LANG" value="C"/>
    28             <arg value="../getrevision.pl"/>
    29             <arg value="xslt"/>
    30             <arg value="stylesheets"/>
    31             <arg value="."/>
    32         </exec>
    33         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    34         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="true" failonerror="true">
    35             <env key="LANG" value="C"/>
    36             <arg value="info"/>
    37             <arg value="--xml"/>
    38             <arg value="."/>
    39         </exec>
    40         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    41         <echo message="Revision is ${version.entry.commit.revision}"/>
    42         <delete file="REVISION"/>
    43     </target>
    44 
    4525</project>

  • routes/build.xml 

    diff --git a/routes/build.xml b/routes/build.xml
index 85be3e9..4eb075e 100644
    a b  
    55    <property name="josm" location="../../core/dist/josm-custom.jar"/>
    66    <property name="plugin.dist.dir" value="../../dist"/>
    77    <property name="plugin.build.dir" value="build"/>
     8    <property name="plugin.lib.dir" value="lib"/>
    89    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    910    <property name="ant.build.javac.target" value="1.7"/>
     11    <!--
     12    **********************************************************
     13    ** include targets that all plugins have in common
     14    **********************************************************
     15    -->
     16    <import file="../build-common.xml"/>
    1017    <target name="init">
    1118        <mkdir dir="${plugin.build.dir}"/>
     19        <mkdir dir="${plugin.lib.dir}"/>
    1220    </target>
    1321    <target name="compile" depends="init">
    1422        <echo message="creating ${plugin.jar}"/>
    … …  
    4048            </manifest>
    4149        </jar>
    4250    </target>
    43     <target name="revision">
    44         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    45             <env key="LANG" value="C"/>
    46             <arg value="info"/>
    47             <arg value="--xml"/>
    48             <arg value="."/>
    49         </exec>
    50         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    51         <delete file="REVISION"/>
    52     </target>
    5351    <target name="clean">
    5452        <delete dir="${plugin.build.dir}"/>
    5553        <delete file="${plugin.jar}"/>

  • tagging-preset-tester/build.xml 

    diff --git a/tagging-preset-tester/build.xml b/tagging-preset-tester/build.xml
index efc1653..7d15dfe 100644
    a b  
    77    <property name="plugin.build.dir" value="build"/>
    88    <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
    99    <property name="ant.build.javac.target" value="1.7"/>
     10    <!--
     11    **********************************************************
     12    ** include targets that all plugins have in common
     13    **********************************************************
     14    -->
     15    <import file="../build-common.xml"/>
    1016    <target name="init">
    1117        <mkdir dir="${plugin.build.dir}"/>
    1218    </target>
    … …  
    4147            </manifest>
    4248        </jar>
    4349    </target>
    44     <target name="revision">
    45         <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
    46             <env key="LANG" value="C"/>
    47             <arg value="info"/>
    48             <arg value="--xml"/>
    49             <arg value="."/>
    50         </exec>
    51         <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
    52         <delete file="REVISION"/>
    53     </target>
    5450    <target name="clean">
    5551        <delete dir="${plugin.build.dir}"/>
    5652        <delete file="${plugin.jar}"/>

  • turnlanes/build.xml 

    diff --git a/turnlanes/build.xml b/turnlanes/build.xml
index 5815fbe..e4197bf 100644
    a b  
    1212    **********************************************************
    1313    -->
    1414    <import file="../build-common.xml"/>
    15 
    1615    <!--
    1716    **********************************************************
    1817    ** dist - creates the plugin jar
    … …  
    2019    -->
    2120    <target name="dist" depends="compile,revision">
    2221        <echo message="creating ${ant.project.name}.jar ... "/>
    23         <copy todir="${plugin.build.dir}/resources">
    24             <fileset dir="resources"/>
    25         </copy>
    2622        <copy todir="${plugin.build.dir}/images">
    2723            <fileset dir="images"/>
    2824        </copy>