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

Proper handling $PBOPREFIX$ backups and cleanup if canceled.

Browse Source 
#1105
This commit is contained in:
ViperMaul
2015-05-10 22:12:57 -07:00
parent 4d56e6317c
commit 0e36e56c1c
1 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tools/make.py
View File

@ -533,20 +533,12 @@ def get_commit_ID():
def version_stamp_pboprefix(module,commitID): def version_stamp_pboprefix(module,commitID):
### Update pboPrefix with the correct version stamp. Use commit_id as the build number. ### Update pboPrefix with the correct version stamp. Use commit_id as the build number.
#This function will not handle any $PBOPREFIX$ backup or cleanup.
global work_drive global work_drive
global prefix global prefix
try: configpath = os.path.join(work_drive, prefix, module, "$PBOPREFIX$")
configpath = os.path.join(work_drive, prefix, module, "$PBOPREFIX$")
if os.path.isfile(configpath):
shutil.copyfile(configpath, os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"))
else:
print_error("$PBOPREFIX$ Does not exist for module: {}.".format(module))
return False
except:
print_error("Error updating $PBOPREFIX$ for module {}.")
return False
try: try:
f = open(configpath, "r") f = open(configpath, "r")
configtext = f.read() configtext = f.read()
@ -568,7 +560,6 @@ def version_stamp_pboprefix(module,commitID):
f = open(configpath, "w") f = open(configpath, "w")
f.write(configtext) f.write(configtext)
f.close() f.close()
os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"))
else: else:
os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$"))
os.rename(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"), os.path.join(work_drive, prefix, module, "$PBOPREFIX$")) os.rename(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"), os.path.join(work_drive, prefix, module, "$PBOPREFIX$"))
@ -578,19 +569,14 @@ def version_stamp_pboprefix(module,commitID):
f = open(configpath, "a") f = open(configpath, "a")
f.write("\nversion = {}".format(commitID)) f.write("\nversion = {}".format(commitID))
f.close() f.close()
os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")) else:
os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$"))
os.rename(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"), os.path.join(work_drive, prefix, module, "$PBOPREFIX$"))
except: except:
print_error("Failed to include build number") print_error("Failed to include build number")
raise raise
return False return False
finally:
if os.path.isfile(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup")):
if os.path.isfile(os.path.join(work_drive, prefix, module, "$PBOPREFIX$")):
os.remove(os.path.join(work_drive, prefix, module, "$PBOPREFIX$"))
os.rename(os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"), os.path.join(work_drive, prefix, module, "$PBOPREFIX$"))
return True return True
############################################################################### ###############################################################################
@ -1018,6 +1004,16 @@ 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:
try:
configpath = os.path.join(work_drive, prefix, module, "$PBOPREFIX$")
if os.path.isfile(configpath):
shutil.copyfile(configpath, os.path.join(work_drive, prefix, module, "$PBOPREFIX$.backup"))
else:
print_error("$PBOPREFIX$ Does not exist for module: {}.".format(module))
return False
except:
print_error("Error creating backup of $PBOPREFIX$ for module {}.")
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"))
os.chdir("P:\\") os.chdir("P:\\")