summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 18:33:31 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 18:33:31 +0000
commitfa8866b764e3eda49141b1ae18afef162c547b19 (patch)
tree3ef71c757b52209f8c2023d0b132ffc24012b99d
parentb8cc60756b96cde1650735c2d2e9bfedde125695 (diff)
downloadchromium_src-fa8866b764e3eda49141b1ae18afef162c547b19.zip
chromium_src-fa8866b764e3eda49141b1ae18afef162c547b19.tar.gz
chromium_src-fa8866b764e3eda49141b1ae18afef162c547b19.tar.bz2
Move Mac build tool scripts only used by chrome.gyp from build/mac into
chrome/tools/build/mac. BUG=none TEST=none Review URL: http://codereview.chromium.org/334049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30222 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xbuild/mac/remove_target_headers12
-rwxr-xr-xchrome/chrome.gyp23
-rw-r--r--chrome/tools/build/mac/README.chromium (renamed from build/mac/README.chromium)0
-rwxr-xr-xchrome/tools/build/mac/build_app_dmg (renamed from build/mac/build_app_dmg)2
-rwxr-xr-xchrome/tools/build/mac/dump_product_syms (renamed from build/mac/dump_app_syms)2
-rwxr-xr-xchrome/tools/build/mac/generate_localizer (renamed from build/mac/generate_localizer)0
-rwxr-xr-xchrome/tools/build/mac/pkg-dmg (renamed from build/mac/pkg-dmg)0
-rwxr-xr-xchrome/tools/build/mac/symlink_lprojs (renamed from chrome/app/tweak_mac_lproj_folders)0
8 files changed, 16 insertions, 23 deletions
diff --git a/build/mac/remove_target_headers b/build/mac/remove_target_headers
deleted file mode 100755
index a7e73ac..0000000
--- a/build/mac/remove_target_headers
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-set -e
-
-find "${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}" -iname '*.h' -delete
-find "${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}" -iname 'Headers' -type l -delete
-find "${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}" -iname 'Headers' -type d -prune \
- -delete
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index dae8817..f2734f2 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -145,6 +145,7 @@
},],
['OS=="mac"', {
'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist',
+ 'symlink_lprojs_path': 'tools/build/mac/symlink_lprojs',
'nacl_defines': [
'NACL_WINDOWS=0',
'NACL_LINUX=0',
@@ -2567,7 +2568,7 @@
# files and generate table for the ui localizer from it.
'variables': {
'xib_localizer_tool_path':
- '<(DEPTH)/build/mac/generate_localizer',
+ 'tools/build/mac/generate_localizer',
'xib_files_to_scan': [
# The xibs that need localization
'app/nibs/About.xib',
@@ -3535,7 +3536,11 @@
'postbuilds': [
{
'postbuild_name': 'Dump Symbols',
- 'action': ['<(DEPTH)/build/mac/dump_app_syms',
+ 'variables': {
+ 'dump_product_syms_path':
+ 'tools/build/mac/dump_product_syms',
+ },
+ 'action': ['<(dump_product_syms_path)',
'<(branding)'],
},
],
@@ -3681,8 +3686,8 @@
'<(mac_bundle_id)'],
},
{
- 'postbuild_name': 'Tweak Mac lproj folders',
- 'action': ['app/tweak_mac_lproj_folders'],
+ 'postbuild_name': 'Make .lproj links',
+ 'action': ['<(symlink_lprojs_path)'],
},
{
'postbuild_name': 'Clean up old versions',
@@ -5399,8 +5404,8 @@
'<(mac_bundle_id)'],
},
{
- 'postbuild_name': 'Tweak Mac lproj folders',
- 'action': ['app/tweak_mac_lproj_folders'],
+ 'postbuild_name': 'Make .lproj links',
+ 'action': ['<(symlink_lprojs_path)'],
},
{
'postbuild_name': 'Symlink Libraries',
@@ -5624,8 +5629,8 @@
'<(mac_bundle_id)'],
},
{
- 'postbuild_name': 'Tweak Mac lproj folders',
- 'action': ['app/tweak_mac_lproj_folders'],
+ 'postbuild_name': 'Make .lproj links',
+ 'action': ['<(symlink_lprojs_path)'],
},
],
'conditions': [
@@ -5648,7 +5653,7 @@
'chrome',
],
'variables': {
- 'build_app_dmg_script_path': '<(DEPTH)/build/mac/build_app_dmg',
+ 'build_app_dmg_script_path': 'tools/build/mac/build_app_dmg',
},
'actions': [
{
diff --git a/build/mac/README.chromium b/chrome/tools/build/mac/README.chromium
index cce113d..cce113d 100644
--- a/build/mac/README.chromium
+++ b/chrome/tools/build/mac/README.chromium
diff --git a/build/mac/build_app_dmg b/chrome/tools/build/mac/build_app_dmg
index 9b6eb30..9799b07 100755
--- a/build/mac/build_app_dmg
+++ b/chrome/tools/build/mac/build_app_dmg
@@ -19,7 +19,7 @@ fi
set -e
TOP="${SRCROOT}/.."
-PKG_DMG="${TOP}/build/mac/pkg-dmg"
+PKG_DMG="${SRCROOT}/tools/build/mac/pkg-dmg"
BRAND_SCRIPT="${TOP}/build/branding_value.sh"
BUILD_BRANDING=$1
diff --git a/build/mac/dump_app_syms b/chrome/tools/build/mac/dump_product_syms
index 31d464b..f4bfefe 100755
--- a/build/mac/dump_app_syms
+++ b/chrome/tools/build/mac/dump_product_syms
@@ -19,7 +19,7 @@
# CONFIGURATION=Release \
# SRCROOT=$(pwd) \
# BUILT_PRODUCTS_DIR=$(pwd)/../xcodebuild/Release \
-# ../build/mac/dump_app_syms Chromium
+# tools/build/mac/dump_app_syms Chromium
# Make sure we got the header to write into passed to us
if [ $# -ne 1 ]; then
diff --git a/build/mac/generate_localizer b/chrome/tools/build/mac/generate_localizer
index 089245e..089245e 100755
--- a/build/mac/generate_localizer
+++ b/chrome/tools/build/mac/generate_localizer
diff --git a/build/mac/pkg-dmg b/chrome/tools/build/mac/pkg-dmg
index 301d226..301d226 100755
--- a/build/mac/pkg-dmg
+++ b/chrome/tools/build/mac/pkg-dmg
diff --git a/chrome/app/tweak_mac_lproj_folders b/chrome/tools/build/mac/symlink_lprojs
index 6fffcdf..6fffcdf 100755
--- a/chrome/app/tweak_mac_lproj_folders
+++ b/chrome/tools/build/mac/symlink_lprojs