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

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

Issue 205253002: Fixes linux install script for mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | 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 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/"
153 install -m 644 -s "${BUILDDIR}/lib/libmojo_system.so" "${STAGEDIR}/${INSTALLDI R}/lib/" 154 install -m 644 -s "${BUILDDIR}/lib/libmojo_system.so" "${STAGEDIR}/${INSTALLDI R}/lib/"
154 155
155 # Widevine CDM. 156 # Widevine CDM.
156 if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then 157 if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then
157 install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INST ALLDIR}/" 158 install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INST ALLDIR}/"
158 install -m 644 "${BUILDDIR}/libwidevinecdm.so" "${STAGEDIR}/${INSTALLDIR}/" 159 install -m 644 "${BUILDDIR}/libwidevinecdm.so" "${STAGEDIR}/${INSTALLDIR}/"
159 fi 160 fi
160 161
161 # Pepper Flash. 162 # Pepper Flash.
162 PEPPERFLASH_SRCDIR="${BUILDDIR}/PepperFlash" 163 PEPPERFLASH_SRCDIR="${BUILDDIR}/PepperFlash"
163 PEPPERFLASH_DESTDIR="${STAGEDIR}/${INSTALLDIR}/PepperFlash" 164 PEPPERFLASH_DESTDIR="${STAGEDIR}/${INSTALLDIR}/PepperFlash"
164 install -m 755 -d "${PEPPERFLASH_DESTDIR}" 165 install -m 755 -d "${PEPPERFLASH_DESTDIR}"
165 install -m 644 -s "${PEPPERFLASH_SRCDIR}/libpepflashplayer.so" \ 166 install -m 644 -s "${PEPPERFLASH_SRCDIR}/libpepflashplayer.so" \
166 "${PEPPERFLASH_DESTDIR}/" 167 "${PEPPERFLASH_DESTDIR}/"
167 install -m 644 "${PEPPERFLASH_SRCDIR}/manifest.json" \ 168 install -m 644 "${PEPPERFLASH_SRCDIR}/manifest.json" \
168 "${PEPPERFLASH_DESTDIR}/" 169 "${PEPPERFLASH_DESTDIR}/"
169 170
170 # pdf plugin 171 # pdf plugin
171 if [ -f "${BUILDDIR}/libpdf.so" ]; then 172 if [ -f "${BUILDDIR}/libpdf.so" ]; then
172 install -m 644 -s "${BUILDDIR}/libpdf.so" "${STAGEDIR}/${INSTALLDIR}/" 173 install -m 644 -s "${BUILDDIR}/libpdf.so" "${STAGEDIR}/${INSTALLDIR}/"
173 fi 174 fi
174 175
175 # peerconnection shared library 176 # peerconnection shared library
176 if [ -f "${BUILDDIR}/lib/libpeerconnection.so" ]; then 177 if [ -f "${BUILDDIR}/lib/libpeerconnection.so" ]; then
177 install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/lib/"
178 install -m 644 -s "${BUILDDIR}/lib/libpeerconnection.so" "${STAGEDIR}/${INST ALLDIR}/lib/" 178 install -m 644 -s "${BUILDDIR}/lib/libpeerconnection.so" "${STAGEDIR}/${INST ALLDIR}/lib/"
179 fi 179 fi
180 180
181 # nacl pepper plugin 181 # nacl pepper plugin
182 if [ -f "${BUILDDIR}/libppGoogleNaClPluginChrome.so" ]; then 182 if [ -f "${BUILDDIR}/libppGoogleNaClPluginChrome.so" ]; then
183 install -m 644 -s "${BUILDDIR}/libppGoogleNaClPluginChrome.so" "${STAGEDIR}/ ${INSTALLDIR}/" 183 install -m 644 -s "${BUILDDIR}/libppGoogleNaClPluginChrome.so" "${STAGEDIR}/ ${INSTALLDIR}/"
184 fi 184 fi
185 185
186 # nacl_helper and nacl_helper_bootstrap 186 # nacl_helper and nacl_helper_bootstrap
187 # Don't use "-s" (strip) because this runs binutils "strip", which 187 # Don't use "-s" (strip) because this runs binutils "strip", which
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml" 238 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}.xml"
239 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml" 239 chmod 644 "${STAGEDIR}/usr/share/gnome-control-center/default-apps/${PACKAGE}. xml"
240 process_template "${BUILDDIR}/installer/common/default-app-block.template" \ 240 process_template "${BUILDDIR}/installer/common/default-app-block.template" \
241 "${STAGEDIR}${INSTALLDIR}/default-app-block" 241 "${STAGEDIR}${INSTALLDIR}/default-app-block"
242 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block" 242 chmod 644 "${STAGEDIR}${INSTALLDIR}/default-app-block"
243 243
244 # documentation 244 # documentation
245 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \ 245 install -m 755 "${BUILDDIR}/${PROGNAME}.1" \
246 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1" 246 "${STAGEDIR}/usr/share/man/man1/${PACKAGE}.1"
247 } 247 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698