From 48064ad07fc0730f350ff8b53d98bf0c6257b42d Mon Sep 17 00:00:00 2001
From: Kyprus <zachl44@gmail.com>
Date: Fri, 15 Jun 2012 08:15:11 -0400
Subject: [PATCH] Removed unused scrips and added an Ant build script.

---
 build.bat         |  32 -------------
 build.xml         | 117 ++++++++++++++++++++++++++++++++++++++++++++++
 build_and_run.bat |   5 --
 package.sh        | 109 ------------------------------------------
 release.bat       |  26 -----------
 setup.sh          |   7 ---
 update_patch.sh   |   5 --
 7 files changed, 117 insertions(+), 184 deletions(-)
 delete mode 100644 build.bat
 create mode 100644 build.xml
 delete mode 100644 build_and_run.bat
 delete mode 100644 package.sh
 delete mode 100644 release.bat
 delete mode 100644 setup.sh
 delete mode 100644 update_patch.sh

diff --git a/build.bat b/build.bat
deleted file mode 100644
index d4ec8c23..00000000
--- a/build.bat
+++ /dev/null
@@ -1,32 +0,0 @@
-set BCDIR=%CD%
-
-rmdir /S /Q ..\src
-mkdir ..\src
-xcopy  /Y /E ..\src_work\* ..\src\
-
-xcopy /Y /E buildcraft_client\net\* ..\src\minecraft\net\
-xcopy /Y /E buildcraft_server\net\* ..\src\minecraft_server\net\
-
-xcopy /Y /E common\net\* ..\src\minecraft\net\
-xcopy /Y /E common\net\* ..\src\minecraft_server\net\
-
-xcopy /Y /E ..\forge\forge_client\src\net\* ..\src\minecraft\net\
-
-xcopy /Y /E ..\forge\forge_common\net\* ..\src\minecraft\net\
-xcopy /Y /E ..\forge\forge_common\net\* ..\src\minecraft_server\net\
-
-cd ..
-cmd /C recompile.bat
-cd %BCDIR%
-
-mkdir ..\bin\minecraft\net\minecraft\src\buildcraft\core\gui
-mkdir ..\bin\minecraft\net\minecraft\src\buildcraft\factory\gui
-mkdir ..\bin\minecraft\net\minecraft\src\buildcraft\transport\gui
-mkdir ..\bin\minecraft\net\minecraft\src\buildcraft\builders\gui
-mkdir ..\bin\minecraft\net\minecraft\src\buildcraft\energy\gui
-
-xcopy /Y /E common\net\minecraft\src\buildcraft\core\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\core\gui\
-xcopy /Y /E common\net\minecraft\src\buildcraft\factory\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\factory\gui\
-xcopy /Y /E common\net\minecraft\src\buildcraft\transport\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\transport\gui\
-xcopy /Y /E common\net\minecraft\src\buildcraft\builders\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\builders\gui\
-xcopy /Y /E common\net\minecraft\src\buildcraft\energy\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\energy\gui\
diff --git a/build.xml b/build.xml
new file mode 100644
index 00000000..5c97ce77
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,117 @@
+<project name="Buildcraft" basedir="../" default="main">
+    
+    <!-- Properties -->
+    
+    <property name="build.dir"     value="build"/>
+    <property name="classes.dir"   value="${build.dir}/classes"/>
+    <property name="jar.dir"       value="${build.dir}/jar"/>
+    
+    <property name="src.dir"       value="src"/>
+    
+    <property name="mcp.dir"       value="${build.dir}/mcp"/>
+    <property name="forge.dir"     value="${mcp.dir}/forge"/>
+    
+    <property name="clientsrc.dir" value="${mcp.dir}/src/minecraft"/>
+    <property name="serversrc.dir" value="${mcp.dir}/src/minecraft_server"/>
+    
+    <property name="version"       value="3.2"/>
+    
+    <!-- Targets -->
+    
+    <target name="clean">
+        <delete dir="${build.dir}"/>
+    </target>
+    
+    <target name="setup">
+        
+        <unzip src="mcp.zip" dest="${mcp.dir}"/>
+        <unzip src="minecraftforge.zip" dest="${mcp.dir}"/>
+        
+        <chmod file="${mcp.dir}/updatemd5.sh" perm="+x"/>
+        <chmod file="${mcp.dir}/recompile.sh" perm="+x"/>
+        <chmod file="${mcp.dir}/reobfuscate.sh" perm="+x"/>
+        <chmod file="${forge.dir}/install.sh" perm="+x"/>
+        
+        <!-- Install forge -->
+        <exec dir="${forge.dir}" executable="cmd" osfamily="windows">
+            <arg line="/c install.cmd"/>
+        </exec>
+        
+        <exec dir="${forge.dir}" executable="sh" osfamily="unix">
+            <arg value="install.sh" />
+        </exec>
+        
+        <!-- Copy BC source -->
+        <copy todir="${clientsrc.dir}">
+            <fileset dir="${src.dir}/buildcraft_client">
+                <exclude name="**/mod_BuildCraftDevel.*"/>
+            </fileset>
+        </copy>
+        <copy todir="${clientsrc.dir}">
+            <fileset dir="${src.dir}/common">
+                <exclude name="**/buildcraft/devel/*"/>
+            </fileset>
+        </copy>
+        <copy todir="${serversrc.dir}">
+            <fileset dir="${src.dir}/buildcraft_server">
+                <exclude name="**/mod_BuildCraftDevel.*"/>
+            </fileset>
+        </copy>
+        <copy todir="${serversrc.dir}">
+            <fileset dir="${src.dir}/common">
+                <exclude name="**/buildcraft/devel/*"/>
+            </fileset>
+        </copy>
+        
+    </target>
+    
+    <target name="compile" depends="setup">
+        
+        <!-- Recompile -->
+        <exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
+            <arg line="/c recompile.bat"/>
+        </exec>
+        
+        <exec dir="${mcp.dir}" executable="sh" osfamily="unix">
+            <arg value="recompile.sh" />
+        </exec>
+        
+        <!-- Reobf -->
+        <exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
+            <arg line="/c reobfuscate.bat"/>
+        </exec>
+        
+        <exec dir="${mcp.dir}" executable="sh" osfamily="unix">
+            <arg value="reobfuscate.sh" />
+        </exec>
+        
+        <!-- Copy BC classes -->
+        <copy todir="${classes.dir}/client">
+            <fileset dir="${mcp.dir}/reobf/minecraft"/>
+        </copy>
+        <copy todir="${classes.dir}/server">
+            <fileset dir="${mcp.dir}/reobf/minecraft_server"/>
+        </copy>
+        
+        <!-- Copy resoucres -->
+        <copy todir="${classes.dir}/client">
+            <fileset dir="${src.dir}/buildcraft_resources"/>
+        </copy>
+        <copy todir="${classes.dir}/server">
+            <fileset dir="${src.dir}/buildcraft_resources">
+                <exclude name="gfx/*"/>
+            </fileset>
+        </copy>
+        
+    </target>
+    
+    <target name="package" depends="compile">
+        
+        <jar destfile="${jar.dir}/buildcraft-client-${version}.jar" basedir="${classes.dir}/client"/>
+        <jar destfile="${jar.dir}/buildcraft-server-${version}.jar" basedir="${classes.dir}/server"/>
+        
+    </target>
+    
+    <target name="main" depends="clean,package"/>
+
+</project>
\ No newline at end of file
diff --git a/build_and_run.bat b/build_and_run.bat
deleted file mode 100644
index b5f46308..00000000
--- a/build_and_run.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-cmd /C build.bat
-
-cd ..
-
-cmd /C startclient.bat
diff --git a/package.sh b/package.sh
deleted file mode 100644
index 0d49995c..00000000
--- a/package.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-version=$1
-dir=`pwd`/../release-$version
-src_dir=`pwd`
-
-function remove_svn () {
-  (
-  cd $1
-
-  if [ -d .svn ]; then
-     rm -rf .svn
-  fi
-
-  for j in `ls`
-  do
-     if [ -d $j ]; then
-        remove_svn $j
-     fi
-  done
-  )
-}
-
-function package_all () {
-   qual=$1
-
-   zip -r $dir/buildcraft$qual-A-core-$version.zip \
-      mod_BuildCraftCore*.class \
-      BuildCraftCore*.class \
-      RenderPassiveItem.class \
-      BuildCraftBlockUtil.class \
-      buildcraft/core \
-      net/minecraft/src/buildcraft/core \
-      buildcraft/api
-
-   zip -r $dir/buildcraft$qual-B-transport-$version.zip \
-      mod_BuildCraftTransport*.class \
-      BuildCraftTransport*.class \
-      buildcraft/transport \
-      net/minecraft/src/buildcraft/transport \
-      buildcraft/api
-
-   zip -r $dir/buildcraft$qual-B-factory-$version.zip \
-      mod_BuildCraftFactory*.class \
-      BuildCraftFactory*.class \
-      buildcraft/factory \
-      net/minecraft/src/buildcraft/factory \
-      buildcraft/api
-
-   zip -r $dir/buildcraft$qual-B-builders-$version.zip \
-      mod_BuildCraftBuilders*.class \
-      BuildCraftBuilders*.class \
-      buildcraft/builders \
-      net/minecraft/src/buildcraft/builders \
-      buildcraft/api
-
-   zip -r $dir/buildcraft$qual-B-energy-$version.zip \
-      mod_BuildCraftEnergy*.class \
-      BuildCraftEnergy*.class \
-      buildcraft/energy \
-      net/minecraft/src/buildcraft/energy \
-      buildcraft/api
-
-   zip -r $dir/buildcraft$qual-C-silicon-$version.zip \
-      mod_BuildCraftSilicon*.class \
-      BuildCraftSilicon*.class \
-      buildcraft/silicon \
-      net/minecraft/src/buildcraft/silicon \
-      buildcraft/api
-
-   zip -r $dir/buildcraft$qual-C-devel-$version.zip \
-      mod_BuildCraftDevel*.class \
-      buildcraft/devel \
-      buildcraft/api
-}
-
-cd ../reobf
-
-remove_svn .
-
-rm -rf $dir
-mkdir $dir
-
-cd minecraft
-package_all "-client"
-
-cd ../minecraft_server
-package_all "-server"
-
-cd ../..
-
-rm -rf reobf
-
-cd $src_dir
-
-rm -rf api
-mkdir -p api/src/minecraft/net/minecraft/src/buildcraft/api/
-mkdir -p api/src/minecraft_server/net/minecraft/src/buildcraft/api/
-
-cp common/net/minecraft/src/buildcraft/api/* api/src/minecraft/net/minecraft/src/buildcraft/api/
-cp common/net/minecraft/src/buildcraft/api/* api/src/minecraft_server/net/minecraft/src/buildcraft/api/
-
-cp buildcraft_client/src/net/minecraft/src/buildcraft/api/* api/src/minecraft/net/minecraft/src/buildcraft/api
-cp buildcraft_server/src/net/minecraft/src/buildcraft/api/* api/src/minecraft_server/net/minecraft/src/buildcraft/api
-
-cd api
-
-zip -r $dir/buildcraft-api-$version-src.zip .
-
-cd ../
-rm -rf api
diff --git a/release.bat b/release.bat
deleted file mode 100644
index 372dc025..00000000
--- a/release.bat
+++ /dev/null
@@ -1,26 +0,0 @@
-set BCDIR=%CD%
-
-cmd /C build.bat
-
-cd ..
-cmd /C reobfuscate.bat
-cd %BCDIR%
-
-mkdir ..\reobf\minecraft\net\minecraft\src\buildcraft\core\gui
-mkdir ..\reobf\minecraft\net\minecraft\src\buildcraft\factory\gui
-mkdir ..\reobf\minecraft\net\minecraft\src\buildcraft\transport\gui
-mkdir ..\reobf\minecraft\net\minecraft\src\buildcraft\builders\gui
-mkdir ..\reobf\minecraft\net\minecraft\src\buildcraft\energy\gui
-
-xcopy /Y /E common\net\minecraft\src\buildcraft\core\gui\*.png ..\reobf\minecraft\net\minecraft\src\buildcraft\core\gui
-xcopy /Y /E common\net\minecraft\src\buildcraft\factory\gui\*.png ..\reobf\minecraft\net\minecraft\src\buildcraft\factory\gui
-xcopy /Y /E common\net\minecraft\src\buildcraft\transport\gui\*.png ..\reobf\minecraft\net\minecraft\src\buildcraft\transport\gui
-xcopy /Y /E common\net\minecraft\src\buildcraft\builders\gui\*.png ..\reobf\minecraft\net\minecraft\src\buildcraft\builders\gui
-xcopy /Y /E common\net\minecraft\src\buildcraft\energy\gui\*.png ..\reobf\minecraft\net\minecraft\src\buildcraft\energy\gui
-
-
-set PATH=E:\cygwin\bin;%PATH%
-
-sh package.sh 3.1.3
-
-pause
diff --git a/setup.sh b/setup.sh
deleted file mode 100644
index 1ad87c46..00000000
--- a/setup.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-if [ ! -f ../src_base ]; then
-   cp -r ../src ../src_base
-   #patch -p0 < minecraft.patch
-   cp -r ../src ../src_work
-else
-   echo "patch already applied - remove src and src_base and decompile again"
-fi
diff --git a/update_patch.sh b/update_patch.sh
deleted file mode 100644
index 9e9edfbb..00000000
--- a/update_patch.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-rm minecraft.patch
-touch minecraft.patch
-
-diff -u ../src_base ../src_work -r --strip-trailing-cr | tr -d '\r' \
-      >> minecraft.patch