Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Side by Side Diff: chrome/installer/linux/common/installer.include

Issue 102413007: Use the icu data file on Linux (but not on CrOS) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add icudtl.dat to archiver/installer Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/common.gypi ('k') | chrome/tools/build/linux/FILES.cfg » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Recursively replace @@include@@ template variables with the referenced file, 1 # Recursively replace @@include@@ template variables with the referenced file,
2 # and write the resulting text to stdout. 2 # and write the resulting text to stdout.
3 process_template_includes() { 3 process_template_includes() {
4 INCSTACK+="$1->" 4 INCSTACK+="$1->"
5 # Includes are relative to the file that does the include. 5 # Includes are relative to the file that does the include.
6 INCDIR=$(dirname $1) 6 INCDIR=$(dirname $1)
7 # Clear IFS so 'read' doesn't trim whitespace 7 # Clear IFS so 'read' doesn't trim whitespace
8 local OLDIFS="$IFS" 8 local OLDIFS="$IFS"
9 IFS='' 9 IFS=''
10 while read -r LINE 10 while read -r LINE
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 # we should flag all installer files in FILES.cfg and get them from there, so 125 # we should flag all installer files in FILES.cfg and get them from there, so
126 # there's only one place people need to keep track of such things (and in 126 # there's only one place people need to keep track of such things (and in
127 # only the public repository). 127 # only the public repository).
128 if [ -r "${BUILDDIR}/chrome_100_percent.pak" ]; then 128 if [ -r "${BUILDDIR}/chrome_100_percent.pak" ]; then
129 install -m 644 "${BUILDDIR}/chrome_100_percent.pak" "${STAGEDIR}/${INSTALLDI R}/" 129 install -m 644 "${BUILDDIR}/chrome_100_percent.pak" "${STAGEDIR}/${INSTALLDI R}/"
130 else 130 else
131 install -m 644 "${BUILDDIR}/theme_resources_100_percent.pak" "${STAGEDIR}/${ INSTALLDIR}/" 131 install -m 644 "${BUILDDIR}/theme_resources_100_percent.pak" "${STAGEDIR}/${ INSTALLDIR}/"
132 install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INS TALLDIR}/" 132 install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INS TALLDIR}/"
133 fi 133 fi
134 134
135 # ICU data file
136 if [ -r "${BUILDDIR}/icudtl.dat" ]; then
Michael Moss 2014/01/22 22:06:14 If this file is not optional (if it should always
137 install -m 644 "${BUILDDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/"
138 fi
139
135 # sandbox 140 # sandbox
136 # Rename sandbox binary with hyphen instead of underscore because that's what 141 # Rename sandbox binary with hyphen instead of underscore because that's what
137 # the code looks for, but the build targets can't use hyphens (scons bug?) 142 # the code looks for, but the build targets can't use hyphens (scons bug?)
138 install -m 4755 -s "${BUILDDIR}/${PROGNAME}_sandbox" \ 143 install -m 4755 -s "${BUILDDIR}/${PROGNAME}_sandbox" \
139 "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}-sandbox" 144 "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}-sandbox"
140 145
141 # l10n paks 146 # l10n paks
142 cp -a "${BUILDDIR}/locales" "${STAGEDIR}/${INSTALLDIR}/" 147 cp -a "${BUILDDIR}/locales" "${STAGEDIR}/${INSTALLDIR}/"
143 find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -exec chmod 644 '{}' \; 148 find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -exec chmod 644 '{}' \;
144 find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \; 149 find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \;
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" 237 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
233 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml" 238 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml"
234 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ 239 process_template "${BUILDDIR}/installer/common/default-app-block.template" \
235 "${STAGEDIR}${INSTALLDIR}/default-app-block" 240 "${STAGEDIR}${INSTALLDIR}/default-app-block"
236 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" 241 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block"
237 242
238 # documentation 243 # documentation
239 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ 244 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \
240 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" 245 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
241 } 246 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/tools/build/linux/FILES.cfg » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698