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

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

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tweaking our x86inc.asm Created 5 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
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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 # Rename sandbox binary with hyphen instead of underscore because that's what 149 # Rename sandbox binary with hyphen instead of underscore because that's what
150 # the code looks for, but the build targets can't use hyphens (scons bug?) 150 # the code looks for, but the build targets can't use hyphens (scons bug?)
151 install -m 4755 -s "${BUILDDIR}/${PROGNAME}_sandbox" \ 151 install -m 4755 -s "${BUILDDIR}/${PROGNAME}_sandbox" \
152 "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}-sandbox" 152 "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}-sandbox"
153 153
154 # l10n paks 154 # l10n paks
155 cp -a "${BUILDDIR}/locales" "${STAGEDIR}/${INSTALLDIR}/" 155 cp -a "${BUILDDIR}/locales" "${STAGEDIR}/${INSTALLDIR}/"
156 find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -exec chmod 644 '{}' \; 156 find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -exec chmod 644 '{}' \;
157 find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \; 157 find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \;
158 158
159 # ffmpeg libs
160 install -m 644 -s "${BUILDDIR}/libffmpegsumo.so" "${STAGEDIR}/${INSTALLDIR}/"
161
162 # Widevine CDM. 159 # Widevine CDM.
163 if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then 160 if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then
164 install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INST ALLDIR}/" 161 install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INST ALLDIR}/"
165 install -m 644 "${BUILDDIR}/libwidevinecdm.so" "${STAGEDIR}/${INSTALLDIR}/" 162 install -m 644 "${BUILDDIR}/libwidevinecdm.so" "${STAGEDIR}/${INSTALLDIR}/"
166 fi 163 fi
167 164
168 # Pepper Flash. 165 # Pepper Flash.
169 PEPPERFLASH_SRCDIR="${BUILDDIR}/PepperFlash" 166 PEPPERFLASH_SRCDIR="${BUILDDIR}/PepperFlash"
170 PEPPERFLASH_DESTDIR="${STAGEDIR}/${INSTALLDIR}/PepperFlash" 167 PEPPERFLASH_DESTDIR="${STAGEDIR}/${INSTALLDIR}/PepperFlash"
171 install -m 755 -d "${PEPPERFLASH_DESTDIR}" 168 install -m 755 -d "${PEPPERFLASH_DESTDIR}"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" 245 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
249 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml" 246 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml"
250 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ 247 process_template "${BUILDDIR}/installer/common/default-app-block.template" \
251 "${STAGEDIR}${INSTALLDIR}/default-app-block" 248 "${STAGEDIR}${INSTALLDIR}/default-app-block"
252 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" 249 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block"
253 250
254 # documentation 251 # documentation
255 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ 252 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \
256 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" 253 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
257 } 254 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698