Changeset 650 in tmcsimulator for trunk/IDE_metadata/NetBeans/TMCSim/nbproject

Timestamp:

09/07/2022 12:22:34 PM (4 years ago)

Author:

jdalbey

Message:

Multiple updates - catchup webapps files I've been hoarding (sorry).

Location:

trunk/IDE_metadata/NetBeans/TMCSim/nbproject

Files:

• build-impl.xml (modified) (9 diffs)
• genfiles.properties (modified) (1 diff)
• project.properties (modified) (2 diffs)
• project.xml (modified) (1 diff)

trunk/IDE_metadata/NetBeans/TMCSim/nbproject/build-impl.xml

@@ -128 +128 @@
         <condition property="have.sources">
             <or>
+                <available file="${src.webapps.dir}"/>
                 <available file="${src.dir}"/>
             </or>
@@ -231 +232 @@
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.webapps.dir">Must set src.webapps.dir</fail>
         <fail unless="src.dir">Must set src.dir</fail>
         <fail unless="test.src.dir">Must set test.src.dir</fail>
@@ -253 +255 @@
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${src.webapps.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
@@ -294 +296 @@
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${src.webapps.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
@@ -327 +329 @@
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${src.webapps.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
@@ -925 +927 @@
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.webapps.dir}:${src.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.classes.dir}">
+            <fileset dir="${src.webapps.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
@@ -951 +954 @@
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.webapps.dir}:${src.dir}"/>
     </target>
     <target name="-post-compile-single">
@@ -1217 +1220 @@
                 <path path="${javac.classpath}"/>
             </classpath>
+            <fileset dir="${src.webapps.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
@@ -1227 +1233 @@
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.webapps.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>

trunk/IDE_metadata/NetBeans/TMCSim/nbproject/genfiles.properties

@@ -4 +4 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # 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=6c7221c6
-nbproject/build-impl.xml.script.CRC32=249c9218
+nbproject/build-impl.xml.data.CRC32=2baad00b
+nbproject/build-impl.xml.script.CRC32=0dba3c5c
 nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48

trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties

@@ -3 +3 @@
 file.reference.json-simple-1.1.jar=../../../lib/json-simple-1.1.jar
 file.reference.SimTimeSelector_r28.jar=../../../lib/SimTimeSelector_r28.jar
+file.reference.trunk-webapps=../../../webapps
 file.reference.xercesImpl.jar=../../../lib/xercesImpl.jar
 javac.deprecation=false
@@ -27 +28 @@
 source.encoding=UTF-8
 javadoc.author=true
+src.webapps.dir=${file.reference.trunk-webapps}
 test.src.dir=${file.reference.tmc-simulator-test}
 build.dir=build

trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.xml

@@ -6 +6 @@
             <name>TMCSim</name>
             <source-roots>
+                <root id="src.webapps.dir" name="webapps"/>
                 <root id="src.dir"/>
             </source-roots>