From 25e3fb308ad280fe2b291dcb01a0e02585f511dd Mon Sep 17 00:00:00 2001
From: Chomp <9366621-chomp9@users.noreply.gitlab.com>
Date: Fri, 3 Dec 2021 00:21:15 -0700
Subject: [PATCH] updates ant build.xml and convenience cmd scripts

* create ant tasks: compile-bot, compile-scripts, compile-all, run-bot, clean
* create compile_all.cmd
* create compile_scripts.cmd
* create run.bat
* create run_noconsole.bat
---
 Start NoConsole.bat   |  1 -
 Start WithConsole.bat |  1 -
 build.xml             | 97 +++++++++++++++++++++++++------------------
 compile.cmd           |  4 --
 compile_all.cmd       |  7 ++++
 compile_scripts.cmd   | 12 ++++++
 run.cmd               | 10 ++++-
 run_noconsole.cmd     |  3 ++
 8 files changed, 87 insertions(+), 48 deletions(-)
 delete mode 100644 Start NoConsole.bat
 delete mode 100644 Start WithConsole.bat
 delete mode 100644 compile.cmd
 create mode 100644 compile_all.cmd
 create mode 100644 compile_scripts.cmd
 create mode 100644 run_noconsole.cmd

diff --git a/Start NoConsole.bat b/Start NoConsole.bat
deleted file mode 100644
index bc5e942..0000000
--- a/Start NoConsole.bat	
+++ /dev/null
@@ -1 +0,0 @@
-javaw -cp ./Scripts;./lib/rs.jar;./lib/bis.jar;bot.jar; ClientInit NOCONSOLE
\ No newline at end of file
diff --git a/Start WithConsole.bat b/Start WithConsole.bat
deleted file mode 100644
index 65f530e..0000000
--- a/Start WithConsole.bat	
+++ /dev/null
@@ -1 +0,0 @@
-javaw -cp ./Scripts;./lib/rs.jar;./lib/bis.jar;bot.jar; ClientInit
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 1101169..36b3053 100644
--- a/build.xml
+++ b/build.xml
@@ -1,54 +1,71 @@
-<project name="APOS" default="compile-and-run" basedir=".">
-	<property name="src" location="src"/>
-	<property name="build" location="build"/>
-	<property name="scripts" location="Scripts"/>
-    <property name="lib" location="lib"/>
+<project name="APOS" default="run-bot" basedir=".">
+    <property name="build" location="build"/>
+    <property name="scripts" location="Scripts"/>
     <property name="jar" location="bot.jar"/>
     <property name="javac.source" value="1.8"/>
     <property name="javac.target" value="1.8"/>
 
-	<target name="compile">
-		<delete file="${jar}"/>
-		<delete dir="${build}"/>
+    <path id="compile.path">
+        <file file="${jar}"/>
+        <fileset dir="lib">
+            <include name="rsclassic.jar"/>
+        </fileset>
+    </path>
+
+    <target name="clean">
+        <delete file="${jar}"/>
+        <delete>
+            <fileset dir="${scripts}">
+                <include name="*.class"/>
+            </fileset>
+        </delete>
+    </target>
+
+    <target name="compile-bot">
+        <delete file="${jar}"/>
+        <delete dir="${build}"/>
         <mkdir dir="${build}"/>
-		<javac srcdir="${src}" destdir="${build}" debug="on" includeantruntime="false" target="${javac.target}" source="${javac.source}">
-            <classpath>
-                <pathelement location="${jar}"/>
-                <pathelement path="${java.class.path}/"/>
-				<pathelement location="${lib}/rsclassic.jar"/>
-			</classpath>
-			<compilerarg line="-Xlint:unchecked"/>
+        <javac srcdir="src" destdir="${build}" debug="on" includeantruntime="false" target="${javac.target}"
+               source="${javac.source}" classpathref="compile.path">
+            <compilerarg line="-Xlint:unchecked"/>
         </javac>
-		<jar basedir="${build}" destfile="${jar}" manifest="MANIFEST.MF">
+        <jar basedir="${build}" destfile="${jar}" manifest="MANIFEST.MF">
             <manifest>
                 <attribute name="Main-Class" value="ClientInit"/>
             </manifest>
         </jar>
