r15952 - gnucash/trunk/packaging/win32 - Replace monolithic MinGW setup by smaller and reusable downloads.

[Andreas Köhler]

Author: andi5
Date: 2007-04-21 14:14:42 -0400 (Sat, 21 Apr 2007)
New Revision: 15952
Trac: http://svn.gnucash.org/trac/changeset/15952

Modified:
   gnucash/trunk/packaging/win32/defaults
   gnucash/trunk/packaging/win32/install.sh
Log:
Replace monolithic MinGW setup by smaller and reusable downloads.

Modified: gnucash/trunk/packaging/win32/defaults
===================================================================
--- gnucash/trunk/packaging/win32/defaults	2007-04-21 16:32:11 UTC (rev 15951)
+++ gnucash/trunk/packaging/win32/defaults	2007-04-21 18:14:42 UTC (rev 15952)
@@ -109,7 +109,11 @@
 
 set_default DTK_URL "$SF_MIRROR/mingw/msysDTK-1.0.1.exe"
 
-set_default MINGW_URL "$SF_MIRROR/mingw/MinGW-5.1.0.exe"
+set_default BINUTILS_URL "$SF_MIRROR/mingw/binutils-2.15.91-20040904-1.tar.gz"
+set_default GCC_CORE_URL "$SF_MIRROR/mingw/gcc-core-3.4.2-20040916-1.tar.gz"
+set_default GCC_GPP_URL "$SF_MIRROR/mingw/gcc-g++-3.4.2-20040916-1.tar.gz"
+set_default MINGW_RT_URL "$SF_MIRROR/mingw/mingw-runtime-3.12.tar.gz"
+set_default W32API_URL "$SF_MIRROR/mingw/w32api-3.9.tar.gz"
 set_default MINGW_DIR $GLOBAL_DIR\\mingw
 
 set_default UNZIP_URL "$SF_MIRROR/gnuwin32/unzip-5.51-1.exe"

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2007-04-21 16:32:11 UTC (rev 15951)
+++ gnucash/trunk/packaging/win32/install.sh	2007-04-21 18:14:42 UTC (rev 15952)
@@ -110,15 +110,18 @@
 
 function inst_mingw() {
     setup MinGW
+    _MINGW_UDIR=`unix_path $MINGW_DIR`
+    _MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
     if quiet ${CC} --version && quiet g++ --version && quiet ${LD} --help
     then
         echo "mingw already installed.  skipping."
     else
-        _MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
-        smart_wget $MINGW_URL $DOWNLOAD_DIR
-        echo "!!! Install g++ !!!"
-        echo "!!! When asked for an installation path, specify $MINGW_DIR !!!"
-        $LAST_FILE
+        mkdir -p $_MINGW_UDIR
+        wget_unpacked $BINUTILS_URL $DOWNLOAD_DIR $MINGW_DIR
+        wget_unpacked $GCC_CORE_URL $DOWNLOAD_DIR $MINGW_DIR
+        wget_unpacked $GCC_GPP_URL $DOWNLOAD_DIR $MINGW_DIR
+        wget_unpacked $MINGW_RT_URL $DOWNLOAD_DIR $MINGW_DIR
+        wget_unpacked $W32API_URL $DOWNLOAD_DIR $MINGW_DIR
         (echo "y"; echo "y"; echo "$_MINGW_WFSDIR") | sh pi.sh
     fi
     quiet ${CC} --version && quiet g++ --version && quiet ${LD} --help || die "mingw not installed correctly"