Tools - Removed deprecated Mikero tools arguments from make.py (#7517)

This commit is contained in:
Björn Dahlgren 2020-02-29 21:37:19 +01:00 committed by GitHub
parent 9b86446b26
commit d87d051d23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -842,7 +842,6 @@ make.py [help] [test] [force] [key <name>] [target <name>] [release <version>]
test -- Copy result to Arma 3. test -- Copy result to Arma 3.
release <version> -- Make archive with <version>. release <version> -- Make archive with <version>.
force -- Ignore cache and build all. force -- Ignore cache and build all.
checkexternal -- Check External Files
target <name> -- Use rules in make.cfg under heading [<name>] rather than target <name> -- Use rules in make.cfg under heading [<name>] rather than
default [Make] default [Make]
key <name> -- Use key in working directory with <name> to sign. If it does not key <name> -- Use key in working directory with <name> to sign. If it does not
@ -900,12 +899,6 @@ See the make.cfg file for additional build options.
quiet = True quiet = True
argv.remove("quiet") argv.remove("quiet")
if "checkexternal" in argv:
argv.remove("checkexternal")
check_external = True
else:
check_external = False
if "version" in argv: if "version" in argv:
argv.remove("version") argv.remove("version")
version_update = True version_update = True
@ -930,8 +923,6 @@ See the make.cfg file for additional build options.
argv.remove("ci") argv.remove("ci")
ciBuild = True ciBuild = True
print_yellow("\nCheck external references is set to {}".format(str(check_external)))
# Get the directory the make script is in. # Get the directory the make script is in.
make_root = os.path.dirname(os.path.realpath(__file__)) make_root = os.path.dirname(os.path.realpath(__file__))
make_root_parent = os.path.abspath(os.path.join(os.getcwd(), os.pardir)) make_root_parent = os.path.abspath(os.path.join(os.getcwd(), os.pardir))
@ -1274,13 +1265,10 @@ See the make.cfg file for additional build options.
if os.path.isfile(nobinFilePath): if os.path.isfile(nobinFilePath):
print_green("$NOBIN$ Found. Proceeding with non-binarizing!") print_green("$NOBIN$ Found. Proceeding with non-binarizing!")
cmd = [makepboTool, "-P","-A","-G","-N","-X=*.backup", os.path.join(work_drive, prefix, module),os.path.join(module_root, release_dir, project,"addons")] cmd = [makepboTool, "-P","-A","-X=*.backup", os.path.join(work_drive, prefix, module),os.path.join(module_root, release_dir, project,"addons")]
else: else:
if check_external: cmd = [pboproject, "-P", os.path.join(work_drive, prefix, module), "+Engine=Arma3", "-S", "+Noisy", "+Clean", "+Mod="+os.path.join(module_root, release_dir, project), "-Key"]
cmd = [pboproject, "-P", os.path.join(work_drive, prefix, module), "+Engine=Arma3", "-S","+Noisy", "+G", "+Clean", "+Mod="+os.path.join(module_root, release_dir, project), "-Key"]
else:
cmd = [pboproject, "-P", os.path.join(work_drive, prefix, module), "+Engine=Arma3", "-S","+Noisy", "-G", "+Clean", "+Mod="+os.path.join(module_root, release_dir, project), "-Key"]
color("grey") color("grey")
if quiet: if quiet: