From 663c4d5d2341ef71bdd0b54468a38286358f065c Mon Sep 17 00:00:00 2001
From: Michael Butscher <mbutscher@gmx.de>
Date: Mon, 8 Jan 2018 00:27:07 +0100
Subject: [PATCH] Support for building Windows binary with py2exe with Python
 3.4

This needs a modified py2exe. Used version at the time of this commit is at:

https://github.com/WikidPad/Accessory-py2exe/tree/16924397248156269e19c6d620390bfc8cab18e7
---
 bld.bat            |  2 --
 buildGadflyZips.py | 46 ----------------------------------------------
 setup.py           | 18 +++++++++---------
 3 files changed, 9 insertions(+), 57 deletions(-)
 delete mode 100644 buildGadflyZips.py

diff --git a/bld.bat b/bld.bat
index 23e9450a..f4534e0a 100644
--- a/bld.bat
+++ b/bld.bat
@@ -1,7 +1,5 @@
 SET PYTHONPATH=lib
 del icons\Thumbs.db
-python buildGadflyZips.py
 python updateI18N.py
 python setup.py py2exe
 copy license.txt dist\license.txt
-copy gadfly_small.zip dist\gadfly.zip
diff --git a/buildGadflyZips.py b/buildGadflyZips.py
deleted file mode 100644
index 98e674ef..00000000
--- a/buildGadflyZips.py
+++ /dev/null
@@ -1,46 +0,0 @@
-import sys, os, os.path, zipfile
-
-from distutils.util import byte_compile
-
-# Build dirlist
-
-print("Build Gadfly Zip Files")
-print("Collecting files...")
-
-walkedFiles = list(os.walk("lib/gadfly"))
-
-filesToZip = []
-
-for dirpath, dirname, filenames in walkedFiles:
-    for filename in filenames:
-        if not filename.endswith(".py"):
-            continue
-            
-        src = os.path.join(dirpath, filename)
-        ziptarget = os.path.join(dirpath[4:], filename)
-        filesToZip.append((src, ziptarget))
-
-filesToZip.append(("sql_mar.py", "sql_mar.py"))
-
-filesToCompile = [f[0] for f in filesToZip]
-
-print("Compiling scripts...")
-byte_compile(filesToCompile, optimize=0, force=1)
-byte_compile(filesToCompile, optimize=2, force=1)
-
-zfilefull = zipfile.ZipFile("gadfly.zip", "w", zipfile.ZIP_DEFLATED)
-zfilesmall = zipfile.ZipFile("gadfly_small.zip", "w", zipfile.ZIP_DEFLATED)
-
-
-print("Compressing files...")
-for src, ziptarget in filesToZip:
-    zfilefull.write(src, ziptarget)
-    if src.endswith(".py"):
-        zfilefull.write(src+"c", ziptarget+"c")
-        zfilefull.write(src+"o", ziptarget+"o")
-        zfilesmall.write(src+"o", ziptarget+"o")
-
-
-zfilefull.close()
-zfilesmall.close()
-
diff --git a/setup.py b/setup.py
index 18a21023..0a771920 100644
--- a/setup.py
+++ b/setup.py
@@ -8,14 +8,14 @@
     print("This setup.py file is solely made for building the Windows binary")
     print("")
     raise
-from py2exe.build_exe import Target
+from py2exe.runtime import Target
 
 
 wikidpad = Target(
     # used for the versioninfo resource
-    version = '2.3',
+    version = '2.4',
     name = 'WikidPad',
-    copyright = '(C) 2005-2016 Jason Horman, Michael Butscher, Gerhard Reitmayr',
+    copyright = '(C) 2005-2018 Michael Butscher, Jason Horman, Gerhard Reitmayr',
     description = 'Single user wiki notepad',
     comments='',
 
@@ -29,22 +29,22 @@
 
 setup(
     options = {"py2exe": {"compressed": 1,
-                          "exeoptimize": 1, # Opt.mode of the exe stub
+                         "exeoptimize": 1, # Opt.mode of the exe stub
                           "optimize": 2,  # Opt.mode for compiling library.zip
-                          "ascii": 1,
+                          ## "ascii": 1,
                           "excludes": excludes,
                           "dll_excludes": ["msvcp90.dll"]}},
 
     name='WikidPad',
-    version = '2.3',
+    version = '2.4',
     author = 'Michael Butscher',
     author_email = 'mbutscher@gmx.de',
     url = 'http://www.mbutscher.de/software.html',
     ## scripts=['WikidPad.py'],
     windows = [wikidpad],
+#     console = [wikidpad],
     package_dir = {'': 'lib'},
     packages = ['pwiki', 'pwiki.wikidata', 'pwiki.wikidata.compact_sqlite',
-              'pwiki.wikidata.original_gadfly',
               'pwiki.wikidata.original_sqlite', 'pwiki.timeView',
               'pwiki.rtlibRepl'],
     # py_modules=['encodings.utf_8', 'encodings.latin_1'],
@@ -52,8 +52,8 @@
 #                 ('lib', glob('sql_mar.*')),
           ('extensions', glob('extensions/*.*')),
           ('extensions/wikidPadParser', glob('extensions/wikidPadParser/*.*')),
-          ('', ['sqlite3.dll', 'WikidPad.xrc', 'readme_Wic.txt', 'gadfly.zip',
-              'langlist.txt', 'appbase.css'] + glob('WikidPad_*.po')),
+          ('', ['sqlite3.dll', 'WikidPad.xrc', 'langlist.txt',
+              'appbase.css'] + glob('WikidPad_*.po')),
           ('WikidPadHelp', glob(os.path.join('WikidPadHelp', '*.wiki'))),
           (os.path.join('WikidPadHelp', 'data'),
               glob(os.path.join('WikidPadHelp', 'data', '*.*'))),