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

Private key creation folder is now P:\private_keys by default.

Browse Source 
#816
This commit is contained in:
ViperMaul 2015-04-23 10:12:28 -07:00
parent 082d7543f8
commit d1b6dfa5c7
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/make.py
View File

@ -587,6 +587,9 @@ See the make.cfg file for additional build options.
# Private key path # Private key path
key = cfg.get(make_target, "key", fallback=None) key = cfg.get(make_target, "key", fallback=None)
# Private key creation directory
private_key_path = cfg.get(make_target, "private_key_path", fallback=os.path.join(work_drive, "private_keys"))
# Project prefix (folder path) # Project prefix (folder path)
prefix = cfg.get(make_target, "prefix", fallback="") prefix = cfg.get(make_target, "prefix", fallback="")
@ -704,9 +707,16 @@ See the make.cfg file for additional build options.
if new_key: if new_key:
if not os.path.isfile(os.path.join(module_root, key_name + ".biprivatekey")): if not os.path.isfile(os.path.join(module_root, key_name + ".biprivatekey")):
print_yellow("\nRequested key does not exist.") print_yellow("\nRequested key does not exist.")
try:
os.makedirs(private_key_path)
except:
pass
curDir = os.getcwd()
os.chdir(private_key_path)
ret = subprocess.call([dscreatekey, key_name]) # Created in make_root ret = subprocess.call([dscreatekey, key_name]) # Created in make_root
os.chdir(curDir)
if ret == 0: if ret == 0:
print_green("Created: " + os.path.join(module_root, key_name + ".biprivatekey")) print_green("Created: " + os.path.join(private_key_path, key_name + ".biprivatekey"))
print("Removing any old signature keys...") print("Removing any old signature keys...")
purge(os.path.join(module_root, release_dir, project, "Addons"), "^.*\.bisign$","*.bisign") purge(os.path.join(module_root, release_dir, project, "Addons"), "^.*\.bisign$","*.bisign")
else: else:
@ -720,16 +730,16 @@ See the make.cfg file for additional build options.
except: except:
pass pass
shutil.copyfile(os.path.join(module_root, key_name + ".bikey"), os.path.join(module_root, release_dir, project, "keys", key_name + ".bikey")) shutil.copyfile(os.path.join(private_key_path, key_name + ".bikey"), os.path.join(module_root, release_dir, project, "keys", key_name + ".bikey"))
except: except:
print_error("Could not copy key to release directory.") print_error("Could not copy key to release directory.")
raise raise
else: else:
print_green("\nNOTE: Using key " + os.path.join(module_root, key_name + ".biprivatekey")) print_green("\nNOTE: Using key " + os.path.join(private_key_path, key_name + ".biprivatekey"))
key = os.path.join(module_root, key_name + ".biprivatekey") key = os.path.join(private_key_path, key_name + ".biprivatekey")
# For each module, prep files and then build. # For each module, prep files and then build.