Launcher restructure (preparation for package manager)

deathbeam · Jul 26, 2015 · 5fa21c9 · 5fa21c9
1 parent 7719658
commit 5fa21c9
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/bin/launcher/FileUtils.java → bin/src/non/FileUtils.java b/bin/launcher/FileUtils.java → bin/src/non/FileUtils.java
diff --git a/bin/launcher/Gradle.java → bin/src/non/Gradle.java b/bin/launcher/Gradle.java → bin/src/non/Gradle.java
diff --git a/bin/launcher/Main.java → bin/src/non/Main.java b/bin/launcher/Main.java → bin/src/non/Main.java
diff --git a/bin/launcher/Runner.java → bin/src/non/Runner.java b/bin/launcher/Runner.java → bin/src/non/Runner.java
diff --git a/bin/launcher/ZipUtils.java → bin/src/non/ZipUtils.java b/bin/launcher/ZipUtils.java → bin/src/non/ZipUtils.java
diff --git a/build b/build
@@ -3,7 +3,7 @@ cd src
 moonc -t build/lua .
 cd ../
 java -cp core/libs/bcel.jar:core/libs/luaj.jar luajc -r -d src/build/classes src/build/lua
-javac bin/launcher/*.java
-jar cvfe bin/non.jar Main -C bin/launcher/ .
+javac bin/src/non/*.java
+jar cvfe bin/non.jar Main -C bin/src/non/ .
 jar fu bin/non.jar core res src VERSION
-chmod 777 bin/non.jar
+chmod 777 bin/non.jar
diff --git a/build.bat b/build.bat
@@ -4,7 +4,7 @@ cd src
 call moonc -t build\lua .
 cd ../
 call java -cp core\libs\bcel.jar;core\libs\luaj.jar luajc -r -d src\build\classes src\build\lua
-call javac bin\launcher\*.java
-call jar cvfe bin\non.jar Main -C bin\launcher\ .
+call javac bin\src\non\*.java
+call jar cvfe bin\non.jar Main -C bin\src\non\ .
 call jar fu bin\non.jar core res src VERSION
-endlocal
+endlocal