mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Merge pull request #1684 from acemod/fixMakeBuildErrorWithNOBIN
make.py - Fix missing backup files forr $NOBIN$ situations
This commit is contained in:
commit
4eb39989e2
@ -1079,16 +1079,16 @@ See the make.cfg file for additional build options.
|
||||
if build_tool == "pboproject":
|
||||
try:
|
||||
nobinFilePath = os.path.join(work_drive, prefix, module, "$NOBIN$")
|
||||
backup_config(module)
|
||||
|
||||
if (not os.path.isfile(nobinFilePath)):
|
||||
backup_config(module)
|
||||
convert_config(module)
|
||||
|
||||
version_stamp_pboprefix(module,commit_id)
|
||||
|
||||
if os.path.isfile(nobinFilePath):
|
||||
print_green("$NOBIN$ Found. Proceeding with non-binarizing!")
|
||||
cmd = [makepboTool, "-P","-A","-L","-N","-G", os.path.join(work_drive, prefix, module),os.path.join(module_root, release_dir, project,"addons")]
|
||||
cmd = [makepboTool, "-P","-A","-L","-G","-X=*.backup", os.path.join(work_drive, prefix, module),os.path.join(module_root, release_dir, project,"addons")]
|
||||
|
||||
else:
|
||||
if check_external:
|
||||
@ -1222,7 +1222,7 @@ See the make.cfg file for additional build options.
|
||||
|
||||
except Exception as e:
|
||||
print_yellow("Cancel or some error detected: {}".format(e))
|
||||
|
||||
|
||||
|
||||
finally:
|
||||
copy_important_files(module_root_parent,os.path.join(release_dir, project))
|
||||
|
Loading…
Reference in New Issue
Block a user