From d9f287d7c72392d3d6733e54ba033c97ca621f2b Mon Sep 17 00:00:00 2001 From: Patrick Woodworth Date: Fri, 7 Dec 2012 19:44:04 -0800 Subject: Adding pom.xml and .gitignore. --- .gitignore | 3 + Jake2.sh | 0 pom.xml | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 206 insertions(+) create mode 100644 .gitignore mode change 100644 => 100755 Jake2.sh create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b4a5277 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.idea/ +target/ +*.iml diff --git a/Jake2.sh b/Jake2.sh old mode 100644 new mode 100755 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..f688278 --- /dev/null +++ b/pom.xml @@ -0,0 +1,203 @@ + + + + 4.0.0 + + org.emergent.jake2 + jake2 + 1.0-SNAPSHOT + + + UTF-8 + UTF-8 + true + 1.6 + ${jake.javac.source} + 2.0-rc11 + foo + bar + natives-${jogamp.natives.os}-${jogamp.natives.arch} + + + + + org.jogamp.jogl + jogl-all + ${jogamp.version} + + + org.jogamp.jogl + jogl-all + ${jogamp.version} + ${jogamp.natives.classifier} + + + org.jogamp.gluegen + gluegen-rt + ${jogamp.version} + + + org.jogamp.gluegen + gluegen-rt + ${jogamp.version} + ${jogamp.natives.classifier} + + + org.jogamp.joal + joal + ${jogamp.version} + + + org.jogamp.joal + joal + ${jogamp.version} + ${jogamp.natives.classifier} + + + org.testng + testng + 6.3.1 + test + + + + + src + + + src + + **/*.java + + + + resources + + + test + + + test + + **/*.java + + + + + + maven-compiler-plugin + 3.0 + + ${jake.javac.source} + ${jake.javac.target} + true + 512 + -Xlint:all + ${jake.test.skip} + + + + maven-jar-plugin + 2.4 + + + + jake2.Jake2 + true + + + + + + maven-dependency-plugin + 2.6 + + + copy-dependencies + package + + copy-dependencies + + + runtime + ${project.build.directory} + false + false + true + + + + + + maven-surefire-plugin + 2.12.4 + + true + + + + ${project.artifactId} + + + + + linux + + + linux + + + + linux + + + + windows + + + windows + + + + windows + + + + i586 + + + i586 + + + + i586 + + + + amd64 + + + amd64 + + + + amd64 + + + + macosx + + + mac + + + + macosx + universal + + + + + -- cgit v1.2.3 From 6f417ba987a35dc62e8dc593ea548d961d558ee5 Mon Sep 17 00:00:00 2001 From: Patrick Woodworth Date: Fri, 7 Dec 2012 19:46:48 -0800 Subject: Updating .gitignore. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index b4a5277..7752674 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ .idea/ +build/ +dist/ target/ +Jake2-cvs-install.jar *.iml -- cgit v1.2.3 From 7f53d76259360b07e2edff5eec6da48d95bd6858 Mon Sep 17 00:00:00 2001 From: Patrick Woodworth Date: Fri, 7 Dec 2012 19:55:42 -0800 Subject: pom clean target. --- pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml index f688278..4010f5a 100644 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,23 @@ + + maven-clean-plugin + 2.5 + + + + ${project.basedir} + false + + build/** + dist/** + Jake2-cvs-install.jar + + + + + maven-dependency-plugin 2.6 -- cgit v1.2.3 From 74c9f6971d808ba5eb27540930f62666a7f8ea78 Mon Sep 17 00:00:00 2001 From: Patrick Woodworth Date: Fri, 7 Dec 2012 21:04:54 -0800 Subject: mvn antcompat profile. --- Jake2.sh | 6 +++++- pom.xml | 22 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Jake2.sh b/Jake2.sh index aab71ff..4fa1dcb 100755 --- a/Jake2.sh +++ b/Jake2.sh @@ -3,7 +3,11 @@ cd `dirname $0` # for jogl and joal -CP=lib/jogamp/gluegen-rt.jar:lib/jogamp/joal.jar:lib/jogamp/jogl-all.jar:dist/lib/jake2.jar +if [ -f "target/jake2.jar" ] ; then + CP=target/jake2.jar +else + CP=lib/jogamp/gluegen-rt.jar:lib/jogamp/joal.jar:lib/jogamp/jogl-all.jar:dist/lib/jake2.jar +fi #breaks VM's like avian X_ARGS="-Xmx100M" diff --git a/pom.xml b/pom.xml index 4010f5a..741eb76 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,9 @@ UTF-8 UTF-8 + ${project.build.directory}/classes + ${project.build.directory} + true 1.6 ${jake.javac.source} @@ -64,6 +67,7 @@ + ${jake.build.outputDirectory} src @@ -102,10 +106,12 @@ maven-jar-plugin 2.4 + ${jake.dist.lib.directory} jake2.Jake2 true + ${jake.dist.dep.prefix} @@ -139,7 +145,7 @@ runtime - ${project.build.directory} + ${jake.dist.lib.directory}/${jake.dist.dep.prefix} false false true @@ -159,6 +165,20 @@ + + antcompat + + + jake.antcompat + true + + + + build + dist/lib + jogamp/ + + linux -- cgit v1.2.3 From 9bf77befdd3a8871cc8ed2c4de561095f2d4958c Mon Sep 17 00:00:00 2001 From: Patrick Woodworth Date: Fri, 7 Dec 2012 21:12:49 -0800 Subject: More ignores and cleans. --- .gitignore | 4 ++++ pom.xml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 7752674..c8513df 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,8 @@ build/ dist/ target/ Jake2-cvs-install.jar +jake2-cvs.tar.gz +jake2-cvs.zip +jake2src-cvs.tar.gz +jake2src-cvs.zip *.iml diff --git a/pom.xml b/pom.xml index 741eb76..a2aabda 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,8 @@ build/** dist/** Jake2-cvs-install.jar + jake2-cvs.* + jake2src-cvs.* -- cgit v1.2.3 From 9f42486dcf2896fc0b649f9fd915e26e3a8a5589 Mon Sep 17 00:00:00 2001 From: Patrick Woodworth Date: Fri, 7 Dec 2012 22:52:49 -0800 Subject: Fixing test source compilation with new Q2TestDataUtil. --- pom.xml | 2 +- test/jake2/qcommon/Q2TestDataUtil.java | 51 ++++++++++++++++++++++++++++++++++ test/jake2/render/DancingQueens.java | 4 +-- test/jake2/render/TestMap.java | 4 +-- test/jake2/render/TestRenderer.java | 4 +-- 5 files changed, 55 insertions(+), 10 deletions(-) create mode 100644 test/jake2/qcommon/Q2TestDataUtil.java diff --git a/pom.xml b/pom.xml index a2aabda..dd391f2 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ ${project.build.directory}/classes ${project.build.directory} - true + false 1.6 ${jake.javac.source} 2.0-rc11 diff --git a/test/jake2/qcommon/Q2TestDataUtil.java b/test/jake2/qcommon/Q2TestDataUtil.java new file mode 100644 index 0000000..e273215 --- /dev/null +++ b/test/jake2/qcommon/Q2TestDataUtil.java @@ -0,0 +1,51 @@ +package jake2.qcommon; + +import jake2.Jake2; + +import java.util.Locale; + +/** @author Patrick Woodworth */ +public class Q2TestDataUtil { + + private static final boolean USE_DATA_DIALOG = Boolean.getBoolean("jake.data.dialog"); + + public static final void initQ2DataTool() { + if (USE_DATA_DIALOG) { + Q2DataDialogWrapper tmpq2DataTool = new Q2DataDialogWrapper(); + Locale.setDefault(Locale.US); + tmpq2DataTool.setVisible(true); + Jake2.q2DataTool = tmpq2DataTool; + } else { + Jake2.q2DataTool = new Q2DataTool(); + Locale.setDefault(Locale.US); + } + } + + public static class Q2DataDialogWrapper extends Q2DataTool { + + private final Q2DataDialog m_data = new Q2DataDialog(); + + public Q2DataDialogWrapper() { + super(); + } + + @Override + public void testQ2Data() { + m_data.testQ2Data(); + } + + @Override + void dispose() { + m_data.dispose(); + } + + @Override + void setStatus(String text) { + m_data.setStatus(text); + } + + public void setVisible(boolean b) { + m_data.setVisible(b); + } + } +} diff --git a/test/jake2/render/DancingQueens.java b/test/jake2/render/DancingQueens.java index 4097d21..1b98ea0 100644 --- a/test/jake2/render/DancingQueens.java +++ b/test/jake2/render/DancingQueens.java @@ -67,9 +67,7 @@ public class DancingQueens { void init() { Globals.dedicated = Cvar.Get("dedicated", "0", Qcommon.CVAR_NOSET); - Jake2.Q2Dialog = new Q2DataDialog(); - Locale.setDefault(Locale.US); - Jake2.Q2Dialog.setVisible(true); + Q2TestDataUtil.initQ2DataTool(); String DRIVER = "lwjgl"; diff --git a/test/jake2/render/TestMap.java b/test/jake2/render/TestMap.java index 3dd89fd..10112d1 100644 --- a/test/jake2/render/TestMap.java +++ b/test/jake2/render/TestMap.java @@ -75,9 +75,7 @@ public class TestMap // open the q2dialog, if we are not in dedicated mode. if (Globals.dedicated.value != 1.0f) { - Jake2.Q2Dialog = new Q2DataDialog(); - Locale.setDefault(Locale.US); - Jake2.Q2Dialog.setVisible(true); + Q2TestDataUtil.initQ2DataTool(); } Qcommon.Init(new String[] { "TestMap" }); diff --git a/test/jake2/render/TestRenderer.java b/test/jake2/render/TestRenderer.java index 3c0bb7f..f12edd6 100644 --- a/test/jake2/render/TestRenderer.java +++ b/test/jake2/render/TestRenderer.java @@ -72,9 +72,7 @@ public class TestRenderer { void init() { Globals.dedicated = Cvar.Get("dedicated", "0", Qcommon.CVAR_NOSET); - Jake2.Q2Dialog = new Q2DataDialog(); - Locale.setDefault(Locale.US); - Jake2.Q2Dialog.setVisible(true); + Q2TestDataUtil.initQ2DataTool(); String DRIVER = "joglgl2"; -- cgit v1.2.3