From 45a3f771bd17b026731ddf10d576c83e6c58ad37 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 12 Dec 2012 23:38:51 -0800 Subject: [PATCH] Updated python scripts for removal of common folder --- forge.py | 10 ++++------ release.py | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/forge.py b/forge.py index b28083bd3..b076b5be1 100644 --- a/forge.py +++ b/forge.py @@ -83,13 +83,11 @@ def apply_forge_patches(fml_dir, mcp_dir, forge_dir, src_dir, copy_files=True): if os.path.isdir(os.path.join(forge_dir, 'patches', 'minecraft')): apply_patches(mcp_dir, os.path.join(forge_dir, 'patches', 'minecraft'), src_dir) + if copy_files and os.path.isdir(os.path.join(forge_dir, 'client')): copytree(os.path.join(forge_dir, 'client'), os.path.join(src_dir, 'minecraft')) - - if os.path.isdir(os.path.join(forge_dir, 'patches', 'common')): - apply_patches(mcp_dir, os.path.join(forge_dir, 'patches', 'common'), src_dir) if copy_files and os.path.isdir(os.path.join(forge_dir, 'common')): - copytree(os.path.join(forge_dir, 'common'), os.path.join(src_dir, 'common')) + copytree(os.path.join(forge_dir, 'common'), os.path.join(src_dir, 'minecraft')) def build_forge_dev(mcp_dir, forge_dir, fml_dir, build_num=0): version = load_version(build_num) @@ -107,9 +105,9 @@ def build_forge_dev(mcp_dir, forge_dir, fml_dir, build_num=0): print '\nCopying Client Code' copytree(os.path.join(forge_dir, 'client'), os.path.join(src_dir, 'minecraft'), -1) print '\nCopying Common Code' - copytree(os.path.join(forge_dir, 'common'), os.path.join(src_dir, 'common'), -1) + copytree(os.path.join(forge_dir, 'common'), os.path.join(src_dir, 'minecraft'), -1) print - inject_version(os.path.join(src_dir, 'common/net/minecraftforge/common/ForgeVersion.java'.replace('/', os.sep)), build_num) + inject_version(os.path.join(src_dir, 'minecraft/net/minecraftforge/common/ForgeVersion.java'.replace('/', os.sep)), build_num) error_level = 0 try: diff --git a/release.py b/release.py index 56cfda048..ac88e306a 100644 --- a/release.py +++ b/release.py @@ -78,6 +78,7 @@ def main(): os.makedirs(out_folder) + options.skip_changelog = True #Disable till jenkins fixes its shit if not options.skip_changelog: changelog_file = 'forge-%s/minecraftforge-changelog-%s.txt' % (version_str, version_str) make_changelog("http://jenkins.minecraftforge.net/job/minecraftforge/", build_num, changelog_file, version_str)