r18126 - gnucash/trunk/packaging/win32 - More updates the build-tags scripts:

[Derek Atkins]

Author: warlord
Date: 2009-06-13 15:42:23 -0400 (Sat, 13 Jun 2009)
New Revision: 18126
Trac: http://svn.gnucash.org/trac/changeset/18126

Modified:
   gnucash/trunk/packaging/win32/build_tags.sh
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
More updates the build-tags scripts:
* fix the GLOBAL_DIR definition
* Point to the 'global' HH_DIR so we don't reinstall it
* Use the build_package script from trunk
* Don't save the environment to /etc/profile.d on the build server
* re-add the ability to have an aqbanking patch (3.8.3 doesn't build)
* add the NO_SAVE_PROFILE flag

Modified: gnucash/trunk/packaging/win32/build_tags.sh
===================================================================
--- gnucash/trunk/packaging/win32/build_tags.sh	2009-06-13 13:42:02 UTC (rev 18125)
+++ gnucash/trunk/packaging/win32/build_tags.sh	2009-06-13 19:42:23 UTC (rev 18126)
@@ -53,7 +53,8 @@
   cp -p "${pkgdir}/custom.sh" ${w32pkg}/custom.sh
 
   # Set the global directory to the tag build
-  echo "GLOBAL_DIR=c:\soft\gnucash-${tag}" >> ${w32pkg}/custom.sh
+  echo -n 'GLOBAL_DIR=c:\\soft\\gnucash-' >> ${w32pkg}/custom.sh
+  echo "${tag}" >> ${w32pkg}/custom.sh
 
   # No need to update the sources we just checked out
   echo "UPDATE_SOURCES=no" >> ${w32pkg}/custom.sh
@@ -64,8 +65,13 @@
   # so this hack works!
   echo "BUILD_FROM_TARBALL=maybe" >> ${w32pkg}/custom.sh
 
+  # Point HH_DIR at the global installation because we don't need to redo it
+  echo -n "HH_DIR=" >> ${w32pkg}/custom.sh
+  echo "${GLOBAL_DIR}\\hh" | sed -e 's/\\/\\\\/g' >> ${w32pkg}/custom.sh
+
   # Now build the tag!  (this will upload it too)
+  # Use the build_package script from trunk (cwd), not from the tag
   qpushd ${w32pkg}
-    ./build_package.sh ${tag}
+    ${pkgdir}/build_package.sh ${tag}
   qpopd
 done

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2009-06-13 13:42:02 UTC (rev 18125)
+++ gnucash/trunk/packaging/win32/defaults.sh	2009-06-13 19:42:23 UTC (rev 18126)
@@ -24,6 +24,7 @@
 # AQBANKING_WITH_QT=no
 # GLOBAL_DIR=Z:\\mydir  # all directories will use this
 # WGET_RATE=50k         #limit download bandwith to 50KB/s
+# NO_SAVE_PROFILE=yes   # don't save env settings to /etc/profile.d
 # late_eval 'INSTALL_DIR=$GNUCASH_DIR\\myinst'  # no need to define GNUCASH_DIR
 # block_step inst_docs
 # late_eval 'add_step greetings'
@@ -274,6 +275,7 @@
     set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.3.3.tar.gz"
 else
     set_default AQBANKING_URL "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=35&file=01&dummy=aqbanking-3.8.3.tar.gz"
+    #set_default AQBANKING_PATCH `pwd`/aqbanking-3.8.3-patch.diff
 fi
 set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
 set_default AQBANKING_WITH_QT yes

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2009-06-13 13:42:02 UTC (rev 18125)
+++ gnucash/trunk/packaging/win32/install.sh	2009-06-13 19:42:23 UTC (rev 18126)
@@ -985,6 +985,10 @@
             fi
             if test x$AQBANKING_WITH_QT = xyes; then
                 inst_qt4
+                if [ -n "$AQBANKING_PATCH" -a -f "$AQBANKING_PATCH" ] ; then
+                    patch -p1 < $AQBANKING_PATCH
+                    autoconf
+                fi
                 ./configure ${HOST_XCOMPILE} \
                     --with-gwen-dir=${_GWENHYWFAR_UDIR} \
                     --with-xmlmerge=${XMLMERGE} \
@@ -1328,27 +1332,29 @@
 
 function finish() {
     setup Finish...
-    _NEW=x
-    for _ENV in $ENV_VARS; do
-        _ADDS=`eval echo '"\$'"${_ENV}"'_ADDS"'`
-        if [ "$_ADDS" ]; then
-            if [ "$_NEW" ]; then
-                echo
-                echo "Environment variables changed, please do the following"
-                echo
-                [ -d /etc/profile.d ] || echo "mkdir -p /etc/profile.d"
-                _NEW=
+    if [ "$NO_SAVE_PROFILE" != "yes" ]; then
+        _NEW=x
+        for _ENV in $ENV_VARS; do
+            _ADDS=`eval echo '"\$'"${_ENV}"'_ADDS"'`
+            if [ "$_ADDS" ]; then
+                if [ "$_NEW" ]; then
+                    echo
+                    echo "Environment variables changed, please do the following"
+                    echo
+                    [ -d /etc/profile.d ] || echo "mkdir -p /etc/profile.d"
+                    _NEW=
+                fi
+                _VAL=`eval echo '"$'"${_ENV}_BASE"'"'`
+                if [ "$_VAL" ]; then
+                    _CHANGE="export ${_ENV}=\"${_ADDS}"'$'"${_ENV}\""
+                else
+                    _CHANGE="export ${_ENV}=\"${_ADDS}\""
+                fi
+                echo $_CHANGE
+                echo echo "'${_CHANGE}' >> /etc/profile.d/installer.sh"
             fi
-            _VAL=`eval echo '"$'"${_ENV}_BASE"'"'`
-            if [ "$_VAL" ]; then
-                _CHANGE="export ${_ENV}=\"${_ADDS}"'$'"${_ENV}\""
-            else
-                _CHANGE="export ${_ENV}=\"${_ADDS}\""
-            fi
-            echo $_CHANGE
-            echo echo "'${_CHANGE}' >> /etc/profile.d/installer.sh"
-        fi
-    done
+        done
+    fi
     if [ "$CROSS_COMPILE" = "yes" ]; then
         echo "You might want to create a binary tarball now as follows:"
         qpushd $GLOBAL_DIR