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

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

Issue 136473016: Add eu-strips sha1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved eu-strip to packaging_files_common in gypi 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 | « chrome/chrome_installer.gypi ('k') | no next file » | 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 108
109 # TODO(mmoss) This assumes we built the static binaries. To support shared 109 # TODO(mmoss) This assumes we built the static binaries. To support shared
110 # builds, we probably want an install target in scons so it can give us all 110 # builds, we probably want an install target in scons so it can give us all
111 # the right files. See also: 111 # the right files. See also:
112 # http://code.google.com/p/chromium/issues/detail?id=4451 112 # http://code.google.com/p/chromium/issues/detail?id=4451
113 # 113 #
114 # app 114 # app
115 # We need to add the debug link so gdb knows to look for the symbols. 115 # We need to add the debug link so gdb knows to look for the symbols.
116 DEBUGFILE="${BUILDDIR}/${PROGNAME}.debug" 116 DEBUGFILE="${BUILDDIR}/${PROGNAME}.debug"
117 STRIPPEDFILE="${BUILDDIR}/${PROGNAME}.stripped" 117 STRIPPEDFILE="${BUILDDIR}/${PROGNAME}.stripped"
118 eu-strip -o "${STRIPPEDFILE}" -f "${DEBUGFILE}" "${BUILDDIR}/${PROGNAME}" 118 "${BUILDDIR}/installer/common/eu-strip" -o "${STRIPPEDFILE}" -f "${DEBUGFILE}" "${BUILDDIR}/${PROGNAME}"
119 install -m 755 "${STRIPPEDFILE}" "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}" 119 install -m 755 "${STRIPPEDFILE}" "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}"
120 rm "${DEBUGFILE}" "${STRIPPEDFILE}" 120 rm "${DEBUGFILE}" "${STRIPPEDFILE}"
121 121
122 # resources 122 # resources
123 install -m 644 "${BUILDDIR}/resources.pak" "${STAGEDIR}/${INSTALLDIR}/" 123 install -m 644 "${BUILDDIR}/resources.pak" "${STAGEDIR}/${INSTALLDIR}/"
124 # TODO(mmoss): This has broken a couple times on adding new .pak files. Maybe 124 # TODO(mmoss): This has broken a couple times on adding new .pak files. Maybe
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
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 179
180 # nacl_helper and nacl_helper_bootstrap 180 # nacl_helper and nacl_helper_bootstrap
181 # Don't use "-s" (strip) because this runs binutils "strip", which 181 # Don't use "-s" (strip) because this runs binutils "strip", which
182 # mangles the special ELF program headers of nacl_helper_bootstrap. 182 # mangles the special ELF program headers of nacl_helper_bootstrap.
183 # Explicitly use eu-strip instead, because it doesn't have that problem. 183 # Explicitly use eu-strip instead, because it doesn't have that problem.
184 for file in nacl_helper nacl_helper_bootstrap; do 184 for file in nacl_helper nacl_helper_bootstrap; do
185 buildfile="${BUILDDIR}/${file}" 185 buildfile="${BUILDDIR}/${file}"
186 if [ -f "${buildfile}" ]; then 186 if [ -f "${buildfile}" ]; then
187 strippedfile="${buildfile}.stripped" 187 strippedfile="${buildfile}.stripped"
188 debugfile="${buildfile}.debug" 188 debugfile="${buildfile}.debug"
189 eu-strip -o "${strippedfile}" -f "${debugfile}" "${buildfile}" 189 "${BUILDDIR}/installer/common/eu-strip" -o "${strippedfile}" -f "${debugfi le}" "${buildfile}"
190 install -m 755 "${strippedfile}" "${STAGEDIR}/${INSTALLDIR}/${file}" 190 install -m 755 "${strippedfile}" "${STAGEDIR}/${INSTALLDIR}/${file}"
191 fi 191 fi
192 done 192 done
193 # Don't use "-s" (strip) because this would use the Linux toolchain to 193 # Don't use "-s" (strip) because this would use the Linux toolchain to
194 # strip the NaCl binary, which has the potential to break it. It 194 # strip the NaCl binary, which has the potential to break it. It
195 # certainly resets the OSABI and ABIVERSION fields to non-NaCl values, 195 # certainly resets the OSABI and ABIVERSION fields to non-NaCl values,
196 # although the NaCl IRT loader doesn't care about these fields. In any 196 # although the NaCl IRT loader doesn't care about these fields. In any
197 # case, the IRT binaries are already stripped by NaCl's build process. 197 # case, the IRT binaries are already stripped by NaCl's build process.
198 for filename in ${BUILDDIR}/nacl_irt_*.nexe; do 198 for filename in ${BUILDDIR}/nacl_irt_*.nexe; do
199 # Re-check the filename in case globbing matched nothing. 199 # Re-check the filename in case globbing matched nothing.
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" 232 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
233 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml" 233 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml"
234 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ 234 process_template "${BUILDDIR}/installer/common/default-app-block.template" \
235 "${STAGEDIR}${INSTALLDIR}/default-app-block" 235 "${STAGEDIR}${INSTALLDIR}/default-app-block"
236 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" 236 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block"
237 237
238 # documentation 238 # documentation
239 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ 239 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \
240 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" 240 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
241 } 241 }
OLDNEW
« no previous file with comments | « chrome/chrome_installer.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698