Changeset 9765 in josm for trunk/netbeans/nbproject


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/netbeans/nbproject
Files:
4 added
4 edited

Legend:

Unmodified
Added
Removed

  • 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.