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

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

Issue 2004143002: Retry of 2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « chrome/chrome_resources.gyp ('k') | chrome/installer/mini_installer/chrome.release » ('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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 122
123 # resources 123 # resources
124 install -m 644 "${BUILDDIR}/resources.pak" "${STAGEDIR}/${INSTALLDIR}/" 124 install -m 644 "${BUILDDIR}/resources.pak" "${STAGEDIR}/${INSTALLDIR}/"
125 # TODO(mmoss): This has broken a couple times on adding new .pak files. Maybe 125 # TODO(mmoss): This has broken a couple times on adding new .pak files. Maybe
126 # we should flag all installer files in FILES.cfg and get them from there, so 126 # we should flag all installer files in FILES.cfg and get them from there, so
127 # there's only one place people need to keep track of such things (and in 127 # there's only one place people need to keep track of such things (and in
128 # only the public repository). 128 # only the public repository).
129 if [ -r "${BUILDDIR}/chrome_100_percent.pak" ]; then 129 if [ -r "${BUILDDIR}/chrome_100_percent.pak" ]; then
130 install -m 644 "${BUILDDIR}/chrome_100_percent.pak" "${STAGEDIR}/${INSTALLDI R}/" 130 install -m 644 "${BUILDDIR}/chrome_100_percent.pak" "${STAGEDIR}/${INSTALLDI R}/"
131 install -m 644 "${BUILDDIR}/chrome_200_percent.pak" "${STAGEDIR}/${INSTALLDI R}/" 131 install -m 644 "${BUILDDIR}/chrome_200_percent.pak" "${STAGEDIR}/${INSTALLDI R}/"
132 install -m 644 "${BUILDDIR}/chrome_material_100_percent.pak" "${STAGEDIR}/${ INSTALLDIR}/"
133 install -m 644 "${BUILDDIR}/chrome_material_200_percent.pak" "${STAGEDIR}/${ INSTALLDIR}/"
134 else 132 else
135 install -m 644 "${BUILDDIR}/theme_resources_100_percent.pak" "${STAGEDIR}/${ INSTALLDIR}/" 133 install -m 644 "${BUILDDIR}/theme_resources_100_percent.pak" "${STAGEDIR}/${ INSTALLDIR}/"
136 install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INS TALLDIR}/" 134 install -m 644 "${BUILDDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INS TALLDIR}/"
137 fi 135 fi
138 136
139 # ICU data file; only necessary when icu_use_data_file_flag is set to 1 137 # ICU data file; only necessary when icu_use_data_file_flag is set to 1
140 # in build/common.gypi. 138 # in build/common.gypi.
141 install -m 644 "${BUILDDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/" 139 install -m 644 "${BUILDDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/"
142 140
143 # V8 snapshot files; only necessary when v8_use_external_startup_data is 141 # V8 snapshot files; only necessary when v8_use_external_startup_data is
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" 244 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
247 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml" 245 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml"
248 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ 246 process_template "${BUILDDIR}/installer/common/default-app-block.template" \
249 "${STAGEDIR}${INSTALLDIR}/default-app-block" 247 "${STAGEDIR}${INSTALLDIR}/default-app-block"
250 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" 248 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block"
251 249
252 # documentation 250 # documentation
253 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ 251 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \
254 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" 252 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
255 } 253 }
OLDNEW
« no previous file with comments | « chrome/chrome_resources.gyp ('k') | chrome/installer/mini_installer/chrome.release » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698