Changeset 9765 in josm


Ignore:
Timestamp:
2016-02-09T13:25:35+01:00 (9 years ago)
Author:
bastiK
Message:

new setup of the netbeans project

  • removed classpath hack with two source directories (. and ./src) instead copy the resources to build dir in nbbuild.xml
  • import main JOSM ant file into nbbuild.xml instead of copy&paste
Location:
trunk
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r9749 r9765  
    99**
    1010-->
    11 <project xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" name="josm" default="dist" basedir="." xmlns:jacoco="antlib:org.jacoco.ant">
    12     <property name="test.dir" location="test"/>
    13     <property name="src.dir" location="src"/>
    14     <property name="build.dir" location="build"/>
    15     <property name="javacc.home" location="tools"/>
    16     <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
    17     <property name="epsg.output" location="data/projection/custom-epsg"/>
    18     <property name="groovy.jar" location="tools/groovy-all-2.4.6-SNAPSHOT.jar"/>
    19     <!-- build parameter: compression level (ant -Dclevel=N)
    20              N ranges from 0 (no compression) to 9 (maximum compression)
    21              default: 9 -->
    22     <condition property="clevel" value="${clevel}" else="9">
    23         <isset property="clevel"/>
    24     </condition>
    25     <!-- For Java9-specific stuff -->
    26     <condition property="isJava9">
    27         <equals arg1="${ant.java.version}" arg2="1.9" />
    28     </condition>
     11<project xmlns:as="antlib:org.codehaus.mojo.animal_sniffer" name="josm" default="dist" xmlns:jacoco="antlib:org.jacoco.ant">
     12    <target name="init-properties">
     13        <!-- Load properties in a target and not at top level, so this build file can be
     14        imported from an IDE ant file (Netbeans) without messing up IDE properties.
     15        When imported from another file, ${basedir} will point to the parent directory
     16        of the importing ant file. Use ${base.dir} instead, which is always the parent
     17        directory of this file. -->
     18        <dirname property="base.dir" file="${ant.file.josm}"/>
     19        <property name="test.dir" location="${base.dir}/test"/>
     20        <property name="src.dir" location="${base.dir}/src"/>
     21        <property name="build.dir" location="${base.dir}/build"/>
     22        <property name="dist.dir" location="${base.dir}/dist"/>
     23        <property name="javacc.home" location="${base.dir}/tools"/>
     24        <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
     25        <property name="proj-build.dir" location="${base.dir}/build2"/>
     26        <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
     27        <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.6-SNAPSHOT.jar"/>
     28        <!-- build parameter: compression level (ant -Dclevel=N)
     29                 N ranges from 0 (no compression) to 9 (maximum compression)
     30                 default: 9 -->
     31        <condition property="clevel" value="${clevel}" else="9">
     32            <isset property="clevel"/>
     33        </condition>
     34        <!-- For Java9-specific stuff -->
     35        <condition property="isJava9">
     36            <equals arg1="${ant.java.version}" arg2="1.9" />
     37        </condition>
     38    </target>
    2939
    3040    <!--
    … …  
    3949      ** Initializes the REVISION.XML file from SVN information
    4050    -->
    41     <target name="init-svn-revision-xml">
    42         <exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false" resultproperty="svn.info.result">
     51    <target name="init-svn-revision-xml" depends="init-properties">
     52        <exec append="false" output="${base.dir}/REVISION.XML" executable="svn" dir="${base.dir}" failifexecutionfails="false" resultproperty="svn.info.result">
    4353            <env key="LANG" value="C"/>
    4454            <arg value="info"/>
    … …  
    5363      ** Initializes the REVISION.XML file from git information
    5464    -->
    55     <target name="init-git-revision-xml" unless="svn.info.success">
    56         <exec append="false" output="REVISION.XML" executable="git" failifexecutionfails="false">
     65    <target name="init-git-revision-xml" unless="svn.info.success" depends="init-properties">
     66        <exec append="false" output="${base.dir}/REVISION.XML" executable="git" dir="${base.dir}" failifexecutionfails="false">
    5767            <arg value="log"/>
    5868            <arg value="-1"/>
    … …  
    6676            <arg value="HEAD"/>
    6777        </exec>
    68         <replaceregexp file="REVISION.XML" flags="s"
     78        <replaceregexp file="${base.dir}/REVISION.XML" flags="s"
    6979                       match=".*git-svn-id: [^@]*@([0-9]+).*(\d{4}-\d{2}-\d{2}.\d{2}\:\d{2}\:\d{2}\s*[+-]\d{2}:?\d{2})\s*$"
    7080                       replace="&lt;info&gt;&lt;entry&gt;&lt;commit revision=&quot;\1&quot;&gt;&lt;date&gt;\2&lt;/date&gt;&lt;/commit&gt;&lt;/entry&gt;&lt;/info&gt;"/>
    … …  
    7383      ** Creates the REVISION file to be included in the distribution
    7484    -->
    75     <target name="create-revision" depends="init-svn-revision-xml, init-git-revision-xml">
     85    <target name="create-revision" depends="init-properties,init-svn-revision-xml,init-git-revision-xml">
    7686        <property name="revision.dir" value="${build.dir}"/>
    77         <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
    78         <delete file="REVISION.XML"/>
     87        <xmlproperty file="${base.dir}/REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
     88        <delete file="${base.dir}/REVISION.XML"/>
    7989        <tstamp>
    8090            <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
    … …  
    94104      ** Check internal XML files against their XSD
    95105    -->
    96     <target name="check-schemas" unless="check-schemas.notRequired">
     106    <target name="check-schemas" unless="check-schemas.notRequired" depends="init-properties">
    97107        <schemavalidate file="data/defaultpresets.xml" >
    98108            <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="data/tagging-preset.xsd" />
    … …  
    108118        <copy file="LICENSE" todir="build"/>
    109119        <!-- create josm-custom.jar -->
    110         <delete file="dist/josm-custom.jar"/>
    111         <jar destfile="dist/josm-custom.jar" basedir="build" level="${clevel}">
     120        <delete file="${dist.dir}/josm-custom.jar"/>
     121        <jar destfile="${dist.dir}/josm-custom.jar" basedir="${build.dir}" level="${clevel}">
    112122            <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
    113123            <manifest>
    … …  
    126136    </target>
    127137    <!-- Mac OS X target -->
    128     <target name="mac">
     138    <target name="mac" depends="init-properties">
    129139        <!-- Using https://bitbucket.org/infinitekind/appbundler to create mac application bundle -->
    130140        <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="tools/appbundler-1.0ea.jar"/>
    … …  
    156166            <option value="-Dcom.apple.smallTabs=true"/>
    157167        </bundleapp>
    158        
     168
    159169        <!-- appbundler lacks the possibility of defining our own keys or using a template, so update the .plist manually -->
    160170        <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpath="tools/xmltask.jar"/>
    161        
     171
    162172        <xmltask source="${bundle.outdir}/JOSM.app/Contents/Info.plist" dest="${bundle.outdir}/JOSM.app/Contents/Info.plist" indent="false">
    163173            <!-- remove empty CFBundleDocumentTypes definition -->
    … …  
    166176            <insert position="before" path="/plist/dict/key[1]" file="macosx/JOSM.app/Contents/Info.plist_template.xml" />
    167177        </xmltask>
    168        
     178
    169179        <!-- create ZIP file with MacOS X application bundle -->
    170180        <zip destfile="${bundle.outdir}/josm-custom-macosx.zip" update="true">
    … …  
    175185    <target name="distmac" depends="dist">
    176186        <antcall target="mac">
    177             <param name="bundle.outdir" value="dist"/>
    178             <param name="bundle.jar" value="dist/josm-custom.jar"/>
     187            <param name="bundle.outdir" value="${dist.dir}"/>
     188            <param name="bundle.jar" value="${dist.dir}/josm-custom.jar"/>
    179189        </antcall>
    180190    </target>
    … …  
    226236        </javac>
    227237        <!-- JMapViewer -->
    228         <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**" 
     238        <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/josm/**,JOSM.java,gnu/**"
    229239            destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
    230240            <compilerarg value="-Xlint:cast"/>
    … …  
    243253        </javac>
    244254        <!-- JOSM -->
    245         <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java" 
     255        <javac sourcepath="" srcdir="${src.dir}" excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java"
    246256            destdir="build" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
    247257            <compilerarg value="-Xlint:cast"/>
    … …  
    264274        </copy>
    265275    </target>
    266     <target name="init">
     276    <target name="init" depends="init-properties">
    267277        <uptodate property="javacc.notRequired" targetfile="${mapcss.dir}/parsergen/MapCSSParser.java" >
    268278            <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/>
    269279        </uptodate>
    270         <mkdir dir="build"/>
    271         <mkdir dir="dist"/>
    272     </target>
    273     <target name="javadoc">
    274         <javadoc destdir="javadoc" 
     280        <mkdir dir="${build.dir}"/>
     281        <mkdir dir="${dist.dir}"/>
     282    </target>
     283    <target name="javadoc" depends="init-properties">
     284        <javadoc destdir="javadoc"
    275285                sourcepath="${src.dir}"
    276                 encoding="UTF-8"   
     286                encoding="UTF-8"
    277287                packagenames="org.openstreetmap.josm.*,org.openstreetmap.gui.jmapviewer.*"
    278288                excludepackagenames="org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.*"
    … …  
    287297        </javadoc>
    288298    </target>
    289     <target name="clean">
    290         <delete dir="build"/>
    291         <delete dir="build2"/>
    292         <delete dir="dist"/>
     299    <target name="clean" depends="init-properties">
     300        <delete dir="${build.dir}"/>
     301        <delete dir="${proj-build.dir}"/>
     302        <delete dir="${dist.dir}"/>
    293303        <delete dir="${mapcss.dir}/parsergen"/>
    294304        <delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/>
    … …  
    300310            <include name="**/*.jar"/>
    301311        </fileset>
    302         <pathelement path="dist/josm-custom.jar"/>
     312        <pathelement path="${dist.dir}/josm-custom.jar"/>
    303313        <pathelement path="${groovy.jar}"/>
    304314        <pathelement path="tools/findbugs/annotations.jar"/>
    … …  
    312322        </sequential>
    313323    </macrodef>
    314     <target name="test-init">
     324    <target name="test-init" depends="init-properties">
    315325        <mkdir dir="${test.dir}/build"/>
    316326        <mkdir dir="${test.dir}/build/unit"/>
    … …  
    323333        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="tools/jacocoant.jar" />
    324334    </target>
    325     <target name="test-clean">
     335    <target name="test-clean" depends="init-properties">
    326336        <delete dir="${test.dir}/build"/>
    327337        <delete dir="${test.dir}/report"/>
    … …  
    527537                <tokenfilter>
    528538                    <replaceregex pattern="\|$" replace="" flags="gi"/>
    529                 </tokenfilter>   
     539                </tokenfilter>
    530540            </filterchain>
    531541        </loadresource>
    … …  
    547557        <as:build-signatures destfile="${dir}/api.sig">
    548558            <path>
    549                 <fileset file="dist/josm-custom-optimized.jar"/>
     559                <fileset file="${dist.dir}/josm-custom-optimized.jar"/>
    550560                <fileset file="${java.home}/lib/rt.jar"/>
    551561                <fileset file="${java.home}/lib/jce.jar"/>
    … …  
    594604        <sequential>
    595605            <echo message="Generating Taginfo for type @{type} to @{output}"/>
    596             <groovy src="${taginfoextract}" classpath="dist/josm-custom.jar">
     606            <groovy src="${taginfoextract}" classpath="${dist.dir}/josm-custom.jar">
    597607                <arg value="-t"/>
    598608                <arg value="@{type}"/>
    … …  
    616626    </target>
    617627
    618     <target name="imageryindex">
     628    <target name="imageryindex" depends="init-properties">
    619629        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};tools/commons-cli-1.3.1.jar"/>
    620630        <echo message="Checking editor imagery difference"/>
    621         <groovy src="scripts/sync_editor_imagery_index.groovy" classpath="dist/josm-custom.jar">
     631        <groovy src="scripts/sync_editor_imagery_index.groovy" classpath="${dist.dir}/josm-custom.jar">
    622632            <arg value="-nomissingeii"/>
    623633        </groovy>
    … …  
    640650    </target>
    641651
    642     <target name="checkstyle">
    643         <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties" 
     652    <target name="checkstyle" depends="init-properties">
     653        <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
    644654             classpath="tools/checkstyle/checkstyle-6.15-all.jar"/>
    645655        <checkstyle config="tools/checkstyle/josm_checks.xml">
    646             <fileset dir="${basedir}/src/org/openstreetmap/josm" includes="**/*.java"
     656            <fileset dir="${base.dir}/src/org/openstreetmap/josm" includes="**/*.java"
    647657                excludes="gui/mappaint/mapcss/parsergen/*.java"/>
    648             <fileset dir="${basedir}/test" includes="**/*.java"/>
     658            <fileset dir="${base.dir}/test" includes="**/*.java"/>
    649659            <formatter type="xml" toFile="checkstyle-josm.xml"/>
    650660        </checkstyle>
    … …  
    654664        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="tools/findbugs/findbugs-ant.jar"/>
    655665        <path id="findbugs-classpath">
    656             <fileset dir="tools/findbugs/">
     666            <fileset dir="${base.dir}/tools/findbugs/">
    657667                <include name="*.jar"/>
    658668            </fileset>
    … …  
    666676                effort="max"
    667677                >
    668             <sourcePath path="${basedir}/src" />
    669             <class location="${basedir}/dist/josm-custom.jar" />
     678            <sourcePath path="${base.dir}/src" />
     679            <class location="${dist.dir}/josm-custom.jar" />
    670680        </findbugs>
    671681    </target>
    672682    <target name="run" depends="dist">
    673         <java jar="dist/josm-custom.jar" fork="true">
     683        <java jar="${dist.dir}/josm-custom.jar" fork="true">
    674684            <arg value="--set=expert=true"/>
    675685            <arg value="--set=remotecontrol.enabled=true"/>
    … …  
    678688        </java>
    679689    </target>
    680     <!-- compile build script for generating projection list -->
    681     <target name="epsg-compile" depends="compile">
    682         <mkdir dir="build2"/>
    683         <javac sourcepath="" srcdir="scripts" failonerror="true"
    684             destdir="build2" target="1.7" source="1.7" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8" classpath="build">
     690    <!--
     691      ** Compile build script for generating projection list.
     692    -->
     693    <target name="epsg-compile">
     694        <property name="proj-classpath" location="${build.dir}"/>
     695        <mkdir dir="${proj-build.dir}"/>
     696        <javac sourcepath="" srcdir="${base.dir}/scripts" failonerror="true"
     697            destdir="${proj-build.dir}" target="1.7" source="1.7" debug="on"
     698            includeantruntime="false" createMissingPackageInfoClass="false"
     699            encoding="UTF-8" classpath="${proj-classpath}">
    685700        </javac>
    686701    </target>
    687     <!-- generate projection list -->
     702    <!--
     703      ** generate projection list.
     704    -->
    688705    <target name="epsg" depends="epsg-compile">
    689706        <touch file="${epsg.output}"/>
    … …  
    691708            <sysproperty key="java.awt.headless" value="true"/>
    692709            <classpath>
    693                 <pathelement path="."/>
    694                 <pathelement path="build"/>
    695                 <pathelement path="build2"/>
     710                <pathelement path="${base.dir}"/>
     711                <pathelement path="${proj-classpath}"/>
     712                <pathelement path="${proj-build.dir}"/>
    696713            </classpath>
    697             <arg value="${basedir}"/>
     714            <arg value="${base.dir}"/>
    698715        </java>
    699716    </target>

  • trunk/netbeans/nbbuild.xml

    r8529 r9765  
    88<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
    99<!-- in the project's Project Properties dialog box.-->
    10 <project name="josm" default="default" basedir=".">
     10<project name="josmnb" default="default" basedir=".">
    1111    <description>Builds, tests, and runs the project josm.</description>
    1212
    13     <property name="javacc.home" location="../tools"/>
    14     <property name="mapcss.dir" location="../src/org/openstreetmap/josm/gui/mappaint/mapcss"/>
    15     <!-- For Windows-specific stuff -->
    16     <condition property="isWindows">
    17         <os family="Windows"/>
    18     </condition>
     13    <import file="nbproject/build-impl.xml" as="nbimpl"/>
    1914
    20     <import file="nbproject/build-impl.xml"/>
     15    <import file="../build.xml" as="josmbase"/> <!-- import the main JOSM ant file -->
     16
    2117    <!--
    2218
    23     There exist several targets which are by default empty and which can be 
    24     used for execution of your tasks. These targets are usually executed 
    25     before and after some main targets. They are: 
     19    There exist several targets which are by default empty and which can be
     20    used for execution of your tasks. These targets are usually executed
     21    before and after some main targets. They are:
    2622
    2723      -pre-init:                 called before initialization of project properties
    … …  
    4945        </target>
    5046
    51     For list of available properties check the imported 
    52     nbproject/build-impl.xml file. 
     47    For list of available properties check the imported
     48    nbproject/build-impl.xml file.
    5349
    5450
    5551    Another way to customize the build is by overriding existing main targets.
    56     The targets of interest are: 
     52    The targets of interest are:
    5753
    5854      -init-macrodef-javac:     defines macro for javac compilation
    … …  
    6056      -init-macrodef-debug:     defines macro for class debugging
    6157      -init-macrodef-java:      defines macro for class execution
    62       -do-jar-with-manifest:    JAR building (if you are using a manifest)
    63       -do-jar-without-manifest: JAR building (if you are not using a manifest)
    64       run:                      execution of project
     58      -do-jar:                  JAR building
     59      run:                      execution of project
    6560      -javadoc-build:           Javadoc generation
    6661      test-report:              JUnit report generation
    … …  
    7469        </target>
    7570
    76     Notice that the overridden target depends on the jar target and not only on 
    77     the compile target as the regular run target does. Again, for a list of available 
     71    Notice that the overridden target depends on the jar target and not only on
     72    the compile target as the regular run target does. Again, for a list of available
    7873    properties which you can use, check the target you are overriding in the
    79     nbproject/build-impl.xml file. 
     74    nbproject/build-impl.xml file.
    8075
    8176    -->
    82    
    83     <target name="-post-compile">
    84     <!-- create the REVISION file to be included in the distribution -->
    85                 <exec append="false" output="REVISION.XML" executable="svn" dir=".." failifexecutionfails="false">
    86                         <env key="LANG" value="C"/>
    87                         <arg value="info"/>
    88                         <arg value="--xml"/>
    89                         <arg value="."/>
    90                 </exec>
    91                 <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
    92                 <delete file="REVISION.XML" />
    93                 <tstamp>
    94                         <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
    95                 </tstamp>
    9677
    97                 <property name="version.entry.commit.revision" value="UNKNOWN"/>
    98                 <echo file="${build.classes.dir}/REVISION">
    99 # automatically generated by JOSM build.xml - do not edit
    100 Revision: ${version.entry.commit.revision}
    101 Is-Local-Build: true
    102 Build-Date: ${build.tstamp}
    103 </echo>
    104         </target>
     78    <!--
     79      ** Copy resource file required on classpath.
     80    -->
     81    <target name="copy-josm-resources">
     82        <copy file="../CONTRIBUTION" todir="${build.classes.dir}"/>
     83        <copy file="../README" todir="${build.classes.dir}"/>
     84        <copy file="../LICENSE" todir="${build.classes.dir}"/>
     85        <copy file="../gpl-2.0.txt" todir="${build.classes.dir}" />
     86        <copy file="../gpl-3.0.txt" todir="${build.classes.dir}" />
     87        <copy todir="${build.classes.dir}/images"><fileset dir="../images"/></copy>
     88        <copy todir="${build.classes.dir}/data"><fileset dir="../data"/></copy>
     89        <copy todir="${build.classes.dir}/styles"><fileset dir="../styles"/></copy>
     90        <copy todir="${build.classes.dir}/org/openstreetmap/gui/jmapviewer/images">
     91            <fileset dir="../src/org/openstreetmap/gui/jmapviewer/images"/>
     92        </copy>
     93    </target>
    10594
    106     <target name="check-javacc">
    107         <uptodate property="javacc.notRequired" targetfile="${mapcss.dir}/parsergen/MapCSSParser.java" >
    108             <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/>
    109         </uptodate>
    110     </target>   
    111     <target name="javacc" depends="check-javacc" unless="javacc.notRequired">
    112         <mkdir dir="${mapcss.dir}/parsergen"/>
    113         <exec append="false" executable="java" failifexecutionfails="true">
    114             <arg value="-cp"/>
    115             <arg value="${javacc.home}/javacc.jar"/>
    116             <arg value="javacc"/>
    117             <arg value="-DEBUG_PARSER=false"/>
    118             <arg value="-DEBUG_TOKEN_MANAGER=false"/>
    119             <arg value="-JDK_VERSION=1.7"/>
    120             <arg value="-GRAMMAR_ENCODING=UTF-8"/>
    121             <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
    122             <arg value="${mapcss.dir}/MapCSSParser.jj"/>
    123         </exec>
     95    <!--
     96      ** Customize some properties used by the main JOSM ant file.
     97    -->
     98    <target name="set-josmbase-properties" depends="-init-project">
     99        <property name="revision.dir" value="${build.classes.dir}"/>
     100        <property name="proj-build.dir" location="${build.dir}/build2"/>
     101        <property name="proj-classpath" location="${build.classes.dir}"/>
    124102    </target>
    125     <target name="-pre-compile" depends="javacc">
    126 <!--        <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
    127     </target>   
     103
     104    <!--
     105      ** Make sure properties are loaded in the right order.
     106      ** E.g. ${build.dir} is set both by Netbeans and by the main JOSM ant file.
     107      ** Load the Netbeans properties first, which makes the values permanent.
     108    -->
     109    <target name="init-josmbase" depends="-init-project, set-josmbase-properties, josmbase.init-properties"/>
     110
     111    <target name="-pre-compile" depends="init-josmbase, josmbase.javacc"/>
     112
     113    <target name="-post-compile" depends="init-josmbase, josmbase.epsg, josmbase.create-revision, copy-josm-resources"/>
     114
    128115</project>

  • trunk/netbeans/nbproject/genfiles.properties

    r7937 r9765  
    1 nbbuild.xml.data.CRC32=2a1d7942
    2 nbbuild.xml.script.CRC32=cf6b78f3
    3 nbbuild.xml.stylesheet.CRC32=28e38971@1.38.2.45
     1nbbuild.xml.data.CRC32=34ed5462
     2nbbuild.xml.script.CRC32=148a2ea3
     3nbbuild.xml.stylesheet.CRC32=8064a381@1.75.2.48
    44# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
    55# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
    6 nbproject/build-impl.xml.data.CRC32=e047155d
    7 nbproject/build-impl.xml.script.CRC32=63445536
    8 nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
     6nbproject/build-impl.xml.data.CRC32=f36994fb
     7nbproject/build-impl.xml.script.CRC32=05416174
     8nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48

  • trunk/netbeans/nbproject/private/config.properties

    r7937 r9765  
     1config=local_preferences

  • trunk/netbeans/nbproject/project.properties

    r8277 r9765  
    1 annotation.processing.enabled=false
     1annotation.processing.enabled=true
    22annotation.processing.enabled.in.editor=false
    33annotation.processing.processors.list=
    … …  
    2424debug.test.classpath=\
    2525    ${run.test.classpath}
     26# Files in build.classes.dir which should be excluded from distribution jar
     27dist.archive.excludes=
    2628# This directory is removed when the project is cleaned:
    2729dist.dir=dist
    … …  
    2931dist.javadoc.dir=${dist.dir}/javadoc
    3032endorsed.classpath=
    31 excludes=org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/jcs/admin/servlet/**,org/apache/commons/jcs/auxiliary/disk/jdbc/**,org/apache/commons/jcs/auxiliary/remote/http/**,org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java,org/apache/commons/jcs/utils/servlet/**,org/apache/commons/logging/impl/AvalonLogger.java,org/apache/commons/logging/impl/Jdk13LumberjackLogger.java,org/apache/commons/logging/impl/Log4JLogger.java,org/apache/commons/logging/impl/LogKitLogger.java,org/apache/commons/logging/impl/ServletContextCleaner.java
     33excludes=org/apache/commons/compress/compressors/lzma/**,org/apache/commons/compress/compressors/xz/**,org/apache/commons/compress/compressors/CompressorStreamFactory.java,org/apache/commons/compress/compressors/deflate/**,org/apache/commons/compress/compressors/gzip/**,org/apache/commons/compress/compressors/lzw/**,org/apache/commons/compress/compressors/pack200/**,org/apache/commons/compress/compressors/snappy/**,org/apache/commons/compress/compressors/z/**,org/apache/commons/jcs/admin/servlet/**,org/apache/commons/jcs/auxiliary/disk/jdbc/**,org/apache/commons/jcs/auxiliary/remote/http/**,org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java,org/apache/commons/jcs/utils/servlet/**,org/apache/commons/logging/impl/AvalonLogger.java,org/apache/commons/logging/impl/Jdk13LumberjackLogger.java,org/apache/commons/logging/impl/Log4JLogger.java,org/apache/commons/logging/impl/LogKitLogger.java,org/apache/commons/logging/impl/ServletContextCleaner.java,org/openstreetmap/gui/jmapviewer/Demo.java
     34file.reference.commons-collections-3.2.jar=../test/lib/unitils-core/commons-collections-3.2.jar
     35file.reference.commons-lang-2.3.jar=../test/lib/unitils-core/commons-lang-2.3.jar
     36file.reference.commons-logging-1.1.jar=../test/lib/unitils-core/commons-logging-1.1.jar
    3237file.reference.core-src=../src
    33 file.reference.core=..
     38file.reference.debug-1.0.jar=../test/lib/fest/debug-1.0.jar
     39file.reference.equalsverifier-1.7.6.jar=../test/lib/equalsverifier-1.7.6.jar
     40file.reference.fest-assert-1.0.jar=../test/lib/fest/fest-assert-1.0.jar
     41file.reference.fest-reflect-1.1.jar=../test/lib/fest/fest-reflect-1.1.jar
     42file.reference.fest-swing-1.1.jar=../test/lib/fest/fest-swing-1.1.jar
     43file.reference.fest-util-1.0.jar=../test/lib/fest/fest-util-1.0.jar
     44file.reference.findbugs.jar=../tools/findbugs/findbugs.jar
     45file.reference.hamcrest-core-1.3.jar=../test/lib/junit/hamcrest-core-1.3.jar
     46file.reference.jcip-annotations-1.0.jar=../test/lib/fest/jcip-annotations-1.0.jar
     47file.reference.jfcunit.jar=../test/lib/jfcunit.jar
     48file.reference.junit-4.12.jar=../test/lib/junit/junit-4.12.jar
     49file.reference.MRJToolkitStubs-1.0.jar=../test/lib/fest/MRJToolkitStubs-1.0.jar
     50file.reference.ognl-2.6.9.jar=../test/lib/unitils-core/ognl-2.6.9.jar
     51file.reference.test-functional=../test/functional
     52file.reference.test-performance=../test/performance
    3453file.reference.test-unit=../test/unit
    35 includes=org/apache/commons/compress/compressors/*.java,org/apache/commons/compress/compressors/bzip2/*.java,org/apache/commons/codec/**/*.java,org/glassfish/**/*.java,org/jdesktop/**/*.java,org/openstreetmap/**/*.java,org/w3/**/*.java,gnu/**/*.java,javax/**/*.java,oauth/**/*.java,com/**/*.java,org/apache/commons/logging/**/*.java,org/apache/commons/jcs/**/*.java,images/**,org/openstreetmap/gui/**/*.png,data/**,styles/**,LICENSE,README,CONTRIBUTION,gpl-2.0.txt,gpl-3.0.txt
    36 jar.archive.disabled=${jnlp.enabled}
     54file.reference.unitils-core-3.4.2.jar=../test/lib/unitils-core/unitils-core-3.4.2.jar
     55includes=**/*.java
    3756jar.compress=false
    38 jar.index=${jnlp.enabled}
    3957javac.classpath=
    4058# Space-separated list of extra javac options
    41 javac.compilerargs=-Xlint:unchecked -Xlint:cast -Xlint:dep-ann -Xlint:divzero -Xlint:empty -Xlint:finally -Xlint:overrides -Xlint:static -Xlint:try  -Xlint:deprecation 
     59javac.compilerargs=-Xlint:unchecked -Xlint:cast -Xlint:dep-ann -Xlint:divzero -Xlint:empty -Xlint:finally -Xlint:overrides -Xlint:static -Xlint:try  -Xlint:deprecation
    4260javac.deprecation=true
    4361javac.processorpath=\
    … …  
    4866    ${javac.classpath}:\
    4967    ${build.classes.dir}:\
    50     ${libs.junit.classpath}:\
    51     ${libs.junit_4.classpath}
     68    ${file.reference.junit-4.12.jar}:\
     69    ${file.reference.equalsverifier-1.7.6.jar}:\
     70    ${file.reference.jfcunit.jar}:\
     71    ${file.reference.hamcrest-core-1.3.jar}:\
     72    ${file.reference.MRJToolkitStubs-1.0.jar}:\
     73    ${file.reference.debug-1.0.jar}:\
     74    ${file.reference.fest-assert-1.0.jar}:\
     75    ${file.reference.fest-reflect-1.1.jar}:\
     76    ${file.reference.fest-swing-1.1.jar}:\
     77    ${file.reference.fest-util-1.0.jar}:\
     78    ${file.reference.jcip-annotations-1.0.jar}:\
     79    ${file.reference.commons-collections-3.2.jar}:\
     80    ${file.reference.commons-lang-2.3.jar}:\
     81    ${file.reference.commons-logging-1.1.jar}:\
     82    ${file.reference.ognl-2.6.9.jar}:\
     83    ${file.reference.unitils-core-3.4.2.jar}:\
     84    ${file.reference.findbugs.jar}
    5285javac.test.processorpath=\
    5386    ${javac.test.classpath}
    … …  
    6396javadoc.version=false
    6497javadoc.windowtitle=
    65 jnlp.codebase.type=no.codebase
    66 jnlp.descriptor=application
    67 jnlp.enabled=false
    68 jnlp.mixed.code=default
    69 jnlp.offline-allowed=false
    70 jnlp.signed=false
    71 jnlp.signing=
    72 jnlp.signing.alias=
    73 jnlp.signing.keystore=
    7498main.class=org.openstreetmap.josm.gui.MainApplication
    7599manifest.file=manifest.mf
    … …  
    84108    ${build.test.classes.dir}
    85109source.encoding=UTF-8
    86 src.core.dir=${file.reference.core}
    87110src.dir=${file.reference.core-src}
     111test.functional.dir=${file.reference.test-functional}
     112test.performance.dir=${file.reference.test-performance}
    88113test.unit.dir=${file.reference.test-unit}

  • trunk/netbeans/nbproject/project.xml

    r7937 r9765  
    77            <source-roots>
    88                <root id="src.dir"/>
    9                 <root id="src.core.dir"/>
    109            </source-roots>
    1110            <test-roots>
    12                 <root id="test.unit.dir"/>
     11                <root id="test.unit.dir" name="Unit Tests"/>
     12                <root id="test.functional.dir" name="Functional Tests"/>
     13                <root id="test.performance.dir" name="Performance Tests"/>
    1314            </test-roots>
    1415        </data>
Note: See TracChangeset for help on using the changeset viewer.