Append `.sh' to packaging/win32/{functions,defaults}.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@16000 57a11ea4-9604-0410-9ed3-97b8803252fd

packaging/win32/Makefile.am

@@ -1,9 +1,9 @@
 EXTRA_DIST = \
   README \
-  defaults \
+  defaults.sh \
   dist.sh \
   exetype.pl \
-  functions \
+  functions.sh \
   goffice-0.3.7-patch.diff \
   install.sh \
   libofx-0.8.3-patch.diff \

packaging/win32/README

@@ -5,8 +5,8 @@ For cross-compiling the windows executable on Linux, see the lower
 section of this file.
 
 Before you start with the automated build, you have to complete these
-steps manually. The directory variables are set in `defaults' and optionally
-`custom'.
+steps manually. The directory variables are set in `defaults.sh' and optionally
+`custom.sh'.
 
 * Download MSYS (but *only* msys; no mingw and no msysdtk)
 from http://www.mingw.org/download.shtml -> Current -> MSYS -> (bin, *.exe)
@@ -19,12 +19,12 @@ to $MSYS_DIR
 from http://www.mingw.org/download.shtml -> Current -> mingwPORT -> (bin, wget-*)
 to $DOWNLOAD_DIR
 
-* Look at defaults and create a file named custom to specify adapted directory
+* Look at defaults.sh and create a file named custom.sh to specify adapted directory
   variables.  If you want verbose output of any script
   step, add "set -x" to that file.
 
 * Either, download Qt from http://www.trolltech.com/developer/downloads/qt/windows,
-  install it and set QTDIR in custom, like "QTDIR=/c/Qt/4.2.3"; or skip building
+  install it and set QTDIR in custom.sh, like "QTDIR=/c/Qt/4.2.3"; or skip building
   the AqBanking Setup Wizard by specifying "AQBANKING_WITH_QT=no".
 
 Start/Enter any MSYS shell window. Let the automated build begin by:
@@ -58,19 +58,19 @@ These steps need to be performed:
    script create_cross_mingw.sh - it will
    download, compile, and install a mingw32 toolchain.
 
-2. Edit the file defaults: Make a global search-and-replace of
+2. Edit the file defaults.sh: Make a global search-and-replace of
    '\\' into '/' so that all directories are specified in unix
    conventions. Set the variable cross_compile to "yes". Then
-   adjust the directories in defaults according to your
+   adjust the directories in defaults.sh according to your
    preferred installation, especially $GLOBAL_DIR.
 
 3. Download a binary windows packages for "guile" e.g. from
    http://www.tu-harburg.de/~et2cs/gnc/ and unpack it into the
-   directory $GUILE_DIR as given in defaults. (This is done because
+   directory $GUILE_DIR as given in defaults.sh. (This is done because
    the build system for guile doesn't support cross-compiling.)
 
 4. Call install.sh, which will read the directory settings from
-   defaults. It should download, compile, and install everything
+   defaults.sh. It should download, compile, and install everything
    automatically. Eventually the windows gnucash is installed into
    $GNUCASH_DIR. 
 

packaging/win32/defaults.sh

@@ -1,6 +1,6 @@
 #!/bin/sh # for emacs
 #
-# Instead of just editing this file, it is recommended to create a file `custom'
+# Instead of just editing this file, it is recommended to create a file `custom.sh'
 # in the same directory that will be read in at the beginning of this script.
 #
 # You can use the full power of bash 2.04 scripting.  In particular, you can
@@ -16,7 +16,7 @@
 #
 # Note: All directories must be without spaces!
 #
-# Here is an example custom file:
+# Here is an example custom.sh file:
 #
 # REPOS_URL="svn+ssh://<dev>@svn.gnucash.org/repo/gnucash/trunk"
 # SF_MIRROR="http://switch.dl.sourceforge.net/sourceforge"
@@ -32,7 +32,7 @@
 [ "$__SOURCED_DEFAULTS" ] && return
 __SOURCED_DEFAULTS=1
 
-[ -f "custom" ] && . custom || true
+[ -f "custom.sh" ] && . custom.sh || true
 
 set_default GLOBAL_DIR c:\\soft
 set_default TMP_DIR $GLOBAL_DIR\\tmp
@@ -257,7 +257,7 @@ set_default AQBANKING_URL "$SF_MIRROR/aqbanking/aqbanking-2.2.9.tar.gz"
 set_default AQBANKING_DIR $GLOBAL_DIR\\aqbanking
 set_default AQBANKING_WITH_QT yes
 # If set to yes, download Qt from http://www.trolltech.com/developer/downloads/qt/windows,
-# install it and set QTDIR in custom, like "QTDIR=/c/Qt/4.2.3".
+# install it and set QTDIR in custom.sh, like "QTDIR=/c/Qt/4.2.3".
 
 set_default DOCBOOK_XSL_URL "$SF_MIRROR/docbook/docbook-xsl-1.72.0.zip"
 set_default DOCS_URL "http://svn.gnucash.org/repo/gnucash-docs/trunk"

packaging/win32/dist.sh

@@ -7,8 +7,8 @@ function qpopd() { popd >/dev/null; }
 function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
 
 qpushd "$(dirname $(unix_path "$0"))"
-. functions
-. defaults
+. functions.sh
+. defaults.sh
 
 register_env_var PATH ":"
 

packaging/win32/install.sh

@@ -7,8 +7,8 @@ function qpopd() { popd >/dev/null; }
 function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
 
 qpushd "$(dirname $(unix_path "$0"))"
-. functions
-. defaults
+. functions.sh
+. defaults.sh
 
 register_env_var ACLOCAL_FLAGS " "
 register_env_var AUTOTOOLS_CPPFLAGS " "
@@ -834,7 +834,7 @@ function inst_qt4() {
     # already useful in itself and that's why it has already been
     # added.
 
-    [ "$QTDIR" ] || die "QTDIR is not set.  Please install Qt and set that variable in custom, or deactivate AQBANKING_WITH_QT"
+    [ "$QTDIR" ] || die "QTDIR is not set.  Please install Qt and set that variable in custom.sh, or deactivate AQBANKING_WITH_QT"
     export QTDIR=`unix_path ${QTDIR}`  # help configure of aqbanking
     _QTDIR=$QTDIR
     # This section creates .la files for the Qt-4 DLLs so that

packaging/win32/reset.sh

@@ -2,15 +2,15 @@
 
 set -e
 
-####  Load defaults
+####  Load defaults.sh
 
 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
-. defaults
+. functions.sh
+. defaults.sh
 
 ## too bad, bash 2.04 has no real support for arrays