chromium/src
0
Fork 0
Code Activity

Fix build/mac/edit_xibs.sh.

Browse Source 
This removes duplicate files from google_toolbox_for_mac.gyp and fixes up the
script to include common.gypi implicitly.

R=mark@chromium.org

Review URL: https://codereview.chromium.org/258343002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267199 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
rsesek@chromium.org
2014-04-30 14:36:03 +00:00
parent 2d9fe79539
commit 1c0feabcb2
3 changed files with 3 additions and 11 deletions
build/mac
edit_xibs.sh
chrome
chrome_nibs.gyp
third_party/google_toolbox_for_mac
google_toolbox_for_mac.gyp

4
build/mac/edit_xibs.sh

@@ -12,6 +12,8 @@ set -e
RELSRC=$(dirname "$0")/../.. RELSRC=$(dirname "$0")/../..
SRC=$(cd "$RELSRC" && pwd) SRC=$(cd "$RELSRC" && pwd)
GYP_GENERATORS=xcode "$SRC/tools/gyp/gyp" "$SRC/chrome/chrome_nibs.gyp" export PYTHONPATH="$PYTHONPATH:$SRC/build"
export GYP_GENERATORS=xcode
"$SRC/tools/gyp/gyp" -I"$SRC/build/common.gypi" "$SRC/chrome/chrome_nibs.gyp"
echo "You can now edit XIB files in Xcode using:" echo "You can now edit XIB files in Xcode using:"
echo " $SRC/chrome/chrome_nibs.xcodeproj" echo " $SRC/chrome/chrome_nibs.xcodeproj"

1
chrome/chrome_nibs.gyp

@@ -21,7 +21,6 @@
'chromium_code': 1, 'chromium_code': 1,
}, },
'includes': [ 'includes': [
'../build/common.gypi',
'chrome_nibs.gypi', 'chrome_nibs.gypi',
], ],
'target_defaults': { 'target_defaults': {

9
third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp vendored

@@ -167,15 +167,6 @@
'src/Foundation/GTMURITemplate.m', 'src/Foundation/GTMURITemplate.m',
'src/Foundation/GTMValidatingContainers.h', 'src/Foundation/GTMValidatingContainers.h',
'src/Foundation/GTMValidatingContainers.m', 'src/Foundation/GTMValidatingContainers.m',
'src/Foundation/GTMLogger.h',
'src/Foundation/GTMLogger.m',
'src/Foundation/GTMNSNumber+64Bit.h',
'src/Foundation/GTMNSNumber+64Bit.m',
'src/Foundation/GTMNSObject+KeyValueObserving.h',
'src/Foundation/GTMNSObject+KeyValueObserving.m',
'src/Foundation/GTMObjectSingleton.h',
'src/Foundation/GTMServiceManagement.c',
'src/Foundation/GTMServiceManagement.h',
'src/GTMDefines.h', 'src/GTMDefines.h',
'src/iPhone/GTMFadeTruncatingLabel.h', 'src/iPhone/GTMFadeTruncatingLabel.h',
'src/iPhone/GTMFadeTruncatingLabel.m', 'src/iPhone/GTMFadeTruncatingLabel.m',