From c9c2bbef1d0c15329655c3605606794d6dfe63de Mon Sep 17 00:00:00 2001 From: Space Toad Date: Thu, 4 Aug 2011 06:10:38 +0000 Subject: [PATCH] improved installation and setup scripts --- install/README.txt | 10 ++++++++++ install/install.cmd | 8 ++++++++ package.sh | 22 +++++++++++++++------- release.bat | 2 +- setup.bat | 2 +- 5 files changed, 35 insertions(+), 9 deletions(-) create mode 100755 install/README.txt create mode 100755 install/install.cmd diff --git a/install/README.txt b/install/README.txt new file mode 100755 index 0000000000..c649f02191 --- /dev/null +++ b/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/install/install.cmd b/install/install.cmd new file mode 100755 index 0000000000..1aff2b7201 --- /dev/null +++ b/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/package.sh b/package.sh index 8d2f52cfaa..fdb38d87f1 100755 --- a/package.sh +++ b/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/release.bat b/release.bat index 4edfcd6b12..18a5f48ddd 100755 --- a/release.bat +++ b/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/setup.bat b/setup.bat index 8ad6e747c1..1a3d8f88e6 100755 --- a/setup.bat +++ b/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