| Revisão | 670f37a385b2dfb5745c92d452a21da1b6a96a71 (tree) |
|---|---|
| Hora | 2020-06-13 06:15:08 |
| Autor |  Keith Marshall <keith@user...> |
| Commiter | Keith Marshall |
Use XML templates to adapt to download host changes.
ChangeLog (diff) Makefile.in (diff) configure.ac (diff) src/setup.rc (diff) xml/{profile.xml => profile.xml.in} xml/{setup.xml => setup.xml.in}| @@ -1,3 +1,23 @@ | ||
| 1 | +2020-06-12 Keith Marshall <keith@users.osdn.me> | |
| 2 | + | |
| 3 | + Use XML templates to adapt to download host changes. | |
| 4 | + | |
| 5 | + * configure.ac (MINGW_PACKAGE_DIST_URL): Update to OSDN host URL. | |
| 6 | + | |
| 7 | + * xml/profile.xml: Rename it as... | |
| 8 | + * xml/profile.xml.in: ...this; replace hard-coded repository URL... | |
| 9 | + (%PACKAGE_LIST_URL%/%F.xml.lzma): ...this template. | |
| 10 | + | |
| 11 | + * xml/setup.xml: Likewise, rename it as... | |
| 12 | + * xml/setup.xml.in: ...this, with corresponding URL update. | |
| 13 | + | |
| 14 | + * Makefile.in (install-profile): Modify procedure, using... | |
| 15 | + (%.xml: %.xml.in): ...this new pattern rule, to generate installed XML | |
| 16 | + files, from source templates. | |
| 17 | + | |
| 18 | + * src/setup.rc (STRINGTABLE) <ID_DOWNLOAD_HOST_URI>: Remove trailing | |
| 19 | + "?download" qualifier. | |
| 20 | + | |
| 1 | 21 | 2020-06-11 Keith Marshall <keith@users.osdn.me> |
| 2 | 22 | |
| 3 | 23 | Discontinue formal use of the build-aux submodule. |
| @@ -357,9 +357,12 @@ install: installdirs install-profile | ||
| 357 | 357 | $(INSTALL_DATA) $$image ${libexecdir}/${PACKAGE_TARNAME}; \ |
| 358 | 358 | done |
| 359 | 359 | |
| 360 | -install-profile: | |
| 361 | - $(INSTALL_DATA) ${srcdir}/xml/profile.xml \ | |
| 362 | - ${PACKAGE_CONFIG_DIR}/defaults.xml | |
| 360 | +vpath %.xml.in ${srcdir}/xml | |
| 361 | +install-profile: install-%: %.xml | |
| 362 | + $(INSTALL_DATA) $*.xml ${PACKAGE_CONFIG_DIR}/defaults.xml | |
| 363 | + | |
| 364 | +%.xml: %.xml.in | |
| 365 | + $(TAG_SCRIPT) $< > $@ | |
| 363 | 366 | |
| 364 | 367 | install-strip: install |
| 365 | 368 | for image in $(BIN_PROGRAMS); do \ |
| @@ -33,7 +33,7 @@ | ||
| 33 | 33 | # at configure time, by specifying alternatives for either, or both of |
| 34 | 34 | # the precious variables, PACKAGE_DIST_DOMAIN and PACKAGE_DIST_DIR. |
| 35 | 35 | # |
| 36 | - MINGW_AC_PACKAGE_DIST_URL([http://prdownloads.sourceforge.net],[mingw]) | |
| 36 | + MINGW_AC_PACKAGE_DIST_URL([https://osdn.net],[dl/mingw]) | |
| 37 | 37 | |
| 38 | 38 | # Identify the formal release classes for each of the CLI and the GUI |
| 39 | 39 | # application sub-packages; these may be overriden at configure time, |
| @@ -3,8 +3,8 @@ | ||
| 3 | 3 | * |
| 4 | 4 | * $Id$ |
| 5 | 5 | * |
| 6 | - * Written by Keith Marshall <keithmarshall@users.sourceforge.net> | |
| 7 | - * Copyright (C) 2013, MinGW.org Project | |
| 6 | + * Written by Keith Marshall <keith@users.osdn.me> | |
| 7 | + * Copyright (C) 2013, 2017, 2020, MinGW.org Project | |
| 8 | 8 | * |
| 9 | 9 | * |
| 10 | 10 | * Resource definitions for the mingw-get-setup.exe implementation. |
| @@ -93,9 +93,9 @@ STRINGTABLE DISCARDABLE | ||
| 93 | 93 | ID_MAIN_WINDOW_CLASS "mingw-get" |
| 94 | 94 | ID_MAIN_WINDOW_CAPTION "MinGW Installation Manager" |
| 95 | 95 | ID_MAIN_DIALOGUE_CAPTION VERINFO_FILE_DESCRIPTION |
| 96 | - ID_DOWNLOAD_HOST_URI "%PACKAGE_DIST_URL%/%F?download" | |
| 97 | 96 | ID_PACKAGE_BASE_DISTNAME "%PACKAGE_BASE_DISTNAME%" |
| 98 | 97 | ID_PACKAGE_DATA_DISTNAME "%PACKAGE_DATA_DISTNAME%" |
| 98 | + ID_DOWNLOAD_HOST_URI "%PACKAGE_DIST_URL%/%F" | |
| 99 | 99 | ID_FONT_PREF "Verdana" |
| 100 | 100 | END |
| 101 | 101 |
| @@ -3,8 +3,8 @@ | ||
| 3 | 3 | <!-- |
| 4 | 4 | $Id$ |
| 5 | 5 | |
| 6 | - Written by Keith Marshall <keithmarshall@users.sourceforge.net> | |
| 7 | - Copyright (C) 2009, 2010, 2012, 2013, MinGW.org Project | |
| 6 | + Written by Keith Marshall <keith@users.osdn.me> | |
| 7 | + Copyright (C) 2009-2013, 2017, 2020, MinGW.org Project | |
| 8 | 8 | |
| 9 | 9 | |
| 10 | 10 | Master configuration profile for mingw-get. |
| @@ -70,7 +70,7 @@ | ||
| 70 | 70 | <option name="start-menu" /> |
| 71 | 71 | </preferences> |
| 72 | 72 | |
| 73 | - <repository uri="http://prdownloads.sourceforge.net/mingw/%F.xml.lzma?download"> | |
| 73 | + <repository uri="%PACKAGE_DIST_URL%/%F.xml.lzma"> | |
| 74 | 74 | <!-- |
| 75 | 75 | The "repository" specification identifies the URI where package |
| 76 | 76 | list catalogues may be downloaded; each catalogue download URI is |
| @@ -3,8 +3,8 @@ | ||
| 3 | 3 | <!-- |
| 4 | 4 | $Id$ |
| 5 | 5 | |
| 6 | - Written by Keith Marshall <keithmarshall@users.sourceforge.net> | |
| 7 | - Copyright (C) 2013, MinGW.org Project | |
| 6 | + Written by Keith Marshall <keith@users.osdn.me> | |
| 7 | + Copyright (C) 2013, 2017, 2020, MinGW.org Project | |
| 8 | 8 | |
| 9 | 9 | |
| 10 | 10 | Initial configuration profile for mingw-get-setup. |
| @@ -24,7 +24,7 @@ | ||
| 24 | 24 | arising from the use of this software. |
| 25 | 25 | --> |
| 26 | 26 | |
| 27 | - <repository uri="http://prdownloads.sourceforge.net/mingw/%F.xml.lzma?download"> | |
| 27 | + <repository uri="%PACKAGE_DIST_URL%/%F.xml.lzma"> | |
| 28 | 28 | <!-- |
| 29 | 29 | The "repository" specification identifies the URI whence package |
| 30 | 30 | list catalogues may be downloaded; each catalogue download URI is |
Fork