Install licence as standard setup component.

diff --git a/ChangeLog b/ChangeLog
index c41b207..280fbf9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2013-08-13  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
+       Install licence as standard setup component.
+
+       * src/guimain.h src/setup.rc (ID_PACKAGE_GUI_DISTNAME): Macro
+       no longer required; delete definition.
+
+       * src/setup.cpp (pkgSetup::DoFirstTimeInstallation):
+       <pkgSetupAction> [ID_PACKAGE_GUI_DISTNAME]: Delete reference.
+       <pkgSetupAction> [ID_PACKAGE_BASE_DISTNAME]: Update reference; repeat
+       to explicitly address each of "bin", "gui", and "lic" components.
+
+       * Makefile.in (TAG_SCRIPT) [PACKAGE_GUI_DISTNAME]: Delete reference.
+       (TAG_SCRIPT) [PACKAGE_BASE_DISTNAME]: Redefine as template.
+
+2013-08-13  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
        More dialogue box adjustments.
 
        * src/guimain.rc: Generally clean up white-space distribution.

diff --git a/Makefile.in b/Makefile.in
index 7717e56..8808507 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -132,8 +132,7 @@ TAG_SCRIPT = tag=$(BUILD_TAG); \
     -e "s!%PACKAGE_NAME%!$(PACKAGE_TARNAME)!g" \
     -e "s!%PACKAGE_VERSION%!$(PACKAGE_VERSION)$$tag!g" \
     -e "s!%PACKAGE_VERINFO_PRODUCT_VERSION%!`$(PACKAGE_VERINFO_SCRIPT)`!g" \
-    -e "s!%PACKAGE_BASE_DISTNAME%!$(PACKAGE_DISTNAME)$$tag-bin.$(TAREXT)!g" \
-    -e "s!%PACKAGE_GUI_DISTNAME%!$(PACKAGE_DISTNAME)$$tag-gui.$(TAREXT)!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!%COPYRIGHT_HOLDER%!@COPYRIGHT_HOLDER@!g" \
     -e "s!%YEARS_OF_ISSUE%!@YEARS_OF_ISSUE@!g"

diff --git a/src/guimain.h b/src/guimain.h
index c2795c5..2838347 100644 (file)
--- a/src/guimain.h
+++ b/src/guimain.h
@@ -45,7 +45,6 @@
 #define ID_DOWNLOAD_HOST_URI            130
 #define ID_PACKAGE_BASE_DISTNAME        131
 #define ID_PACKAGE_DATA_DISTNAME        132
-#define ID_PACKAGE_GUI_DISTNAME         133
 
 #define ID_PACKAGE_TREEVIEW             201
 #define ID_PACKAGE_LISTVIEW             202

diff --git a/src/setup.cpp b/src/setup.cpp
index e9597d9..9e76778 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -1185,12 +1185,16 @@ inline void SetupTool::DoFirstTimeSetup( HWND AppWindow )
    * beginning with a setup action request for the base package...
    */
   pkgSetupAction *linked, *list;
-  linked = list = new pkgSetupAction( NULL, archive_class( PACKAGE_BASE ) );
+  linked = list = new pkgSetupAction( NULL, archive_class( PACKAGE_BASE ), "bin" );
   if( IsPref( SETUP_OPTION_WITH_GUI ) )
     /*
      * ...optionally adding the GUI extension, at the user's behest...
      */
-    linked = new pkgSetupAction( linked, archive_class( PACKAGE_GUI ) );
+    linked = new pkgSetupAction( linked, archive_class( PACKAGE_BASE ), "gui" );
+
+  /* ...always installing the licence pack...
+   */
+  linked = new pkgSetupAction( linked, archive_class( PACKAGE_BASE ), "lic" );
 
   /* ...and finishing up with the setup DLL and XML data packages.
    */

diff --git a/src/setup.rc b/src/setup.rc
index 4d10d7a..e94c832 100644 (file)
--- a/src/setup.rc
+++ b/src/setup.rc
@@ -96,7 +96,6 @@ STRINGTABLE DISCARDABLE
     ID_DOWNLOAD_HOST_URI               "http://prdownloads.sourceforge.net/keithmarshall.u/%F?download"
     ID_PACKAGE_BASE_DISTNAME           "%PACKAGE_BASE_DISTNAME%"
     ID_PACKAGE_DATA_DISTNAME           "%PACKAGE_DATA_DISTNAME%"
-    ID_PACKAGE_GUI_DISTNAME            "%PACKAGE_GUI_DISTNAME%"
     ID_FONT_PREF                       "Verdana"
   END