mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 11:29:15 +00:00
Made the windows setup script a bit more robust, also made both scripts filter out non-patch files. {Issue with svn files}
This commit is contained in:
1 parent
141805d5bb
commit
9f56b1cc03
2 files changed
+39
-27
No files matched your search
+36
-26
@@ -1,35 +1,45 @@
|
||||
cd ..
|
||||
echo off
|
||||
pushd .. >nul
|
||||
|
||||
rmdir /S /Q src
|
||||
|
||||
IF EXIST src_base (
|
||||
move src_base src
|
||||
rmdir /S /Q src
|
||||
rmdir /S /Q src_base
|
||||
rmdir /S /Q src_work
|
||||
) ELSE (
|
||||
|
||||
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-win.patch
|
||||
cd ..
|
||||
cmd /C recompile.bat
|
||||
|
||||
pushd src >nul
|
||||
..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\modLoaderMP.patch ..\forge\modLoaderMP-win.patch
|
||||
..\runtime\bin\applydiff.exe -uf -p2 < ..\forge\modLoaderMP-win.patch
|
||||
..\runtime\bin\python\python_mcp ..\forge\lfcr.py ..\forge\mlprop.patch ..\forge\mlprop-win.patch
|
||||
..\runtime\bin\applydiff.exe -uf -p1 < ..\forge\mlprop-win.patch
|
||||
rm ../forge/mlprop-win.patch ../forge/modLoaderMP-win.patch
|
||||
popd >nul
|
||||
|
||||
cmd /C updatemd5.bat
|
||||
)
|
||||
|
||||
mkdir src_base
|
||||
mkdir src_work
|
||||
xcopy /Y /E src\* src_base
|
||||
xcopy /Y /E src\* src_work
|
||||
cd src_work
|
||||
@setlocal enabledelayedexpansion
|
||||
@echo off
|
||||
mkdir src_base
|
||||
mkdir src_work
|
||||
|
||||
set PATH=..\forge\bin;%PATH%
|
||||
echo Applying patches
|
||||
for /f %%i in ('find ../forge/patches -type f') do (
|
||||
..\runtime\bin\python\python_mcp ..\forge\lfcr.py %%i %%i
|
||||
..\runtime\bin\applydiff.exe -uf -p2 < %%i
|
||||
)
|
||||
xcopy /Y /E /Q src\* src_base
|
||||
xcopy /Y /E /Q src\* src_work
|
||||
|
||||
cd ../forge
|
||||
pushd src_work >nul
|
||||
@setlocal enabledelayedexpansion
|
||||
@echo off
|
||||
|
||||
set PATH=..\forge\bin;%PATH%
|
||||
echo Applying patches
|
||||
for /f %%i in ('find ../forge/patches -type f') do (
|
||||
set file=%%i
|
||||
rem Have to do this to filter out .svn entries
|
||||
if /I "!file:~-6!" EQU ".patch" (
|
||||
..\runtime\bin\python\python_mcp ..\forge\lfcr.py %%i ..\forge\temp.patch
|
||||
..\runtime\bin\applydiff.exe -uf -p2 -i ..\forge\temp.patch
|
||||
rm ../forge/temp.patch >nul 1>nul
|
||||
)
|
||||
)
|
||||
popd >nul
|
||||
popd >nul
|
||||
echo finished
|
||||
pause
|
||||
|
||||
+3
-1
@@ -36,7 +36,9 @@ cp -a src_base src_work
|
||||
pushd src_work > /dev/null
|
||||
for i in `find ../forge/patches/ -type f`
|
||||
do
|
||||
patch -p2 -i $i
|
||||
if ["${i:(-6)}" == ".patch"]; then
|
||||
patch -p2 -i $i
|
||||
fi
|
||||
done
|
||||
popd > /dev/null
|
||||
|
||||
|
||||
Reference in new issue
Block a user