r22861 - gnucash/trunk/packaging/win32 - Win32 build: Add more output for debugging.
Christian Stimming
cstim at code.gnucash.org
Mon Apr 1 15:37:31 EDT 2013
Author: cstim
Date: 2013-04-01 15:37:31 -0400 (Mon, 01 Apr 2013)
New Revision: 22861
Trac: http://svn.gnucash.org/trac/changeset/22861
Modified:
gnucash/trunk/packaging/win32/build_package.sh
gnucash/trunk/packaging/win32/build_tags.sh
Log:
Win32 build: Add more output for debugging.
Modified: gnucash/trunk/packaging/win32/build_package.sh
===================================================================
--- gnucash/trunk/packaging/win32/build_package.sh 2013-04-01 18:44:47 UTC (rev 22860)
+++ gnucash/trunk/packaging/win32/build_package.sh 2013-04-01 19:37:31 UTC (rev 22861)
@@ -77,12 +77,14 @@
if [ ! -d ${_OUTPUT_DIR} ] ; then
echo "Error: _OUTPUT_DIR=${_OUTPUT_DIR} does not exist" >> ${LOGFILE}
fi
-if [ ! -f ${_GNUCASH_UDIR}/${SETUP_FILENAME} ] ; then
+if [ -f ${_GNUCASH_UDIR}/${SETUP_FILENAME} ] ; then
+ echo "Successfully created ${SETUP_FILENAME} in ${_GNUCASH_UDIR}" >> ${LOGFILE}
+else
echo "Error: File _GNUCASH_UDIR/SETUP_FILENAME = ${_GNUCASH_UDIR}/${SETUP_FILENAME} does not exist" >> ${LOGFILE}
echo "Files in _GNUCASH_UDIR:" >> ${LOGFILE}
ls ${_GNUCASH_UDIR}/* >> ${LOGFILE}
fi
-mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR}
+mv ${_GNUCASH_UDIR}/${SETUP_FILENAME} ${_OUTPUT_DIR} >> ${LOGFILE} 2>&1
#
# Verify that PKG_VERSION == $tag, and add to the build log if it's not.
@@ -103,10 +105,10 @@
# If we're running on the build server then upload the files
if [ `hostname` = "gnucash-win32" ]; then
# Small hack to create the $TARGET_DIR on the webserver if it doesn't exist yet
- mkdir -p "$_OUTPUT_DIR/$TARGET_DIR"
- scp -r "$_OUTPUT_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32
- rmdir "$_OUTPUT_DIR/$TARGET_DIR"
+ mkdir -p "$_OUTPUT_DIR/$TARGET_DIR" >> ${LOGFILE} 2>&1
+ scp -r "$_OUTPUT_DIR/$TARGET_DIR" upload at code.gnucash.org:public_html/win32 >> ${LOGFILE} 2>&1
+ rmdir "$_OUTPUT_DIR/$TARGET_DIR" >> ${LOGFILE} 2>&1
# Copy the files to the chosen target directory
+ scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR >> ${LOGFILE} 2>&1
scp -p ${LOGFILE} upload at code.gnucash.org:public_html/win32/$LOG_DIR
- scp -p ${_OUTPUT_DIR}/${SETUP_FILENAME} upload at code.gnucash.org:public_html/win32/$TARGET_DIR
fi
Modified: gnucash/trunk/packaging/win32/build_tags.sh
===================================================================
--- gnucash/trunk/packaging/win32/build_tags.sh 2013-04-01 18:44:47 UTC (rev 22860)
+++ gnucash/trunk/packaging/win32/build_tags.sh 2013-04-01 19:37:31 UTC (rev 22861)
@@ -60,15 +60,18 @@
tagdir=${tagbasedir}/gnucash
rm -fr $tagbasedir
mkdir -p ${tagdir}
+ echo "Building tag $tag in $tagbasedir."
# Copy the downloads to save time
mkdir -p ${tagbasedir}/downloads
cp -p $(unix_path ${DOWNLOAD_DIR})/* ${tagbasedir}/downloads
+ echo "Successfully copied the downloads dir to ${tagbasedir}/downloads"
# Check out the tag and setup custom.sh
svn co -q ${TAG_URL}/${tag} ${tagdir}/repos
w32pkg=${tagdir}/repos/packaging/win32
cp -p "${pkgdir}/custom.sh" ${w32pkg}/custom.sh
+ echo "Successfully checked out the sources"
# Set the global directory to the tag build
echo -n 'GLOBAL_DIR=c:\\soft\\gnucash-' >> ${w32pkg}/custom.sh
More information about the gnucash-changes
mailing list