Changeset 16139 in josm for trunk

Timestamp:

2020-03-15T19:54:10+01:00 (5 years ago)

Author:

Don-vip

Message:

see #16860 - see #18880 - setup Ivy in Netbeans project

Location:

trunk/ide/netbeans

Files:

• nbbuild.xml (modified) (1 diff)
• nbproject/genfiles.properties (modified) (1 diff)
• nbproject/private (modified) (1 prop)
• nbproject/project.properties (modified) (3 diffs)

trunk/ide/netbeans/nbbuild.xml

@@ -107 +107 @@
       ** Load the Netbeans properties first, which makes the values permanent.
     -->
-    <target name="init-josmbase" depends="-init-project, set-josmbase-properties, josmbase.init-properties"/>
+    <target name="init-josmbase" depends="-init-project, set-josmbase-properties, josmbase.init-properties">
+        <pathconvert property="ivy.classpath.computed" dirsep="/" pathsep=":">
+            <path refid="runtime.path"/>
+            <map from="${basedir}${file.separator}" to=""/>
+        </pathconvert>
+        <propertyfile file="nbproject/project.properties">
+            <entry operation="=" key="ivy.classpath" value="${ivy.classpath.computed}"/>
+        </propertyfile>
+    </target>
 
     <target name="-pre-compile" depends="init-josmbase, josmbase.javacc"/>

trunk/ide/netbeans/nbproject/genfiles.properties

@@ -5 +5 @@
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=f36994fb
-nbproject/build-impl.xml.script.CRC32=5e13918b
-nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
+nbproject/build-impl.xml.script.CRC32=250d22b4
+nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.94.0.48

trunk/ide/netbeans/nbproject/project.properties

@@ -51 +51 @@
 includes=**/*.java
 jar.compress=false
-javac.classpath=
+javac.classpath=${ivy.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:cast -Xlint:dep-ann -Xlint:divzero -Xlint:empty -Xlint:finally -Xlint:overrides -Xlint:static -Xlint:try  -Xlint:deprecation
 javac.deprecation=true
 javac.external.vm=false
+javac.modulepath=
+javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
@@ -76 +78 @@
     ${file.reference.spotbugs.jar}:\
     ${file.reference.commons-testing-2.1.0.jar}
+javac.test.modulepath=${javac.modulepath}
 javac.test.processorpath=\
     ${javac.test.classpath}
@@ -97 +100 @@
     ${javac.classpath}:\
     ${build.classes.dir}
+run.modulepath=${javac.modulepath}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
+run.test.modulepath=${javac.test.modulepath}
 source.encoding=UTF-8
 src.dir=${file.reference.core-src}