From 6d0e0319893d4ac77b1cc7289aafa1b190e20639 Mon Sep 17 00:00:00 2001
From: Space Toad <spacetoadcraft@gmail.com>
Date: Thu, 4 Aug 2011 06:10:38 +0000
Subject: [PATCH] improved installation and setup scripts

---
 forge/install/README.txt  | 10 ++++++++++
 forge/install/install.cmd |  8 ++++++++
 forge/package.sh          | 22 +++++++++++++++-------
 forge/release.bat         |  2 +-
 forge/setup.bat           |  2 +-
 5 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100755 forge/install/README.txt
 create mode 100755 forge/install/install.cmd

diff --git a/forge/install/README.txt b/forge/install/README.txt
new file mode 100755
index 000000000..c649f0219
--- /dev/null
+++ b/forge/install/README.txt
@@ -0,0 +1,10 @@
+*** HOW TO INSTALL ***
+
+The forge directory should have been uncompacted right under your MCP root 
+directory.
+
+You should a a fresh minecraft and minecraft_server.jar freshly decompiled 
+with ModLoader and ModLoaderMP.
+
+Just run the script install.bat. It will copy the Minecraft Forge source on your
+src directory, and modify the Minecraft source files.
diff --git a/forge/install/install.cmd b/forge/install/install.cmd
new file mode 100755
index 000000000..1aff2b720
--- /dev/null
+++ b/forge/install/install.cmd
@@ -0,0 +1,8 @@
+set HOME=%CD%
+set MCP=%HOME%\..
+xcopy  /Y /E src\* ..\src
+
+cd %MCP%\src
+%MCP%\runtime\bin\python\python_mcp %HOME%\lfcr.py %HOME%\minecraft.patch %HOME%\minecraft-win.patch
+%MCP%\runtime\bin\applydiff.exe -uf -p2 < %HOME%\minecraft-win.patch
+pause
diff --git a/forge/package.sh b/forge/package.sh
index 8d2f52cfa..fdb38d87f 100755
--- a/forge/package.sh
+++ b/forge/package.sh
@@ -46,18 +46,26 @@ rm -rf reobf
 
 cd $build_dir
 
+mkdir forge
+cd forge
 mkdir src
 mkdir src/minecraft
 mkdir src/minecraft_server
-cp -r forge_client/src/* src/minecraft
-cp -r forge_server/src/* src/minecraft_server
-cp -r forge_common/* src/minecraft
-cp -r forge_common/* src/minecraft_server
-cp minecraft.patch src
+cp -r ../forge_client/src/* src/minecraft
+cp -r ../forge_server/src/* src/minecraft_server
+cp -r ../forge_common/* src/minecraft
+cp -r ../forge_common/* src/minecraft_server
+cp ../minecraft.patch .
+cp ../lfcr.py .
+cp ../install/install.cmd .
+cp ../install/README.txt .
+cp -r ../doc .
 
 cd src
 remove_svn .
 cd ..
 
-zip -r $dir/minecraftforge-src-$version.zip src doc
-rm -rf src
+cd ..
+
+zip -r $dir/minecraftforge-src-$version.zip forge
+rm -rf forge
diff --git a/forge/release.bat b/forge/release.bat
index 4edfcd6b1..18a5f48dd 100755
--- a/forge/release.bat
+++ b/forge/release.bat
@@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH%
 
 cd forge
 
-sh package.sh 1.0.0
+sh package.sh 1.0.3
 
 pause
diff --git a/forge/setup.bat b/forge/setup.bat
index 8ad6e747c..1a3d8f88e 100755
--- a/forge/setup.bat
+++ b/forge/setup.bat
@@ -9,7 +9,7 @@ rmdir /S /Q src_work
 cmd /C decompile.bat
 cd src
 ..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch
-..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP.patch
+..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP-win.patch
 cd ..
 cmd /C recompile.bat
 cmd /C updatemd5.bat