pengjunjie/build_tools
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/build_tools.git synced 2026-04-07 14:06:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v7.0.0' into develop

Browse Source
This commit is contained in:
Oleg Korshul
2021-12-13 10:21:23 +03:00
parent 927ed626a2 a06b1a3eae
commit 56cc1e505e
17 changed files with 165 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/base.py
View File

@ -740,7 +740,7 @@ def generate_plist(path):
content += "\t<key>CFBundleGetInfoString</key>\n"
content += "\t<string>Created by " + bundle_creator + "</string>\n"
content += "\t<key>CFBundleIdentifier</key>\n"
content += "\t<string>" + bundle_id_url + name + "</string>\n"
content += "\t<string>" + bundle_id_url + correct_bundle_identifier(name) + "</string>\n"
content += "\t<key>CFBundlePackageType</key>\n"
content += "\t<string>FMWK</string>\n"
content += "\t<key>CFBundleShortVersionString</key>\n"
@ -764,6 +764,9 @@ def generate_plist(path):
return
def correct_bundle_identifier(bundle_identifier):
return re.sub("[^a-zA-Z0-9\.\-]", "-", bundle_identifier)
def get_sdkjs_addons():
result = {}
if ("" == config.option("sdkjs-addons")):
@ -1182,3 +1185,9 @@ def make_sln(directory, args, is_no_errors):
os.environ.clear()
os.environ.update(old_env)
return
def get_android_sdk_home():
ndk_root_path = get_env("ANDROID_NDK_ROOT")
if (-1 != ndk_root_path.find("/ndk/")):
return ndk_root_path + "/../.."
return ndk_root_path + "/.."