Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Now using the Arma3 tools path taking from the registry for CfgConvert

Browse Source
This commit is contained in:
ViperMaul 2015-04-05 10:40:37 -07:00
parent e3e17d8fcb
commit 26fb06f774
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/ace_build_tool/pabstFrankensteinBuilder.py
View File

@ -180,9 +180,10 @@ def find_bi_tools(work_drive):
addonbuilder_path = os.path.join(arma3tools_path, "AddonBuilder", "AddonBuilder.exe") addonbuilder_path = os.path.join(arma3tools_path, "AddonBuilder", "AddonBuilder.exe")
dssignfile_path = os.path.join(arma3tools_path, "DSSignFile", "DSSignFile.exe") dssignfile_path = os.path.join(arma3tools_path, "DSSignFile", "DSSignFile.exe")
dscreatekey_path = os.path.join(arma3tools_path, "DSSignFile", "DSCreateKey.exe") dscreatekey_path = os.path.join(arma3tools_path, "DSSignFile", "DSCreateKey.exe")
cfgconvert_path = os.path.join(arma3tools_path, "CfgConvert", "CfgConvert.exe")
if os.path.isfile(addonbuilder_path) and os.path.isfile(dssignfile_path) and os.path.isfile(dscreatekey_path): if os.path.isfile(addonbuilder_path) and os.path.isfile(dssignfile_path) and os.path.isfile(dscreatekey_path) and os.path.isfile(cfgconvert_path):
return [addonbuilder_path, dssignfile_path, dscreatekey_path] return [addonbuilder_path, dssignfile_path, dscreatekey_path, cfgconvert_path]
else: else:
raise Exception("BadTools","Arma 3 Tools are not installed correctly or the P: drive needs to be created.") raise Exception("BadTools","Arma 3 Tools are not installed correctly or the P: drive needs to be created.")
@ -429,6 +430,7 @@ See the make.cfg file for additional build options.
addonbuilder = tools[0] addonbuilder = tools[0]
dssignfile = tools[1] dssignfile = tools[1]
dscreatekey = tools[2] dscreatekey = tools[2]
cfgconvert = tools[3]
except: except:
print_error("Arma 3 Tools are not installed correctly or the P: drive has not been created.") print_error("Arma 3 Tools are not installed correctly or the P: drive has not been created.")
@ -573,7 +575,7 @@ See the make.cfg file for additional build options.
if build_tool == "pboproject": if build_tool == "pboproject":
try: try:
#PABST: Convert config (run the macro'd config.cpp through CfgConvert twice to produce a de-macro'd cpp that pboProject can read without fucking up: #PABST: Convert config (run the macro'd config.cpp through CfgConvert twice to produce a de-macro'd cpp that pboProject can read without fucking up:
os.chdir("P:\\CfgConvert") os.chdir(os.path.join(arma3tools_path, "CfgConvert"))
shutil.copyfile(os.path.join(work_drive, prefix, module, "config.cpp"), os.path.join(work_drive, prefix, module, "config.backup")) shutil.copyfile(os.path.join(work_drive, prefix, module, "config.cpp"), os.path.join(work_drive, prefix, module, "config.backup"))
print_green("\Pabst (double converting):" + "cfgConvertGUI.exe " + os.path.join(work_drive, prefix, module, "config.cpp")) print_green("\Pabst (double converting):" + "cfgConvertGUI.exe " + os.path.join(work_drive, prefix, module, "config.cpp"))
ret = subprocess.call(["cfgConvertGUI.exe", os.path.join(work_drive, prefix, module, "config.cpp")]) ret = subprocess.call(["cfgConvertGUI.exe", os.path.join(work_drive, prefix, module, "config.cpp")])