diff options
| -rw-r--r-- | dm/DM.cpp | 2 | ||||
| -rw-r--r-- | gn/BUILD.gn | 2 | ||||
| -rw-r--r-- | gn/package_ios.py | 67 |
3 files changed, 69 insertions, 2 deletions
@@ -1473,7 +1473,7 @@ void RunWithGPUTestContexts(GrContextTestFn* test, GrContextTypeFilterFn* contex } } // namespace skiatest -#if !defined(SK_BUILD_FOR_IOS) +#if !defined(SK_BUILD_FOR_IOS) || defined(DM_DEFINE_MAIN) int main(int argc, char** argv) { SkCommandLineFlags::Parse(argc, argv); return dm_main(); diff --git a/gn/BUILD.gn b/gn/BUILD.gn index ec3a1f1ee3..11ab560a2e 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn @@ -211,7 +211,7 @@ config("default") { # If we can we'd like to not do that anymore. While we're building both ways, here's # our clever hack to give each tool back its own main(). cflags += [ - "-Ddm_main=main", + "-DDM_DEFINE_MAIN", "-Dnanobench_main=main", "-Dtool_main=main", "-Dtest_main=main", diff --git a/gn/package_ios.py b/gn/package_ios.py new file mode 100644 index 0000000000..ee8ab46b88 --- /dev/null +++ b/gn/package_ios.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python2.7 +# +# Copyright 2017 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import os +import re +import shutil +import subprocess +import sys +import tempfile + +# Arguments to the script: +# app path to binary to package, e.g. out/Debug/dm +# identity code signing identity, a long hex string +# (run security find-identity -v -p codesigning | grep Google) +# mobileprovision path to Google_Development.mobileprovision +app, identity, mobileprovision = sys.argv[1:] + +out, app = os.path.split(app) + +pkg = os.path.join(out, app + '.app') +if not os.path.exists(pkg): + os.mkdir(pkg) + +# The binary and .mobileprovision just get copied into the package. +shutil.copy(os.path.join(out, app), pkg) +shutil.copy(mobileprovision, + os.path.join(pkg, 'embedded.mobileprovision')) + +# Write a minimal Info.plist to name the package and point at the binary. +with open(os.path.join(pkg, 'Info.plist'), 'w') as f: + f.write(''' +<plist version="1.0"> + <dict> + <key>CFBundleExecutable</key> <string>{app}</string> + <key>CFBundleIdentifier</key> <string>com.google.{app}</string> + </dict> +</plist> +'''.format(app=app)) + +# Extract the appliciation identitifer prefix from the .mobileprovision. +m = re.search(r'''<key>ApplicationIdentifierPrefix</key> +\t<array> +\t<string>(.*)</string>''', open(mobileprovision).read(), re.MULTILINE) +prefix = m.group(1) + +# Write a minimal entitlements file, then codesign. +with tempfile.NamedTemporaryFile() as f: + f.write(''' +<plist version="1.0"> + <dict> + <key>application-identifier</key> <string>{prefix}.com.google.{app}</string> + <key>get-task-allow</key> <true/> + </dict> +</plist> +'''.format(prefix=prefix, app=app)) + f.flush() + + subprocess.check_call(['codesign', + '--force', + '--sign', identity, + '--entitlements', f.name, + '--timestamp=none', + pkg]) |