Procházet zdrojové kódy

Updated build stuff

Toni Helenius před 5 roky
rodič
revize
d7a7096e45

+ 1 - 0
.gitignore

@@ -29,3 +29,4 @@ jdks/*.bin
 jdks/*.exe
 jdks/*.zip
 dist/
+/.nb-gradle/

+ 2 - 2
ant-jme/lib/nblibraries.properties

@@ -1,6 +1,6 @@
 libs.ANT.classpath=\
     ${base}/ANT/ant.jar
 libs.CopyLibs.classpath=\
-    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
+    ${base}/../../netbeans/java/ant/extra/org-netbeans-modules-java-j2seproject-copylibstask.jar
 libs.CopyLibs.displayName=CopyLibs Task
-libs.CopyLibs.prop-version=2.0
+libs.CopyLibs.prop-version=3.0

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 515 - 160
ant-jme/nbproject/build-impl.xml


+ 2 - 2
ant-jme/nbproject/genfiles.properties

@@ -4,5 +4,5 @@ [email protected]
 # 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=dd1578ef
-nbproject/build-impl.xml.script.CRC32=f481ade2
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected].48
+nbproject/build-impl.xml.script.CRC32=4b0e1155
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected].48

+ 12 - 0
ant-jme/nbproject/project.properties

@@ -19,8 +19,12 @@ build.test.results.dir=${build.dir}/test/results
 #debug.transport=dt_socket
 debug.classpath=\
     ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
 debug.test.classpath=\
     ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
 # This directory is removed when the project is cleaned:
 dist.dir=dist
 dist.jar=${dist.dir}/ant-jme.jar
@@ -34,6 +38,8 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
+javac.modulepath=
+javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.6
@@ -41,6 +47,8 @@ javac.target=1.6
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=
@@ -64,8 +72,12 @@ run.classpath=\
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
 # or test-sys-prop.name=value to set system properties for unit tests):
 run.jvmargs=
+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=src

+ 2 - 2
jme3-assetpack-support/nbproject/genfiles.properties

@@ -3,6 +3,6 @@ build.xml.script.CRC32=c0969383
 [email protected]
 # 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=68a35179
+nbproject/build-impl.xml.data.CRC32=d9c1f5c5
 nbproject/build-impl.xml.script.CRC32=4d376df0
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 4 - 4
jme3-cinematics/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=ec8899d4
+build.xml.data.CRC32=fb551ea0
 build.xml.script.CRC32=d8082083
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # 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=ec8899d4
+nbproject/build-impl.xml.data.CRC32=fb551ea0
 nbproject/build-impl.xml.script.CRC32=a2681ce5
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 2 - 2
jme3-codepalette/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
 build.xml.data.CRC32=3b9099db
 build.xml.script.CRC32=27967d2c
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # 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=3b9099db
 nbproject/build-impl.xml.script.CRC32=c9af9eda
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 4 - 4
jme3-core-baselibs/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d43b0890
+build.xml.data.CRC32=dd2eed71
 build.xml.script.CRC32=cdae6a36
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # 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=d43b0890
+nbproject/build-impl.xml.data.CRC32=dd2eed71
 nbproject/build-impl.xml.script.CRC32=246f9b81
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 2 - 2
jme3-core-updatecenters/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
 build.xml.data.CRC32=78701114
 build.xml.script.CRC32=cfa8d5c5
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # 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=78701114
 nbproject/build-impl.xml.script.CRC32=270846fb
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 2 - 2
jme3-documentation/nbproject/genfiles.properties

@@ -3,6 +3,6 @@ build.xml.script.CRC32=20380530
 [email protected]
 # 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=ded89ea9
+nbproject/build-impl.xml.data.CRC32=83373b13
 nbproject/build-impl.xml.script.CRC32=0cdd5704
-nbproject/[email protected]4.1
+nbproject/[email protected]8

+ 2 - 2
jme3-lwjgl-applet/nbproject/genfiles.properties

@@ -3,6 +3,6 @@ build.xml.script.CRC32=1ed5abd5
 [email protected]
 # 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=64d361e4
+nbproject/build-impl.xml.data.CRC32=e0b40cca
 nbproject/build-impl.xml.script.CRC32=a70d83dd
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 4 - 4
jme3-obfuscate/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=d9c998cc
+build.xml.data.CRC32=b9ed2fec
 build.xml.script.CRC32=69663b9b
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # 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=d9c998cc
+nbproject/build-impl.xml.data.CRC32=b9ed2fec
 nbproject/build-impl.xml.script.CRC32=c9f3ae73
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 4 - 4
jme3-ogrexml/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=931109c2
+build.xml.data.CRC32=0a9771d7
 build.xml.script.CRC32=a910387a
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # 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=931109c2
+nbproject/build-impl.xml.data.CRC32=0a9771d7
 nbproject/build-impl.xml.script.CRC32=2abbef60
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 2 - 2
jme3-project-libraries/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
 build.xml.data.CRC32=951eb173
 build.xml.script.CRC32=b759faa7
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # 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=951eb173
 nbproject/build-impl.xml.script.CRC32=4a5c1fa6
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 2 - 2
jme3-project-testdata/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
 build.xml.data.CRC32=ea5e0ad8
 build.xml.script.CRC32=29c54332
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # 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=ea5e0ad8
 nbproject/build-impl.xml.script.CRC32=bbb19b51
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 4 - 4
jme3-texture-editor/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=13cbbc44
+build.xml.data.CRC32=8114b7a9
 build.xml.script.CRC32=8ff5ca92
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # 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=13cbbc44
+nbproject/build-impl.xml.data.CRC32=8114b7a9
 nbproject/build-impl.xml.script.CRC32=512d1004
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 4 - 4
jme3-vehicle-creator/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=9b4925d2
+build.xml.data.CRC32=90f39f6f
 build.xml.script.CRC32=39e31f0c
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # 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=9b4925d2
+nbproject/build-impl.xml.data.CRC32=90f39f6f
 nbproject/build-impl.xml.script.CRC32=90c55096
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 4 - 4
jme3-wavefront/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=375267a1
+build.xml.data.CRC32=1e6f1837
 build.xml.script.CRC32=fa305471
-build.xml.stylesheet.CRC32=[email protected]
+build.xml.stylesheet.CRC32=[email protected]
 # 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=375267a1
+nbproject/build-impl.xml.data.CRC32=1e6f1837
 nbproject/build-impl.xml.script.CRC32=8239585b
-nbproject/build-impl.xml.stylesheet.CRC32=[email protected]
+nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

+ 0 - 6
nbproject/platform.properties

@@ -53,15 +53,9 @@ disabled.modules=\
     org.netbeans.modules.deadlock.detector,\
     org.netbeans.modules.derby,\
     org.netbeans.modules.form,\
-    org.netbeans.modules.form.binding,\
-    org.netbeans.modules.form.j2ee,\
     org.netbeans.modules.form.kit,\
     org.netbeans.modules.form.nb,\
     org.netbeans.modules.form.refactoring,\
-    org.netbeans.modules.hibernate,\
-    org.netbeans.modules.hibernate4lib,\
-    org.netbeans.modules.html.angular,\
-    org.netbeans.modules.html.knockout,\
     org.netbeans.modules.hudson,\
     org.netbeans.modules.hudson.ant,\
     org.netbeans.modules.hudson.git,\

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů