icudlt.dat should be in framework's resources after previous fix.

This commit is contained in:
Cheng Zhao 2014-06-30 12:23:11 +08:00
parent 2736b5dab3
commit 1d359cb8aa
2 changed files with 1 additions and 29 deletions

View file

@ -334,7 +334,6 @@
}, },
'mac_bundle_resources': [ 'mac_bundle_resources': [
'<@(bundle_sources)', '<@(bundle_sources)',
'<(libchromiumcontent_resources_dir)/icudtl.dat',
], ],
'copies': [ 'copies': [
{ {
@ -386,15 +385,6 @@
'<@(locale_dirs)', '<@(locale_dirs)',
], ],
}, },
# Link the icudtl.dat file to the Helper app, which is needed
# by the V8 of Helper too.
{
'postbuild_name' : 'Link icudtl.dat to Helper App',
'action': [
'tools/mac/link_file_to_helper.sh',
'Resources/icudtl.dat',
],
},
] ]
}, { # OS=="mac" }, { # OS=="mac"
'dependencies': [ 'dependencies': [
@ -694,6 +684,7 @@
'mac_bundle_resources': [ 'mac_bundle_resources': [
'atom/common/resources/mac/MainMenu.xib', 'atom/common/resources/mac/MainMenu.xib',
'<(libchromiumcontent_resources_dir)/content_shell.pak', '<(libchromiumcontent_resources_dir)/content_shell.pak',
'<(libchromiumcontent_resources_dir)/icudtl.dat',
], ],
'xcode_settings': { 'xcode_settings': {
'INFOPLIST_FILE': 'atom/common/resources/mac/Info.plist', 'INFOPLIST_FILE': 'atom/common/resources/mac/Info.plist',

View file

@ -1,19 +0,0 @@
#!/bin/bash
# Copyright (c) 2014 GitHub, Inc. All rights reserved.
# Use of this source code is governed by the MIT license that can be
# found in the LICENSE file.
# usage: link_file_to_helper.sh relative-path-to-Contents
# This script links a file from the helper app to the main app.
FILE_PATH=$1
HELPER_CONTENTS_FOLDER_PATH="$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Frameworks/$PRODUCT_NAME Helper.app/Contents"
PARENT="`dirname "$HELPER_CONTENTS_FOLDER_PATH/$FILE_PATH"`"
if [[ ! -d "$PARENT" ]]; then
mkdir -p "$PARENT"
fi
cd "$HELPER_CONTENTS_FOLDER_PATH"
ln -s "../../../../$FILE_PATH" "$FILE_PATH"