clean up file tree

MittyRobotics · Jul 6, 2021 · 81b100d · 81b100d
1 parent 7bfbece
commit 81b100d
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 87 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,14 @@
 ## Java
 
 lwjgl3/build/
-packaging/out-windows-launch4j/jre/
+packaging/exe/jre/
 *.class
 *.war
 *.ear
 hs_err_pid*
 
-deb/
-packaging/
+packaging/exe/jre/
+packaging/exe/tko-electronics-sim.exe
 
 ## Robovm
 /ios/robovm-build/

diff --git a/new_package_config.xml b/new_package_config.xml
diff --git a/package_config.xml b/package_config.xml
diff --git a/deb/changelog → packaging/deb/changelog b/deb/changelog → packaging/deb/changelog
@@ -1,3 +1,3 @@
 tko-electronics-sim (2.1.1) trusty; urgency=low
   * Rebuild
- -- Rohan Bansal <[email protected]>  Fri, 02 Jul 2021 12:16:34 -0700
+ -- Rohan Bansal <[email protected]>  Tue, 06 Jul 2021 10:52:06 -0700
diff --git a/deb/control → packaging/deb/control b/deb/control → packaging/deb/control
diff --git a/deb/copyright → packaging/deb/copyright b/deb/copyright → packaging/deb/copyright
diff --git a/deb/packagedeb.sh → packaging/deb/packagedeb.sh b/deb/packagedeb.sh → packaging/deb/packagedeb.sh
diff --git a/deb/tko-electronics-sim → packaging/deb/tko-electronics-sim b/deb/tko-electronics-sim → packaging/deb/tko-electronics-sim
diff --git a/deb/tko-electronics-sim-icon.png → packaging/deb/tko-electronics-sim-icon.png b/deb/tko-electronics-sim-icon.png → packaging/deb/tko-electronics-sim-icon.png
diff --git a/deb/tko-electronics-sim.desktop → packaging/deb/tko-electronics-sim.desktop b/deb/tko-electronics-sim.desktop → packaging/deb/tko-electronics-sim.desktop
diff --git a/lwjgl3/jpackage/.gitkeep → packaging/exe/.gitkeep b/lwjgl3/jpackage/.gitkeep → packaging/exe/.gitkeep
diff --git a/new_package_config2.xml → packaging/exe/windows_package_config.xml b/new_package_config2.xml → packaging/exe/windows_package_config.xml
@@ -2,7 +2,7 @@
 <launch4jConfig>
   <dontWrapJar>false</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/packaging/out-windows-launch4j/tko-electronics-sim.jar</jar>
+  <jar>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/lwjgl3/build/libs/tko-electronics-sim-0.0.1.jar</jar>
   <outfile>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/packaging/out-windows-launch4j/tko-electronics-sim.exe</outfile>
   <errTitle>TKO Circuit Simulator Requires Java!</errTitle>
   <cmdLine></cmdLine>
@@ -15,7 +15,7 @@
   <manifest></manifest>
   <icon>/home/kronos/development/FRC_amhsrobotics/tko-electronics-sim/lwjgl3/src/main/resources/logo.ico</icon>
   <classPath>
-    <mainClass>com.amhsrobotics.circuitsim.lwjgl3.DesktopLauncher</mainClass>
+    <mainClass>com.amhsrobotics.circuitsim.lwjgl3.Lwjgl3Launcher</mainClass>
   </classPath>
   <jre>
     <path>jre</path>

diff --git a/packr-config.json b/packr-config.json