hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix][Intellij] Intellij now correctly builds jars and tests with all the new libraries

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-03-07 21:26:23 -05:00 committed by Daniel Williams
parent 3f2017782c
commit 65a4698d37
7 changed files with 247 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/artifacts/openrocket_jar.xml generated
View File

@ -9,7 +9,6 @@
<element id="module-output" name="OpenRocket Core" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jcommon-1.0.18.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib-test/test-plugin.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/miglayout-4.0-swing.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/jogl-all.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/iText-5.0.2.jar" path-in-jar="/" />
@ -20,7 +19,6 @@
<element id="library" level="module" name="resources" module-name="OpenRocket Core" />
<element id="library" level="module" name="resources" module-name="OpenRocket Swing" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib-extra/RXTXcomm.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/OrangeExtensions-1.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar" path-in-jar="/" />
@ -39,6 +37,15 @@
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/slf4j-api-1.7.30.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/logback-classic-1.2.3.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/logback-core-1.2.3.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/istack-commons-runtime.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/istack-commons-tools.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/javax.activation-api-2.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/javax.json-1.1.3.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/javax.json-api-1.1.3.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/jaxb-api.2.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/jaxb-runtime.2.3.1.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/script-api-1.0.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/core/lib/yasson-1.0.2.jar" path-in-jar="/" />
</root>
</artifact>
</component>
</component>

2
.idea/misc.xml generated
View File

@ -46,7 +46,7 @@
</profile-state>
</entry>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="Oracle JDK 11" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="false" project-jdk-name="Oracle JDK 11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

4
.idea/runConfigurations/Openrocket_UI_Jar.xml generated
View File

@ -4,9 +4,7 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
<option name="ALTERNATIVE_JRE_PATH" value="Oracle JDK 11" />
<method v="2">
<option name="BuildArtifacts" enabled="true">
<artifact name="openrocket:jar" />
</option>
<option name="BuildArtifacts" enabled="true" />
</method>
</configuration>
</component>

159
core/OpenRocket Core.iml
View File

@ -25,6 +25,7 @@
</component>
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/bin" />
<output-test url="file://$MODULE_DIR$/../out/test/OpenRocket Core" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@ -34,7 +35,60 @@
</content>
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="OpenRocket Test Libraries" />
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-2.9.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.9.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/junit-4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/test-plugin.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
@ -71,21 +125,10 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="guice-4.2.1.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/guice-4.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="lib-test" level="project" />
<orderEntry type="library" name="javax" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/opencsv-4.3.2.jar!/" />
<root url="jar://$MODULE_DIR$/lib/guice-4.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@ -100,6 +143,78 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/istack-commons-runtime.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/istack-commons-tools.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/javax.inject.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/javax.activation-api-2.3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/javax.json-1.1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/javax.json-api-1.1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jaxb-api.2.3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/jaxb-runtime.2.3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
@ -118,6 +233,15 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/opencsv-4.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
@ -127,5 +251,14 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/script-api-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

2
core/test/net/sf/openrocket/communication/UpdateInfoTest.java
View File

@ -196,7 +196,7 @@ public class UpdateInfoTest extends BaseTestCase {
Random rnd = new Random();
for (int i = 0; i < 10; i++) {
int size = (int) ((1 + 0.3 * rnd.nextGaussian()) * Math.pow(i, 6));
int size = Math.abs((int) ((1 + 0.3 * rnd.nextGaussian()) * Math.pow(i, 6)));
byte[] buf = new byte[size];
rnd.nextBytes(buf);

21
lib-test/OpenRocket Test Libraries.iml
View File

@ -16,7 +16,7 @@
<content url="file://$MODULE_DIR$" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
<orderEntry type="module-library">
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/hamcrest-core-1.3.jar!/" />
@ -25,7 +25,7 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/hamcrest-library-1.3.jar!/" />
@ -34,7 +34,7 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/jmock-2.9.0.jar!/" />
@ -43,7 +43,7 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/jmock-junit4-2.9.0.jar!/" />
@ -52,7 +52,7 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/junit-4.12.jar!/" />
@ -61,7 +61,7 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/test-plugin.jar!/" />
@ -70,14 +70,5 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/script-api-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>

93
swing/OpenRocket Swing.iml
View File

@ -35,6 +35,60 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="inheritedJdk" />
<orderEntry type="module" module-name="OpenRocket Core" />
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/hamcrest-library-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-2.9.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/jmock-junit4-2.9.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/junit-4.12.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib-test/test-plugin.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="iText-5.0.2.jar">
<CLASSES>
@ -62,15 +116,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="OrangeExtensions-1.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/OrangeExtensions-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="aopalliance.jar">
<CLASSES>
@ -127,8 +172,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="jogl" level="project" />
<orderEntry type="library" name="lib-test" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
@ -174,5 +217,33 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="jogl">
<CLASSES>
<root url="file://$MODULE_DIR$/lib/jogl" />
</CLASSES>
<JAVADOC />
<SOURCES />
<jarDirectory url="file://$MODULE_DIR$/lib/jogl" recursive="false" />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/jaxb-api.2.3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../core/lib/jaxb-runtime.2.3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>