Scripting interface

nsisbuilder/__init__.py

@@ -12,15 +12,21 @@ DEFAULT_PY_VERSION = '3.3.2'
 DEFAULT_BUILD_DIR = pjoin('build', 'nsis')
 DEFAULT_ICON = pjoin(_PKGDIR, 'glossyorb.ico')
 DEFAULT_INSTALLER_NAME = 'pynsis_installer.exe'
+if os.name == 'nt' and sys.maxsize == (2**63)-1:
+    DEFAULT_BITNESS = 64
+else:
+    DEFAULT_BITNESS = 32
 
-def fetch_python(version=DEFAULT_PY_VERSION, destination=DEFAULT_BUILD_DIR):
+def fetch_python(version=DEFAULT_PY_VERSION, bitness=DEFAULT_BITNESS,
+                 destination=DEFAULT_BUILD_DIR):
     """Fetch the MSI for the specified version of Python.
     
     It will be placed in the destination directory, and validated using GPG
     if possible.
     """
-    url = 'http://python.org/ftp/python/{0}/python-{0}.msi'.format(version)
-    target = pjoin(destination, 'python-{0}.msi'.format(version))
+    arch_tag = '.amd64' if (bitness==64) else ''
+    url = 'http://python.org/ftp/python/{0}/python-{0}{1}.msi'.format(version, arch_tag)
+    target = pjoin(destination, 'python-{0}{1}.msi'.format(version, arch_tag))
     if os.path.isfile(target):
         return
     urlretrieve(url, target)
@@ -44,18 +50,24 @@ def run_nsis(nsi_file):
     call(['makensis', nsi_file])
 
 def all_steps(appname, version, script, packages=None, icon=DEFAULT_ICON,
-                py_version=DEFAULT_PY_VERSION, build_dir=DEFAULT_BUILD_DIR,
+                py_version=DEFAULT_PY_VERSION, py_bitness=DEFAULT_BITNESS,
+                build_dir=DEFAULT_BUILD_DIR,
                 installer_name=DEFAULT_INSTALLER_NAME):
     os.makedirs(build_dir, exist_ok=True)
-    fetch_python(destination=build_dir)
+    fetch_python(version=py_version, bitness=py_bitness, destination=build_dir)
     shutil.copy2(script, build_dir)
     shutil.copy2(icon, build_dir)
+    
+    # Packages
     build_pkg_dir = pjoin(build_dir, 'pkgs')
+    if os.path.isdir(build_pkg_dir):
+        shutil.rmtree(build_pkg_dir)
     if os.path.isdir('pynsis_pkgs'):
         shutil.copytree('pynsis_pkgs', build_pkg_dir)
     else:
         os.mkdir(build_pkg_dir)
     copy_modules(packages or [], build_pkg_dir)
+
     nsi_file = pjoin(build_dir, 'installer.nsi')
     definitions = {'PRODUCT_NAME': appname,
                    'PRODUCT_VERSION': version,
@@ -63,6 +75,7 @@ def all_steps(appname, version, script, packages=None, icon=DEFAULT_ICON,
                    'SCRIPT': os.path.basename(script),
                    'PRODUCT_ICON': os.path.basename(icon),
                    'INSTALLER_NAME': installer_name,
+                   'ARCH_TAG': '.amd64' if (py_bitness==64) else ''
                   }
     write_nsis_file(nsi_file, definitions)
     run_nsis(nsi_file)
@@ -71,13 +84,20 @@ def main(argv=None):
     import argparse
     argp = argparse.ArgumentParser(prog='pynsis')
     argp.add_argument('config_file')
-    options = argp.parse_argv(argv)
+    options = argp.parse_args(argv)
     
     import configparser
     cfg = configparser.ConfigParser()
     cfg.read(options.config_file)
-    
-    #TODO:
-
-if __name__ == '__main__':
-    main()
+    appcfg = cfg['Application']
+    all_steps(
+        appname = appcfg['name'],
+        version = appcfg['version'],
+        script = appcfg['script'],
+        icon = appcfg.get('icon', DEFAULT_ICON),
+        packages = cfg.get('Include', 'packages', fallback='').splitlines(),
+        py_version = cfg.get('Python', 'version', fallback=DEFAULT_PY_VERSION),
+        py_bitness = cfg.getint('Python', 'bitness', fallback=DEFAULT_BITNESS),
+        build_dir = cfg.get('Build', 'directory', fallback=DEFAULT_BUILD_DIR),
+        installer_name = cfg.get('Build', 'installer_name', fallback=DEFAULT_INSTALLER_NAME),
+    )

nsisbuilder/__main__.py

@@ -0,0 +1,2 @@
+from . import main
+main()

nsisbuilder/template.nsi

@@ -28,8 +28,8 @@ Section -SETTINGS
 SectionEnd
 
 Section "Python ${PY_VERSION}" sec_py
-  File "python-${PY_VERSION}.msi"
-  ExecWait 'msiexec /i "$INSTDIR\python-${PY_VERSION}.msi" /qb ALLUSERS=1'
+  File "python-${PY_VERSION}${ARCH_TAG}.msi"
+  ExecWait 'msiexec /i "$INSTDIR\python-${PY_VERSION}{$ARCH_TAG}.msi" /qb ALLUSERS=1'
   Delete $INSTDIR\python-${PY_VERSION}.msi
 SectionEnd