r16928 - gnucash/trunk/packaging/win32 - Win32: Factor out make_install step, add make_install.sh.

[Andreas Köhler]

Author: andi5
Date: 2008-02-06 17:50:56 -0500 (Wed, 06 Feb 2008)
New Revision: 16928
Trac: http://svn.gnucash.org/trac/changeset/16928

Added:
   gnucash/trunk/packaging/win32/make_install.sh
Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/functions.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Win32: Factor out make_install step, add make_install.sh.

Make_install.sh can be called in any build directory and will execute
`make install` and all the necessary extra steps after that.

Also, make prepare and finish ordinary steps that can be blocked and
inserted at will.  Add reset_steps.


Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2008-02-04 20:54:45 UTC (rev 16927)
+++ gnucash/trunk/packaging/win32/defaults.sh	2008-02-06 22:50:56 UTC (rev 16928)
@@ -267,6 +267,7 @@
 
 # There is no reason to ever need to comment these out!
 # * commented out glade, as it is not needed to run gnucash
+add_step prepare
 if [ "$CROSS_COMPILE" != "yes" ]; then
  add_step inst_wget
  add_step inst_dtk
@@ -309,6 +310,7 @@
 fi
 add_step inst_gnucash
 add_step inst_docs
+add_step finish
 
 # run commands registered with late_eval
 eval_now

Modified: gnucash/trunk/packaging/win32/functions.sh
===================================================================
--- gnucash/trunk/packaging/win32/functions.sh	2008-02-04 20:54:45 UTC (rev 16927)
+++ gnucash/trunk/packaging/win32/functions.sh	2008-02-06 22:50:56 UTC (rev 16928)
@@ -9,6 +9,7 @@
 }
 
 function block_step() { blocked_steps=("${blocked_steps[@]}" "$@"); }
+function reset_steps() { steps=(); block_steps=(); }
 function add_step() {
     while [ "$1" ]; do
         _is_blocked=

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2008-02-04 20:54:45 UTC (rev 16927)
+++ gnucash/trunk/packaging/win32/install.sh	2008-02-06 22:50:56 UTC (rev 16928)
@@ -1000,9 +1000,13 @@
                 gnucash
         qpopd
 
-        make install
+        make_install
     qpopd
+}
 
+function make_install() {
+    make install
+
     qpushd $_INSTALL_UDIR/lib
         # Move modules that are compiled without -module to lib/gnucash and
         # correct the 'dlname' in the libtool archives. We do not use these
@@ -1137,11 +1141,9 @@
     fi
 }
 
-prepare
 for step in "${steps[@]}" ; do
     eval $step
 done
-finish
 qpopd
 
 

Added: gnucash/trunk/packaging/win32/make_install.sh
===================================================================
--- gnucash/trunk/packaging/win32/make_install.sh	                        (rev 0)
+++ gnucash/trunk/packaging/win32/make_install.sh	2008-02-06 22:50:56 UTC (rev 16928)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+function qpushd() { pushd "$@" >/dev/null; }
+function qpopd() { popd >/dev/null; }
+function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
+
+qpushd "$(dirname $(unix_path "$0"))"
+. functions.sh
+. defaults.sh
+
+reset_steps
+. install.sh
+
+prepare
+qpopd
+make_install