-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #14 from lhumphrey/master
Updated build files and NetBeans project files to JDK 11
- Loading branch information
Showing
7 changed files
with
2,072 additions
and
1,704 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,73 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- You may freely edit this file. See commented blocks below for --> | ||
| <!-- some examples of how to customize the build. --> | ||
| <!-- (If you delete it and reopen the project it will be recreated.) --> | ||
| <!-- By default, only the Clean and Build commands use this build script. --> | ||
| <!-- Commands such as Run, Debug, and Test only use this build script if --> | ||
| <!-- the Compile on Save feature is turned off for the project. --> | ||
| <!-- You can turn off the Compile on Save (or Deploy on Save) setting --> | ||
| <!-- in the project's Project Properties dialog box.--> | ||
| <project name="OpenAMASE" default="default" basedir="."> | ||
| <description>Builds, tests, and runs the project OpenAMASE.</description> | ||
| <import file="nbproject/build-impl.xml"/> | ||
| <!-- | ||
| There exist several targets which are by default empty and which can be | ||
| used for execution of your tasks. These targets are usually executed | ||
| before and after some main targets. They are: | ||
| -pre-init: called before initialization of project properties | ||
| -post-init: called after initialization of project properties | ||
| -pre-compile: called before javac compilation | ||
| -post-compile: called after javac compilation | ||
| -pre-compile-single: called before javac compilation of single file | ||
| -post-compile-single: called after javac compilation of single file | ||
| -pre-compile-test: called before javac compilation of JUnit tests | ||
| -post-compile-test: called after javac compilation of JUnit tests | ||
| -pre-compile-test-single: called before javac compilation of single JUnit test | ||
| -post-compile-test-single: called after javac compilation of single JUunit test | ||
| -pre-jar: called before JAR building | ||
| -post-jar: called after JAR building | ||
| -post-clean: called after cleaning build products | ||
| (Targets beginning with '-' are not intended to be called on their own.) | ||
| Example of inserting an obfuscator after compilation could look like this: | ||
| <target name="-post-compile"> | ||
| <obfuscate> | ||
| <fileset dir="${build.classes.dir}"/> | ||
| </obfuscate> | ||
| </target> | ||
| For list of available properties check the imported | ||
| nbproject/build-impl.xml file. | ||
| Another way to customize the build is by overriding existing main targets. | ||
| The targets of interest are: | ||
| -init-macrodef-javac: defines macro for javac compilation | ||
| -init-macrodef-junit: defines macro for junit execution | ||
| -init-macrodef-debug: defines macro for class debugging | ||
| -init-macrodef-java: defines macro for class execution | ||
| -do-jar: JAR building | ||
| run: execution of project | ||
| -javadoc-build: Javadoc generation | ||
| test-report: JUnit report generation | ||
| An example of overriding the target for project execution could look like this: | ||
| <target name="run" depends="OpenAMASE-impl.jar"> | ||
| <exec dir="bin" executable="launcher.exe"> | ||
| <arg file="${dist.jar}"/> | ||
| </exec> | ||
| </target> | ||
| Notice that the overridden target depends on the jar target and not only on | ||
| the compile target as the regular run target does. Again, for a list of available | ||
| properties which you can use, check the target you are overriding in the | ||
| nbproject/build-impl.xml file. | ||
| --> | ||
| </project> | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- You may freely edit this file. See commented blocks below for --> | ||
| <!-- some examples of how to customize the build. --> | ||
| <!-- (If you delete it and reopen the project it will be recreated.) --> | ||
| <!-- By default, only the Clean and Build commands use this build script. --> | ||
| <!-- Commands such as Run, Debug, and Test only use this build script if --> | ||
| <!-- the Compile on Save feature is turned off for the project. --> | ||
| <!-- You can turn off the Compile on Save (or Deploy on Save) setting --> | ||
| <!-- in the project's Project Properties dialog box.--> | ||
| <project name="OpenAMASE" default="default" basedir="."> | ||
| <description>Builds, tests, and runs the project OpenAMASE.</description> | ||
| <import file="nbproject/build-impl.xml"/> | ||
| <!-- | ||
| There exist several targets which are by default empty and which can be | ||
| used for execution of your tasks. These targets are usually executed | ||
| before and after some main targets. They are: | ||
| -pre-init: called before initialization of project properties | ||
| -post-init: called after initialization of project properties | ||
| -pre-compile: called before javac compilation | ||
| -post-compile: called after javac compilation | ||
| -pre-compile-single: called before javac compilation of single file | ||
| -post-compile-single: called after javac compilation of single file | ||
| -pre-compile-test: called before javac compilation of JUnit tests | ||
| -post-compile-test: called after javac compilation of JUnit tests | ||
| -pre-compile-test-single: called before javac compilation of single JUnit test | ||
| -post-compile-test-single: called after javac compilation of single JUunit test | ||
| -pre-jar: called before JAR building | ||
| -post-jar: called after JAR building | ||
| -post-clean: called after cleaning build products | ||
| (Targets beginning with '-' are not intended to be called on their own.) | ||
| Example of inserting an obfuscator after compilation could look like this: | ||
| <target name="-post-compile"> | ||
| <obfuscate> | ||
| <fileset dir="${build.classes.dir}"/> | ||
| </obfuscate> | ||
| </target> | ||
| For list of available properties check the imported | ||
| nbproject/build-impl.xml file. | ||
| Another way to customize the build is by overriding existing main targets. | ||
| The targets of interest are: | ||
| -init-macrodef-javac: defines macro for javac compilation | ||
| -init-macrodef-junit: defines macro for junit execution | ||
| -init-macrodef-debug: defines macro for class debugging | ||
| -init-macrodef-java: defines macro for class execution | ||
| -do-jar: JAR building | ||
| run: execution of project | ||
| -javadoc-build: Javadoc generation | ||
| test-report: JUnit report generation | ||
| An example of overriding the target for project execution could look like this: | ||
| <target name="run" depends="OpenAMASE-impl.jar"> | ||
| <exec dir="bin" executable="launcher.exe"> | ||
| <arg file="${dist.jar}"/> | ||
| </exec> | ||
| </target> | ||
| Notice that the overridden target depends on the jar target and not only on | ||
| the compile target as the regular run target does. Again, for a list of available | ||
| properties which you can use, check the target you are overriding in the | ||
| nbproject/build-impl.xml file. | ||
| --> | ||
| </project> |
Binary file modified
BIN
+86.1 KB
(480%)
OpenAMASE/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,39 @@ | ||
| libs.CopyLibs.classpath=\ | ||
| ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar | ||
| libs.CopyLibs.displayName=CopyLibs Task | ||
| libs.CopyLibs.prop-version=2.0 | ||
| libs.Flexdock.classpath=\ | ||
| ${base}/Flexdock/flexdock-1.2.3.jar | ||
| libs.Flexdock.displayName=Flexdock | ||
| libs.Flexdock.src=\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/core/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/demo/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/dockbar/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/drag/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/perspective/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/plaf/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/test/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/view/ | ||
| libs.GRAL.classpath=\ | ||
| ${base}/GRAL/gral-core-0.10.jar | ||
| libs.GRAL.displayName=GRAL | ||
| libs.GRAL.src=\ | ||
| ${base}/GRAL/java/ | ||
| libs.JScience.classpath=\ | ||
| ${base}/JScience/jscience.jar | ||
| libs.JScience.displayName=JScience | ||
| libs.JScience.src=\ | ||
| ${base}/JScience/src/ | ||
| libs.SwingX.classpath=\ | ||
| ${base}/SwingX/swingx-all-1.6.4.jar | ||
| libs.SwingX.displayName=SwingX | ||
| libs.SwingX.javadoc=\ | ||
| ${base}/SwingX/swingx-all-1.6.4-javadoc.jar!// | ||
| libs.SwingX.src=\ | ||
| ${base}/SwingX/swingx-all-1.6.4-sources.jar!// | ||
| libs.Worldwind.classpath=\ | ||
| ${base}/Worldwind/worldwindx.jar;\ | ||
| ${base}/worldwind.jar | ||
| libs.Worldwind.displayName=Worldwind | ||
| libs.Worldwind.src=\ | ||
| ${base}/Worldwind/src.zip!/src/ | ||
| libs.CopyLibs.classpath=\ | ||
| ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar | ||
| libs.CopyLibs.displayName=CopyLibs Task | ||
| libs.CopyLibs.prop-version=3.0 | ||
| libs.Flexdock.classpath=\ | ||
| ${base}/Flexdock/flexdock-1.2.3.jar | ||
| libs.Flexdock.displayName=Flexdock | ||
| libs.Flexdock.src=\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/core/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/demo/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/dockbar/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/drag/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/perspective/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/plaf/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/test/;\ | ||
| ${base}/Flexdock/flexdock-1.2/src/java/view/ | ||
| libs.GRAL.classpath=\ | ||
| ${base}/GRAL/gral-core-0.10.jar | ||
| libs.GRAL.displayName=GRAL | ||
| libs.GRAL.src=\ | ||
| ${base}/GRAL/java/ | ||
| libs.JScience.classpath=\ | ||
| ${base}/JScience/jscience.jar | ||
| libs.JScience.displayName=JScience | ||
| libs.JScience.src=\ | ||
| ${base}/JScience/src/ | ||
| libs.SwingX.classpath=\ | ||
| ${base}/SwingX/swingx-all-1.6.4.jar | ||
| libs.SwingX.displayName=SwingX | ||
| libs.SwingX.javadoc=\ | ||
| ${base}/SwingX/swingx-all-1.6.4-javadoc.jar!// | ||
| libs.SwingX.src=\ | ||
| ${base}/SwingX/swingx-all-1.6.4-sources.jar!// | ||
| libs.Worldwind.classpath=\ | ||
| ${base}/Worldwind/worldwindx.jar;\ | ||
| ${base}/worldwind.jar | ||
| libs.Worldwind.displayName=Worldwind | ||
| libs.Worldwind.src=\ | ||
| ${base}/Worldwind/src.zip!/src/ |
Oops, something went wrong.