summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 21:43:16 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 21:43:16 +0000
commitf9067a66d5efc23c6384f2dc2aadd4ec8f35943e (patch)
tree4601f73bafd540150f1f4954005a91a52d5da078 /chrome
parent6c9ade0bd9ad6960342efbb01fb121eaf874dc3b (diff)
downloadchromium_src-f9067a66d5efc23c6384f2dc2aadd4ec8f35943e.zip
chromium_src-f9067a66d5efc23c6384f2dc2aadd4ec8f35943e.tar.gz
chromium_src-f9067a66d5efc23c6384f2dc2aadd4ec8f35943e.tar.bz2
Clean up transition_lprojs. The transition is over.
BUG=none TEST=none Review URL: http://codereview.chromium.org/399082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32409 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rwxr-xr-xchrome/chrome.gyp39
-rwxr-xr-xchrome/tools/build/mac/transition_lprojs22
2 files changed, 0 insertions, 61 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 3a77f44..2a62c46 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -157,9 +157,6 @@
},],
['OS=="mac"', {
'tweak_info_plist_path': 'tools/build/mac/tweak_info_plist',
- # TODO(mark): Remove after November 17, 2009, allowing two weeks for
- # the transition.
- 'transition_lprojs_path': 'tools/build/mac/transition_lprojs',
'nacl_defines': [
'NACL_WINDOWS=0',
'NACL_LINUX=0',
@@ -3749,18 +3746,6 @@
],
'actions': [
{
- # Clean up the old .lproj structure, where English was in
- # en_US.lproj, and en.lproj was a symbolic link. This must run
- # before the "Generating InfoPlist.strings files" action.
- #
- # TODO(mark): Remove after November 17, 2009, allowing two weeks
- # for the transition.
- 'action_name': 'Temporary .lproj transition',
- 'action': ['<(transition_lprojs_path)'],
- 'inputs': [], # Always run.
- 'outputs': [],
- },
- {
# Generate the InfoPlist.strings file
'action_name': 'Generating InfoPlist.strings files',
'variables': {
@@ -5843,18 +5828,6 @@
'repack_path': '../tools/data_pack/repack.py',
},
'actions': [
- {
- # Clean up the old .lproj structure, where English was in
- # en_US.lproj, and en.lproj was a symbolic link. This must
- # run before the "repack_locales" action.
- #
- # TODO(mark): Remove after November 17, 2009, allowing two
- # weeks for the transition.
- 'action_name': 'Temporary .lproj transition',
- 'action': ['<(transition_lprojs_path)'],
- 'inputs': [], # Always run.
- 'outputs': [],
- },
# TODO(mark): These actions are duplicated for Linux and
# FreeBSD in the chrome target. Can they be unified?
{
@@ -6073,18 +6046,6 @@
],
'actions': [
{
- # Clean up the old .lproj structure, where English was in
- # en_US.lproj, and en.lproj was a symbolic link. This must run
- # before the "Generating InfoPlist.strings files" action.
- #
- # TODO(mark): Remove after November 17, 2009, allowing two weeks
- # for the transition.
- 'action_name': 'Temporary .lproj transition',
- 'action': ['<(transition_lprojs_path)'],
- 'inputs': [], # Always run.
- 'outputs': [],
- },
- {
# Generate the InfoPlist.strings file
'action_name': 'Generating InfoPlist.strings files',
'variables': {
diff --git a/chrome/tools/build/mac/transition_lprojs b/chrome/tools/build/mac/transition_lprojs
deleted file mode 100755
index 40ccb44..0000000
--- a/chrome/tools/build/mac/transition_lprojs
+++ /dev/null
@@ -1,22 +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.
-
-# Clean up the old .lproj structure, where English was in en_US.lproj, and
-# en.lproj was a symbolic link.
-#
-# TODO(mark): Remove after November 17, 2009, allowing two weeks for the
-# transition.
-
-RESOURCES_DIR="${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/Resources"
-
-# Always dump en_US.lproj.
-rm -rf "${RESOURCES_DIR}/en_US.lproj"
-
-# Only dump en.lproj if it's a symbolic link. If it's a directory, then the
-# transition has already been performed.
-if [ -L "${RESOURCES_DIR}/en.lproj" ] ; then
- rm -f "${RESOURCES_DIR}/en.lproj"
-fi