Reassign default URL for download of setup tool components.

diff --git a/ChangeLog b/ChangeLog
index 2f37bbf..7d9e105 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2013-08-24  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Reassign default URL for download of setup tool components.
+
+       * aclocal.m4 (PACKAGE_DIST_DOMAIN, PACKAGE_DIST_DIR): New precious
+       variables; declare them as such, and assign default values by using...
+       (MINGW_AC_PACKAGE_DIST_URL): ...this new macro; implement it.
+
+       * configure.ac (MINGW_AC_PACKAGE_DIST_URL): Use it.
+       * Makefile.in (TAG_SCRIPT): Capture assigned URL; substitute it...
+       (PACKAGE_DIST_URL): ...for this replacement text marker...
+       * src/setup.rc (ID_DOWNLOAD_HOST_URI): ...here.
+
 2013-08-21  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Simplify guimain.exe duplicate instance prevention.

diff --git a/Makefile.in b/Makefile.in
index 8808507..b866e6f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -134,6 +134,7 @@ TAG_SCRIPT = tag=$(BUILD_TAG); \
     -e "s!%PACKAGE_VERINFO_PRODUCT_VERSION%!`$(PACKAGE_VERINFO_SCRIPT)`!g" \
     -e "s!%PACKAGE_BASE_DISTNAME%!$(PACKAGE_DISTNAME)$$tag-%s.$(TAREXT)!g" \
     -e "s!%PACKAGE_DATA_DISTNAME%!$(SETUP_DISTNAME)$$tag-%s.$(TAREXT)!g" \
+    -e "s!%PACKAGE_DIST_URL%!@PACKAGE_DIST_DOMAIN@/@PACKAGE_DIST_DIR@!g" \
     -e "s!%COPYRIGHT_HOLDER%!@COPYRIGHT_HOLDER@!g" \
     -e "s!%YEARS_OF_ISSUE%!@YEARS_OF_ISSUE@!g"
 

diff --git a/aclocal.m4 b/aclocal.m4
index 0431ce5..873e9b9 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -3,7 +3,7 @@
 # $Id$
 #
 # Written by Keith Marshall <keithmarshall@users.sourceforge.net>
-# Copyright (C) 2009, 2010, MinGW Project
+# Copyright (C) 2009, 2010, 2013, MinGW.org Project
 #
 #
 # Configuration script for mingw-get
@@ -25,6 +25,20 @@
 m4_include([build-aux/m4/missing.m4])
 m4_include([build-aux/m4/makeopts.m4])
 
+# MINGW_AC_PACKAGE_DIST_URL( DOMAIN, PATH )
+# -----------------------------------------
+# Provides a mechanism for specifying the internet DOMAIN, and the
+# directory PATH relative to that DOMAIN, whence project packages are
+# to be offered for download.  Precious variables PACKAGE_DIST_DOMAIN
+# and PACKAGE_DIST_DIR are assigned the default values as specified
+# for DOMAIN and PATH respectively; AC_SUBST is called for each.
+#
+AC_DEFUN([MINGW_AC_PACKAGE_DIST_URL],
+[: ${PACKAGE_DIST_DOMAIN="$1"} ${PACKAGE_DIST_DIR="$2"}dnl
+ AC_ARG_VAR([PACKAGE_DIST_DOMAIN],[Package download domain url [$1]])dnl
+ AC_ARG_VAR([PACKAGE_DIST_DIR],[Package download host directory [$2]])dnl
+])# MINGW_AC_PACKAGE_DIST_URL
+
 # MINGW_AC_OUTPUT
 # ---------------
 # A wrapper for AC_OUTPUT itself, to ensure that missing prerequisite

diff --git a/configure.ac b/configure.ac
index d660076..20550db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,13 @@
   AC_SUBST([COPYRIGHT_HOLDER],["MinGW.org Project"])
   AC_SUBST([YEARS_OF_ISSUE],["2009-2013"])
 
+# Specify the default internet domain and relative directory path,
+# whence packages are to be offered for download; user may remap these
+# at configure time, by specifying alternatives for either, or both of
+# the precious variables, PACKAGE_DIST_DOMAIN and PACKAGE_DIST_DIR.
+#
+  MINGW_AC_PACKAGE_DIST_URL([http://prdownloads.sourceforge.net],[mingw])
+
 # Identify the formal release classes for each of the CLI and the GUI
 # application sub-packages; these may be overriden at configure time,
 # by specifying a common SNAPSHOT_CLASS definition, (e.g. by running

diff --git a/src/setup.rc b/src/setup.rc
index e94c832..709ff31 100644 (file)
--- a/src/setup.rc
+++ b/src/setup.rc
@@ -93,7 +93,7 @@ STRINGTABLE DISCARDABLE
     ID_MAIN_WINDOW_CLASS               "mingw-get"
     ID_MAIN_WINDOW_CAPTION             "MinGW Installation Manager"
     ID_MAIN_DIALOGUE_CAPTION            VERINFO_FILE_DESCRIPTION
-    ID_DOWNLOAD_HOST_URI               "http://prdownloads.sourceforge.net/keithmarshall.u/%F?download"
+    ID_DOWNLOAD_HOST_URI               "%PACKAGE_DIST_URL%/%F?download"
     ID_PACKAGE_BASE_DISTNAME           "%PACKAGE_BASE_DISTNAME%"
     ID_PACKAGE_DATA_DISTNAME           "%PACKAGE_DATA_DISTNAME%"
     ID_FONT_PREF                       "Verdana"