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

Unified Diff: remoting/host/installer/linux/build-deb.sh

Issue 1412653005: Fix build_deb.sh script to work for any out directory, not only out/Release (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/installer/linux/Makefile ('k') | remoting/remoting_host_linux.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/installer/linux/build-deb.sh
diff --git a/remoting/host/installer/linux/build-deb.sh b/remoting/host/installer/linux/build-deb.sh
index 6f27d468e002a767831b022088f12bbecc5efee1..951d935dc514998fca1342a75e1fc269392e6903 100755
--- a/remoting/host/installer/linux/build-deb.sh
+++ b/remoting/host/installer/linux/build-deb.sh
@@ -40,7 +40,7 @@ usage() {
echo "-h this help message"
echo "-p just print the expected DEB filename that this will build."
echo "-s path to the top of the src tree."
- echo "-o path to write the DEB file to."
+ echo "-o output directory path."
}
while getopts ":s:o:ph" OPTNAME
@@ -107,6 +107,10 @@ if [[ -n "$revision" ]]; then
revision_text="(r$revision)"
fi
+if [[ ! "$OUTPUT_PATH" ]]; then
+ OUTPUT_PATH="${SCRIPTDIR}/../../../../out/Release"
+fi
+
echo "Building version $version_full $revision_text"
# Create a fresh debian/changelog.
@@ -120,7 +124,7 @@ debchange --create \
"New Debian package $revision_text"
-CRON_SCRIPT_DIR="${SCRIPTDIR}/../../../../out/Release/remoting/installer/cron"
+CRON_SCRIPT_DIR="${OUTPUT_PATH}/remoting/installer/cron"
mkdir -p ${CRON_SCRIPT_DIR}
process_template \
"${SCRIPTDIR}/../../../../chrome/installer/linux/common/repo.cron" \
@@ -134,10 +138,8 @@ process_template \
# but it seems that we don't currently, so this is the most expediant fix.
SAVE_LDLP=$LD_LIBRARY_PATH
unset LD_LIBRARY_PATH
-dpkg-buildpackage -b -us -uc
+BUILD_DIR=$OUTPUT_PATH dpkg-buildpackage -b -us -uc
LD_LIBRARY_PATH=$SAVE_LDLP
-if [[ "$OUTPUT_PATH" ]]; then
- mv ../${PACKAGE}_*.deb "$OUTPUT_PATH"/
- mv ../${PACKAGE}_*.changes "$OUTPUT_PATH"/
-fi
+mv ../${PACKAGE}_*.deb "$OUTPUT_PATH"/
+mv ../${PACKAGE}_*.changes "$OUTPUT_PATH"/
« no previous file with comments | « remoting/host/installer/linux/Makefile ('k') | remoting/remoting_host_linux.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698