From ea41a93de3e8d18e33305b66cbc8e1da5a9e4c03 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Sat, 7 Apr 2012 04:29:23 -0700
Subject: [PATCH] Couple of output fixups and added script to be executed by
 Jenkins during the build. First test build.

---
 forge/build.py                                |  3 +-
 .../net/minecraft/src/forge/ForgeHooks.java   |  2 +-
 forge/jenkins.bat                             | 28 +++++++++++++++++++
 forge/release.py                              |  1 +
 forge/setup.py                                |  2 +-
 5 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 forge/jenkins.bat

diff --git a/forge/build.py b/forge/build.py
index a0c4e5b261..0aa40b6dc0 100644
--- a/forge/build.py
+++ b/forge/build.py
@@ -43,11 +43,12 @@ def build(build_num=0):
     error_level = 0
     try:
         os.chdir(mcp_dir)
+        reset_logger()
         recompile(None)
         reset_logger()
         os.chdir(forge_dir)
     except SystemExit, e:
-        print 'Decompile Exception: %d ' % e.code
+        print 'Recompile Exception: %d ' % e.code
         error_level = e.code
         
     print '=================================== Build Finished %d =================================' % error_level
diff --git a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java
index 777ae2f20c..3758479191 100644
--- a/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java
+++ b/forge/forge_common/net/minecraft/src/forge/ForgeHooks.java
@@ -606,7 +606,7 @@ public class ForgeHooks
     public static final int majorVersion    = 3;
     public static final int minorVersion    = 0;
     public static final int revisionVersion = 0;
-    public static final int buildVersion    = 5;
+    public static final int buildVersion    = 0;
     static
     {
         plantGrassList = new ArrayList<ProbableItem>();
diff --git a/forge/jenkins.bat b/forge/jenkins.bat
new file mode 100644
index 0000000000..3b97db018f
--- /dev/null
+++ b/forge/jenkins.bat
@@ -0,0 +1,28 @@
+@echo off
+if "%1"=="" (
+    echo You must enter a build number to promote to the latest
+    exit /b 1
+)
+
+echo Jenkins build script started for build #%1
+rmdir /S /Q ..\conf
+xcopy /Y /E /I conf\* ..\conf
+
+..\runtime\bin\python\python_mcp setup.py -skipdecompile
+if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
+
+..\runtime\bin\python\python_mcp release.py %1
+if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
+
+cd forge-*%1
+if %ERRORLEVEL% NEQ 0 (
+    echo Release failed to produce artifacts %1
+    exit /b 1
+)
+
+for /f "delims=\" %%a in ("%cd%") do SET VERSION=%%~nxa
+SET VERSION=%VERSION:~6%
+echo Forge Version: %VERSION%
+
+E:\MediafireUploader.exe Forge-%VERSION% minecraftforge-client-%VERSION%.zip minecraftforge-server-%VERSION%.zip minecraftforge-src-%VERSION%.zip
+
diff --git a/forge/release.py b/forge/release.py
index da012f282c..ad3dae1f96 100644
--- a/forge/release.py
+++ b/forge/release.py
@@ -37,6 +37,7 @@ def main():
     error_level = 0
     try:
         os.chdir(mcp_dir)
+        reset_logger()
         reobfuscate(None, False, True, True)
         reset_logger()
         os.chdir(forge_dir)
diff --git a/forge/setup.py b/forge/setup.py
index 24016693a5..ee4d702d29 100644
--- a/forge/setup.py
+++ b/forge/setup.py
@@ -79,7 +79,7 @@ def setup_fml():
     if os.path.isdir(fml_dir):
         shutil.rmtree(fml_dir)
         
-    print 'Extracting Forge ModLoader: %s' % os.path.basename(fml[0]) 
+    print 'Extracting: %s' % os.path.basename(fml[0]) 
     
     zf = zipfile.ZipFile(fml[0])
     zf.extractall(forge_dir)