From d467ae6e7867044b8d7b466776fb37089292c52b Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Fri, 4 Dec 2015 13:29:51 -0500 Subject: [core] upgrade gyp to git commit 6fb8bd8 https://chromium.googlesource.com/external/gyp/+/6fb8bd829f0ca8fd432fd85ede788b6881c4f09f --- .../English.lproj/InfoPlist.strings | 1 + deps/gyp/test/mac/depend-on-bundle/Info.plist | 28 ++++++++++++++++++++++ deps/gyp/test/mac/depend-on-bundle/bundle.c | 1 + deps/gyp/test/mac/depend-on-bundle/executable.c | 4 ++++ deps/gyp/test/mac/depend-on-bundle/test.gyp | 28 ++++++++++++++++++++++ 5 files changed, 62 insertions(+) create mode 100644 deps/gyp/test/mac/depend-on-bundle/English.lproj/InfoPlist.strings create mode 100644 deps/gyp/test/mac/depend-on-bundle/Info.plist create mode 100644 deps/gyp/test/mac/depend-on-bundle/bundle.c create mode 100644 deps/gyp/test/mac/depend-on-bundle/executable.c create mode 100644 deps/gyp/test/mac/depend-on-bundle/test.gyp (limited to 'deps/gyp/test/mac/depend-on-bundle') diff --git a/deps/gyp/test/mac/depend-on-bundle/English.lproj/InfoPlist.strings b/deps/gyp/test/mac/depend-on-bundle/English.lproj/InfoPlist.strings new file mode 100644 index 0000000000..b92732c79e --- /dev/null +++ b/deps/gyp/test/mac/depend-on-bundle/English.lproj/InfoPlist.strings @@ -0,0 +1 @@ +/* Localized versions of Info.plist keys */ diff --git a/deps/gyp/test/mac/depend-on-bundle/Info.plist b/deps/gyp/test/mac/depend-on-bundle/Info.plist new file mode 100644 index 0000000000..5e05a5190c --- /dev/null +++ b/deps/gyp/test/mac/depend-on-bundle/Info.plist @@ -0,0 +1,28 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + + CFBundleIdentifier + com.yourcompany.${PRODUCT_NAME} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + NSPrincipalClass + + + diff --git a/deps/gyp/test/mac/depend-on-bundle/bundle.c b/deps/gyp/test/mac/depend-on-bundle/bundle.c new file mode 100644 index 0000000000..d64ff8ca23 --- /dev/null +++ b/deps/gyp/test/mac/depend-on-bundle/bundle.c @@ -0,0 +1 @@ +int f() { return 42; } diff --git a/deps/gyp/test/mac/depend-on-bundle/executable.c b/deps/gyp/test/mac/depend-on-bundle/executable.c new file mode 100644 index 0000000000..931bce637e --- /dev/null +++ b/deps/gyp/test/mac/depend-on-bundle/executable.c @@ -0,0 +1,4 @@ +int f(); +int main() { + return f(); +} diff --git a/deps/gyp/test/mac/depend-on-bundle/test.gyp b/deps/gyp/test/mac/depend-on-bundle/test.gyp new file mode 100644 index 0000000000..e00b105415 --- /dev/null +++ b/deps/gyp/test/mac/depend-on-bundle/test.gyp @@ -0,0 +1,28 @@ +# Copyright (c) 2012 Google Inc. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'targets': [ + { + 'target_name': 'my_bundle', + 'type': 'shared_library', + 'mac_bundle': 1, + 'sources': [ 'bundle.c' ], + 'mac_bundle_resources': [ + 'English.lproj/InfoPlist.strings', + ], + 'xcode_settings': { + 'INFOPLIST_FILE': 'Info.plist', + } + }, + { + 'target_name': 'dependent_on_bundle', + 'type': 'executable', + 'sources': [ 'executable.c' ], + 'dependencies': [ + 'my_bundle', + ], + }, + ], +} + -- cgit v1.2.1