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

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

Issue 203963003: Turns on use_mojo=1 for linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove setup change Created 6 years, 9 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') | chrome/installer/linux/rpm/expected_deps_i386 » ('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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}-sandbox" 143 "${STAGEDIR}/${INSTALLDIR}/${PROGNAME}-sandbox"
144 144
145 # l10n paks 145 # l10n paks
146 cp -a "${BUILDDIR}/locales" "${STAGEDIR}/${INSTALLDIR}/" 146 cp -a "${BUILDDIR}/locales" "${STAGEDIR}/${INSTALLDIR}/"
147 find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -exec chmod 644 '{}' \; 147 find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -exec chmod 644 '{}' \;
148 find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \; 148 find "${STAGEDIR}/${INSTALLDIR}/locales" -type d -exec chmod 755 '{}' \;
149 149
150 # ffmpeg libs 150 # ffmpeg libs
151 install -m 644 -s "${BUILDDIR}/libffmpegsumo.so" "${STAGEDIR}/${INSTALLDIR}/" 151 install -m 644 -s "${BUILDDIR}/libffmpegsumo.so" "${STAGEDIR}/${INSTALLDIR}/"
152 152
153 install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/lib/"
154
155 if [ -f "${BUILDDIR}/lib/libmojo_system.so" ]; then
156 install -m 644 -s "${BUILDDIR}/lib/libmojo_system.so" "${STAGEDIR}/${INSTALL DIR}/lib/"
157 fi
158
153 # Widevine CDM. 159 # Widevine CDM.
154 if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then 160 if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then
155 install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INST ALLDIR}/" 161 install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INST ALLDIR}/"
156 install -m 644 "${BUILDDIR}/libwidevinecdm.so" "${STAGEDIR}/${INSTALLDIR}/" 162 install -m 644 "${BUILDDIR}/libwidevinecdm.so" "${STAGEDIR}/${INSTALLDIR}/"
157 fi 163 fi
158 164
159 # Pepper Flash. 165 # Pepper Flash.
160 PEPPERFLASH_SRCDIR="${BUILDDIR}/PepperFlash" 166 PEPPERFLASH_SRCDIR="${BUILDDIR}/PepperFlash"
161 PEPPERFLASH_DESTDIR="${STAGEDIR}/${INSTALLDIR}/PepperFlash" 167 PEPPERFLASH_DESTDIR="${STAGEDIR}/${INSTALLDIR}/PepperFlash"
162 install -m 755 -d "${PEPPERFLASH_DESTDIR}" 168 install -m 755 -d "${PEPPERFLASH_DESTDIR}"
163 install -m 644 -s "${PEPPERFLASH_SRCDIR}/libpepflashplayer.so" \ 169 install -m 644 -s "${PEPPERFLASH_SRCDIR}/libpepflashplayer.so" \
164 "${PEPPERFLASH_DESTDIR}/" 170 "${PEPPERFLASH_DESTDIR}/"
165 install -m 644 "${PEPPERFLASH_SRCDIR}/manifest.json" \ 171 install -m 644 "${PEPPERFLASH_SRCDIR}/manifest.json" \
166 "${PEPPERFLASH_DESTDIR}/" 172 "${PEPPERFLASH_DESTDIR}/"
167 173
168 # pdf plugin 174 # pdf plugin
169 if [ -f "${BUILDDIR}/libpdf.so" ]; then 175 if [ -f "${BUILDDIR}/libpdf.so" ]; then
170 install -m 644 -s "${BUILDDIR}/libpdf.so" "${STAGEDIR}/${INSTALLDIR}/" 176 install -m 644 -s "${BUILDDIR}/libpdf.so" "${STAGEDIR}/${INSTALLDIR}/"
171 fi 177 fi
172 178
173 # peerconnection shared library 179 # peerconnection shared library
174 if [ -f "${BUILDDIR}/lib/libpeerconnection.so" ]; then 180 if [ -f "${BUILDDIR}/lib/libpeerconnection.so" ]; then
175 install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/lib/"
176 install -m 644 -s "${BUILDDIR}/lib/libpeerconnection.so" "${STAGEDIR}/${INST ALLDIR}/lib/" 181 install -m 644 -s "${BUILDDIR}/lib/libpeerconnection.so" "${STAGEDIR}/${INST ALLDIR}/lib/"
177 fi 182 fi
178 183
179 # nacl pepper plugin 184 # nacl pepper plugin
180 if [ -f "${BUILDDIR}/libppGoogleNaClPluginChrome.so" ]; then 185 if [ -f "${BUILDDIR}/libppGoogleNaClPluginChrome.so" ]; then
181 install -m 644 -s "${BUILDDIR}/libppGoogleNaClPluginChrome.so" "${STAGEDIR}/ ${INSTALLDIR}/" 186 install -m 644 -s "${BUILDDIR}/libppGoogleNaClPluginChrome.so" "${STAGEDIR}/ ${INSTALLDIR}/"
182 fi 187 fi
183 188
184 # nacl_helper and nacl_helper_bootstrap 189 # nacl_helper and nacl_helper_bootstrap
185 # Don't use "-s" (strip) because this runs binutils "strip", which 190 # Don't use "-s" (strip) because this runs binutils "strip", which
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" 241 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
237 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml" 242 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml"
238 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ 243 process_template "${BUILDDIR}/installer/common/default-app-block.template" \
239 "${STAGEDIR}${INSTALLDIR}/default-app-block" 244 "${STAGEDIR}${INSTALLDIR}/default-app-block"
240 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" 245 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block"
241 246
242 # documentation 247 # documentation
243 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ 248 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \
244 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" 249 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
245 } 250 }
OLDNEW
« no previous file with comments | « chrome/chrome_installer.gypi ('k') | chrome/installer/linux/rpm/expected_deps_i386 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698