[gnue] r9650 - trunk/gnue-common/packaging/win32

Author: johannes
Date: 2007-05-31 09:36:20 -0500 (Thu, 31 May 2007)
New Revision: 9650

Modified:
   trunk/gnue-common/packaging/win32/setup.cmd
   trunk/gnue-common/packaging/win32/setup.py
Log:
More work on packaging


Modified: trunk/gnue-common/packaging/win32/setup.cmd
===================================================================
--- trunk/gnue-common/packaging/win32/setup.cmd	2007-05-31 13:35:49 UTC (rev 9649)
+++ trunk/gnue-common/packaging/win32/setup.cmd	2007-05-31 14:36:20 UTC (rev 9650)
@@ -72,13 +72,16 @@
 REM ---------------------------------------------------------------------------
 
 @ECHO "Building EXE-File ..." 
-%PYTHON_DRV%
-CD %PYTHON_PATH%\Scripts
+PUSHD %PYTHON_PATH%\Scripts
 
+IF EXIST "dist" RMDIR /S /Q dist
+
 python setup.py py2exe -c %1
 
 xcopy dist %GNUE_PATH%\bin\ /Y
 
-CD %CWD%
+RMDIR /S /Q dist
 
+POPD
+
 :EXIT

Modified: trunk/gnue-common/packaging/win32/setup.py
===================================================================
--- trunk/gnue-common/packaging/win32/setup.py	2007-05-31 13:35:49 UTC (rev 9649)
+++ trunk/gnue-common/packaging/win32/setup.py	2007-05-31 14:36:20 UTC (rev 9650)
@@ -6,6 +6,7 @@
 import sys
 
 import py2exe
+
 from distutils.core import setup
 
 # The manifest will be inserted as resource into .exe files.  This
@@ -35,94 +36,47 @@
 </assembly>
 '''
 
-RT_MANIFEST = 24
-
-
-scripts = \
-  [{"script" : "gnue-navigator", "other_resources" : [(RT_MANIFEST, 1, manifest)]},
-   {"script" : "gnue-designer",  "other_resources" : [(RT_MANIFEST, 1, manifest)]},
-   {"script" : "gnue-forms",     "other_resources" : [(RT_MANIFEST, 1, manifest)]}]
-
-console = ["gnue-appserver",
-           "gnue-gsdgen",
-           "gnue-readgcd",
-           "gnue-readgld",
-           "gnue-reports",
-           "gnue-reports-server",
-           "gnue-schema"]
-windows = scripts
-
-# If run with arg "-k", build console apps.
-if len(sys.argv) == 4:
-  if sys.argv[3] == "-k":
-    print 'Building console apps.'
-    console.extend(scripts)
-    windows = []
-  del sys.argv[3]
-
-
 def getimports(libdir):
-  importlist = []
-  for entry in os.listdir(libdir):
-    if entry.startswith('_') or '-' in entry or \
-       entry.count('.')>1 or ' ' in entry:
-       continue
+    importlist = []
+    for entry in os.listdir(libdir):
+        if entry.startswith('_') or '-' in entry or \
+           entry.count('.')>1 or ' ' in entry:
+            continue
     
-    if not os.path.splitext(entry)[1] == '.py':
-      continue
-    importlist.append(entry[:entry.find('.')])
+        if not os.path.splitext(entry)[1] == '.py':
+            continue
 
-  return importlist
-standardlib = getimports(os.path.join(sys.prefix,'Lib'))
+        importlist.append(entry[:entry.find('.')])
 
+    return importlist
 
-setup ( \
-console = console,
-windows = windows,
-options = {"py2exe": {"typelibs": [('{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}',0,1,1)],
+standardlib = getimports(os.path.join(sys.prefix,'Lib'))
+
+setup( \
+    console = ['gnue-schema'],
+    options = {"py2exe":
+        {"typelibs": [('{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}',0,1,1)],
                                   #'Microsoft Internet Controls'
-                      "packages": ["encodings",
-                                   "wx",
-                                   "mx",
-                                   "adodbapi",
-                                   # "kinterbasdb",
-                                   # "sapdb",
-                                   # "MySQLdb",
-                                   # "sqlite",
-                                   "pysqlite2",
-                                   "_xmlplus",
-                                   "reportlab",
-                                   "PIL"],
-                      "includes": standardlib +
-                                  ["win32gui",
-                                   "win32ui",
-                                   "win32api",
-                                   "win32con",
-                                   "afxres",
-                                   "commctrl",
-                                   "win32clipboard",
-                                   "win32print",
-                                   "win32com.client",
-                                   "pywin.mfc.activex",
-                                   "pywin.mfc.window",
-                                   "ImageWin",
-                                   "BmpImagePlugin",
-                                   "GifImagePlugin",
-                                   "JpegImagePlugin",
-                                   "PpmImagePlugin",
-                                   "PngImagePlugin",
-                                   "TiffImagePlugin",
-                                   "dbi",
-                                   "odbc",
-                                   "pysqlite2.dbapi2",
-                                   "pyPgSQL.PgSQL",
-                                   "psycopg",
-                                   "libxml2",
-                                   "libxslt"],
-#                                   "wxPython.wx",
-#                                   "wxPython.grid"],
-                      "dll_excludes": ["msvcp60.dll",
-                                       "tcl84.dll",
-                                       "tk84.dll",
-                                       "oci.dll"],
-                      "excludes": ["gnue"]}})
+         "packages": ["encodings",
+                      "mx",
+                      "_xmlplus",
+                      "PIL"],
+         "includes": standardlib +
+                     ["afxres",
+                      "ImageWin",
+                      "BmpImagePlugin",
+                      "GifImagePlugin",
+                      "JpegImagePlugin",
+                      "PpmImagePlugin",
+                      "PngImagePlugin",
+                      "TiffImagePlugin",
+                      "libxml2",
+                      "libxslt"],
+         "dll_excludes": ["msvcp60.dll",
+                          "tcl84.dll",
+                          "tk84.dll",
+                          "oci.dll"],
+         "excludes": ["gnue"]
+        }
+    }
+)