-		<javac srcdir="${scripts}" destdir="${scripts}" debug="on" includeantruntime="false" target="${javac.target}" source="${javac.source}">
-			<compilerarg line="-Xlint:unchecked"/>
-			<classpath>
-                <pathelement location="${jar}"/>
-                <pathelement path="${java.class.path}/"/>
-				<pathelement location="${lib}/rsclassic.jar"/>
-				<pathelement location="${jar}"/>
-			</classpath>
-			<compilerarg line="-Xlint:deprecation"/>
-        </javac>
-	<delete dir="${build}"/>
-	</target>
-	
-	<target name="runclient">
-        <java classname="ClientInit" fork="true">
-            <jvmarg line="-Xms312m -Dsun.java2d.opengl=true"/>
-            <classpath>
-                <pathelement path="${jar}:${lib}/rsclassic.jar"/>
-            </classpath>
-        </java>
+        <delete dir="${build}"/>
     </target>
 
-    <target name="compile-and-run">
-        <antcall target="compile"/>
-        <antcall target="runclient"/>
+    <target name="compile-scripts">
+        <fail message="Error: must compile bot before compiling scripts!">
+            <condition>
+                <not>
+                    <available file="${jar}"/>
+                </not>
+            </condition>
+        </fail>
+        <javac srcdir="${scripts}" destdir="${scripts}" debug="on" includeantruntime="false" target="${javac.target}"
+               source="${javac.source}" classpathref="compile.path">
+            <compilerarg line="-Xlint:unchecked -Xlint:deprecation"/>
+        </javac>
+    </target>
+
+    <target name="compile-all">
+        <antcall target="compile-bot"/>
+        <antcall target="compile-scripts"/>
+    </target>
+
+    <target name="run-bot">
+        <fail message="Error: must compile bot first!">
+            <condition>
+                <not>
+                    <available file="${jar}"/>
+                </not>
+            </condition>
+        </fail>
+        <java classname="ClientInit" fork="true" classpathref="compile.path">
+            <jvmarg line="-Xms312m -Dsun.java2d.opengl=true"/>
+        </java>
     </target>
-	
 </project>
diff --git a/compile.cmd b/compile.cmd
deleted file mode 100644
index 2292d5c..0000000
--- a/compile.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-SET antpath="apache-ant-1.10.5\bin\"
-
-%antpath%ant -f build.xml compile
\ No newline at end of file
diff --git a/compile_all.cmd b/compile_all.cmd
new file mode 100644
index 0000000..ac980a3
--- /dev/null
+++ b/compile_all.cmd
@@ -0,0 +1,7 @@
+@echo off
+SET antpath="apache-ant-1.10.5\bin\"
+
+echo Compiling bot and scripts ...
+echo.
+call %antpath%ant -f build.xml compile-all
+pause
diff --git a/compile_scripts.cmd b/compile_scripts.cmd
new file mode 100644
index 0000000..46016cb
--- /dev/null
+++ b/compile_scripts.cmd
@@ -0,0 +1,12 @@
+@echo off
+
+SET antpath="apache-ant-1.10.5\bin\"
+
+IF NOT EXIST bot.jar (
+    call compile_all.cmd
+) ELSE (
+    echo Compiling scripts ...
+    echo.
+    call %antpath%ant -f build.xml compile-scripts
+    pause
+)
diff --git a/run.cmd b/run.cmd
index eb7927a..07c0f15 100644
--- a/run.cmd
+++ b/run.cmd
@@ -1,4 +1,10 @@
 @echo off
-SET antpath="apache-ant-1.10.5\bin\"
 
-%antpath%ant -f build.xml runclient
\ No newline at end of file
+IF NOT EXIST bot.jar (
+    echo Missing bot.jar ...
+    echo.
+    call compile_all.cmd
+)
+
+start javaw -jar bot.jar %1
+exit
diff --git a/run_noconsole.cmd b/run_noconsole.cmd
new file mode 100644
index 0000000..667f25f
--- /dev/null
+++ b/run_noconsole.cmd
@@ -0,0 +1,3 @@
+@echo off
+
+run.cmd _