Update the InnoSetup script:

 - Have configure.py create a new var %{innosetup_arch} which means
   one doesn't have to remmeber to uncomment the ArchitecturesAllowed
   and ArchitecturesInstallIn64BitMode for 64-bit installs. Also it
   would theoretically work out of the box for IA-64 installs though
   this is completely untested.

 - InnoSetup 5.5 drops support for Windows 95/98/ME. While I'm in
   there, move MinVersion to 5.1 (XP) since 2000 is (as with 9x)
   totally an unknown quantity (not to mention EOLed).

 - No PDF manual anymore, don't try to install it

 - The files under doc are .rst rather than .txt now

 - Include %{arch} in OutputBaseFilename so I don't have to rename
   the output afterwards.

and outline the process for creating the installer in release_process.rst

1 files changed, 16 insertions, 0 deletions

diff --git a/configure.py b/configure.py
index 44de3693a..2f780a50d 100755
--- a/configure.py
+++ b/configure.py
@@ -1070,6 +1070,20 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
             return maintainer_flags
         return normal_flags
 
+    def innosetup_arch(os, arch):
+        if os != 'windows':
+            return None
+
+        if arch == 'x86_32':
+            return '' # allow 32-bit installs on 64 bit systems
+        elif arch == 'x86_64':
+            return 'x64'
+        elif arch == 'ia64':
+            return 'ia64'
+
+        logging.warn('Unknown arch in innosetup_arch %s' % (arch))
+        return None
+
     return {
         'version_major':  build_config.version_major,
         'version_minor':  build_config.version_minor,
@@ -1107,6 +1121,8 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
         'arch': options.arch,
         'submodel': options.cpu,
 
+        'innosetup_arch': innosetup_arch(options.os, options.arch),
+
         'mp_bits': choose_mp_bits(),
 
         'cc': (options.compiler_binary or cc.binary_name) +