Updated build.py
This commit is contained in:
LexManos
parent
bc757191a5
commit
b1a51f3bc1
2 changed files with 45 additions and 48 deletions
46
build.py
46
build.py
|
|
@ -1,58 +1,20 @@
|
||||||
import os, os.path, sys
|
import os, os.path, sys
|
||||||
import shutil, fnmatch
|
|
||||||
import logging
|
|
||||||
|
|
||||||
forge_dir = os.path.dirname(os.path.abspath(__file__))
|
forge_dir = os.path.dirname(os.path.abspath(__file__))
|
||||||
mcp_dir = os.path.abspath('..')
|
mcp_dir = os.path.abspath('..')
|
||||||
src_dir = os.path.join(mcp_dir, 'src')
|
|
||||||
|
|
||||||
sys.path.append(mcp_dir)
|
from forge import build_forge_dev
|
||||||
from runtime.recompile import recompile
|
|
||||||
|
|
||||||
from forge import copytree, reset_logger, load_version, inject_version
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
build_num = 0
|
build_num = 0
|
||||||
|
|
||||||
if len(sys.argv) > 1:
|
if len(sys.argv) > 1:
|
||||||
try:
|
try:
|
||||||
build_num = int(sys.argv[1])
|
build_num = int(sys.argv[1])
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
sys.exit(build(build_num))
|
fml_dir = os.path.join(forge_dir, 'fml')
|
||||||
|
sys.exit(build_forge_dev(mcp_dir, forge_dir, fml_dir, build_num))
|
||||||
def build(build_num=0):
|
|
||||||
version = load_version(build_num)
|
|
||||||
print '=================================== Build %d.%d.%d.%d Start =================================' % (version['major'], version['minor'], version['revision'], version['build'])
|
|
||||||
|
|
||||||
if os.path.isdir(src_dir):
|
|
||||||
shutil.rmtree(src_dir)
|
|
||||||
inject_version(os.path.join(forge_dir, 'forge_common', 'net', 'minecraft', 'src', 'forge', 'ForgeHooks.java'), build_num)
|
|
||||||
|
|
||||||
print 'src_work -> src'
|
|
||||||
copytree(os.path.join(mcp_dir, 'src_work'), src_dir)
|
|
||||||
print '\nforge_client -> minecraft'
|
|
||||||
copytree(os.path.join(forge_dir, 'forge_client', 'src'), os.path.join(src_dir, 'minecraft'), -1)
|
|
||||||
print '\nforge_server -> minecraft_server'
|
|
||||||
copytree(os.path.join(forge_dir, 'forge_server', 'src'), os.path.join(src_dir, 'minecraft_server'), -1)
|
|
||||||
print '\nforge_common -> minecraft'
|
|
||||||
copytree(os.path.join(forge_dir, 'forge_common'), os.path.join(src_dir, 'minecraft'), -1)
|
|
||||||
print '\nforge_common -> minecraft_server'
|
|
||||||
copytree(os.path.join(forge_dir, 'forge_common'), os.path.join(src_dir, 'minecraft_server'), -1)
|
|
||||||
print
|
|
||||||
|
|
||||||
error_level = 0
|
|
||||||
try:
|
|
||||||
os.chdir(mcp_dir)
|
|
||||||
reset_logger()
|
|
||||||
recompile(None)
|
|
||||||
reset_logger()
|
|
||||||
os.chdir(forge_dir)
|
|
||||||
except SystemExit, e:
|
|
||||||
print 'Recompile Exception: %d ' % e.code
|
|
||||||
error_level = e.code
|
|
||||||
|
|
||||||
print '=================================== Build Finished %d =================================' % error_level
|
|
||||||
return error_level
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
47
forge.py
47
forge.py
|
|
@ -22,7 +22,7 @@ def load_version(build=0):
|
||||||
'revision' : -1,
|
'revision' : -1,
|
||||||
'build' : -1
|
'build' : -1
|
||||||
}
|
}
|
||||||
hook_file = os.path.join(forge_dir, 'forge_common/net/minecraft/src/forge/ForgeHooks.java'.replace('/', os.sep))
|
hook_file = os.path.join(forge_dir, 'common/net/minecraftforge/common/ForgeVersion.java'.replace('/', os.sep))
|
||||||
with open(hook_file, 'r') as fh:
|
with open(hook_file, 'r') as fh:
|
||||||
buf = fh.read()
|
buf = fh.read()
|
||||||
|
|
||||||
|
|
@ -75,7 +75,6 @@ def zip_create(path, key, zip_name):
|
||||||
else:
|
else:
|
||||||
zip.write(path, key)
|
zip.write(path, key)
|
||||||
zip.close()
|
zip.close()
|
||||||
|
|
||||||
|
|
||||||
def apply_forge_patches(fml_dir, mcp_dir, forge_dir, src_dir, copy_files=True):
|
def apply_forge_patches(fml_dir, mcp_dir, forge_dir, src_dir, copy_files=True):
|
||||||
sys.path.append(fml_dir)
|
sys.path.append(fml_dir)
|
||||||
|
|
@ -126,7 +125,6 @@ def get_conf_copy(mcp_dir, forge_dir):
|
||||||
gen_merged_csv(common_map, os.path.join(mcp_dir, 'conf', 'methods.csv'), os.path.join(forge_dir, 'conf', 'methods.csv'))
|
gen_merged_csv(common_map, os.path.join(mcp_dir, 'conf', 'methods.csv'), os.path.join(forge_dir, 'conf', 'methods.csv'))
|
||||||
gen_merged_csv(common_map, os.path.join(mcp_dir, 'conf', 'params.csv'), os.path.join(forge_dir, 'conf', 'params.csv'), main_key='param')
|
gen_merged_csv(common_map, os.path.join(mcp_dir, 'conf', 'params.csv'), os.path.join(forge_dir, 'conf', 'params.csv'), main_key='param')
|
||||||
|
|
||||||
|
|
||||||
def gen_merged_srg(mcp_dir, forge_dir):
|
def gen_merged_srg(mcp_dir, forge_dir):
|
||||||
print 'Generating merged Retroguard data'
|
print 'Generating merged Retroguard data'
|
||||||
srg_client = os.path.join(mcp_dir, 'conf', 'client.srg')
|
srg_client = os.path.join(mcp_dir, 'conf', 'client.srg')
|
||||||
|
|
@ -275,8 +273,6 @@ def gen_merged_csv(common_map, in_file, out_file, main_key='searge'):
|
||||||
for key in ['client', 'server', 'common']:
|
for key in ['client', 'server', 'common']:
|
||||||
for row in sorted(sides[key], key=lambda row: row[main_key]):
|
for row in sorted(sides[key], key=lambda row: row[main_key]):
|
||||||
writer.writerow(row)
|
writer.writerow(row)
|
||||||
|
|
||||||
#pprint.pprint(sides)
|
|
||||||
|
|
||||||
def setup_forge_mcp(mcp_dir, forge_dir, dont_gen_conf=True):
|
def setup_forge_mcp(mcp_dir, forge_dir, dont_gen_conf=True):
|
||||||
mcp_conf = os.path.join(mcp_dir, 'conf')
|
mcp_conf = os.path.join(mcp_dir, 'conf')
|
||||||
|
|
@ -295,4 +291,43 @@ def setup_forge_mcp(mcp_dir, forge_dir, dont_gen_conf=True):
|
||||||
|
|
||||||
print 'Copying Forge conf'
|
print 'Copying Forge conf'
|
||||||
shutil.copytree(forge_conf, mcp_conf)
|
shutil.copytree(forge_conf, mcp_conf)
|
||||||
|
|
||||||
|
def build_forge_dev(mcp_dir, forge_dir, fml_dir, build_num=0):
|
||||||
|
version = load_version(build_num)
|
||||||
|
print '=================================== Build %d.%d.%d.%d Start =================================' % (version['major'], version['minor'], version['revision'], version['build'])
|
||||||
|
|
||||||
|
src_dir = os.path.join(mcp_dir, 'src')
|
||||||
|
if os.path.isdir(src_dir):
|
||||||
|
shutil.rmtree(src_dir)
|
||||||
|
|
||||||
|
sys.path.append(fml_dir)
|
||||||
|
from fml import copytree
|
||||||
|
|
||||||
|
print 'src_work -> src'
|
||||||
|
copytree(os.path.join(mcp_dir, 'src_work'), src_dir)
|
||||||
|
print '\nCopying Client Code'
|
||||||
|
copytree(os.path.join(forge_dir, 'client'), os.path.join(src_dir, 'minecraft'), -1)
|
||||||
|
print '\nCopying Server Code'
|
||||||
|
copytree(os.path.join(forge_dir, 'server'), os.path.join(src_dir, 'minecraft_server'), -1)
|
||||||
|
print '\nCopying Common Code'
|
||||||
|
copytree(os.path.join(forge_dir, 'common'), os.path.join(src_dir, 'common'), -1)
|
||||||
|
print
|
||||||
|
inject_version(os.path.join(src_dir, 'common/net/minecraftforge/common/ForgeVersion.java'.replace('/', os.sep)), build_num)
|
||||||
|
|
||||||
|
error_level = 0
|
||||||
|
try:
|
||||||
|
sys.path.append(mcp_dir)
|
||||||
|
from runtime.recompile import recompile
|
||||||
|
|
||||||
|
os.chdir(mcp_dir)
|
||||||
|
reset_logger()
|
||||||
|
recompile(None)
|
||||||
|
reset_logger()
|
||||||
|
os.chdir(forge_dir)
|
||||||
|
|
||||||
|
except SystemExit, e:
|
||||||
|
print 'Recompile Exception: %d ' % e.code
|
||||||
|
error_level = e.code
|
||||||
|
|
||||||
|
print '=================================== Build Finished %d =================================' % error_level
|
||||||
|
return error_level
|
||||||
Loading…
Reference in a new issue