[Spambayes-checkins] spambayes/windows/py2exe README.txt, 1.1, 1.1.2.1 setup_all.py, 1.7, 1.7.2.1

Tue Nov 4 17:16:46 EST 2003

Update of /cvsroot/spambayes/spambayes/windows/py2exe
In directory sc8-pr-cvs1:/tmp/cvs-serv2964/py2exe

Modified Files:
      Tag: release_1_0
	README.txt setup_all.py 
Log Message:
Merge the head to the 1.0 release branch for the 'windows' directory.  
This includes the service, tray and py2exe/installer.

Index: README.txt
===================================================================
RCS file: /cvsroot/spambayes/spambayes/windows/py2exe/README.txt,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** README.txt	29 Aug 2003 14:46:18 -0000	1.1
--- README.txt	4 Nov 2003 22:16:44 -0000	1.1.2.1
***************
*** 6,10 ****
  Run "setup_all.py"

! You should find a dist directly.  pop3proxy*.exe should all work.  
! addin.exe/addin.dll are the Outlook addin and do not work
! (and will be renamed)
\ No newline at end of file
--- 6,8 ----
  Run "setup_all.py"

! You should find a dist directory.
\ No newline at end of file

Index: setup_all.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/windows/py2exe/setup_all.py,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** setup_all.py	19 Sep 2003 05:42:04 -0000	1.7
--- setup_all.py	4 Nov 2003 22:16:44 -0000	1.7.2.1
***************
*** 29,43 ****
  import py2exe

! class Options:
!     def __init__(self, **kw):
!         self.__dict__.update(kw)
! 
! # py2exe_options is a global name found by py2exe
! py2exe_options = Options(
      packages = "spambayes.resources,encodings",
      excludes = "win32ui,pywin,pywin.debugger", # pywin is a package, and still seems to be included.
      includes = "dialogs.resources.dialogs", # Outlook dynamic dialogs
!     dll_excludes = ["dapi.dll", "mapi32.dll"],
!     lib_dir = "lib",
      typelibs = [
          ('{00062FFF-0000-0000-C000-000000000046}', 0, 9, 0),
--- 29,37 ----
  import py2exe

! py2exe_options = dict(
      packages = "spambayes.resources,encodings",
      excludes = "win32ui,pywin,pywin.debugger", # pywin is a package, and still seems to be included.
      includes = "dialogs.resources.dialogs", # Outlook dynamic dialogs
!     dll_excludes = "dapi.dll,mapi32.dll",
      typelibs = [
          ('{00062FFF-0000-0000-C000-000000000046}', 0, 9, 0),
***************
*** 59,65 ****

  # These are just objects passed to py2exe
! outlook_addin = Options(
      modules = ["addin"],
!     dest_base = "outlook/spambayes_addin",
      bitmap_resources = outlook_bmp_resources,
      create_exe = False,
--- 53,59 ----

  # These are just objects passed to py2exe
! outlook_addin = dict(
      modules = ["addin"],
!     dest_base = "bin/outlook_addin",
      bitmap_resources = outlook_bmp_resources,
      create_exe = False,
***************
*** 69,87 ****
  #    bitmap_resources = outlook_bmp_resources,
  #)
! outlook_dump_props = Options(
      script = os.path.join(sb_top_dir, r"Outlook2000\sandbox\dump_props.py"),
!     dest_base = "outlook/outlook_dump_props",
  )

! service = Options(
!     dest_base = "proxy/pop3proxy_service",
      modules = ["pop3proxy_service"]
  )
! sb_server = Options(
!     dest_base = "proxy/sb_server",
      script = os.path.join(sb_top_dir, "scripts", "sb_server.py")
  )
! pop3proxy_tray = Options(
!     dest_base = "proxy/pop3proxy_tray",
      script = os.path.join(sb_top_dir, "windows", "pop3proxy_tray.py"),
      icon_resources = [(1000, os.path.join(sb_top_dir, r"windows\resources\sb-started.ico")),
--- 63,85 ----
  #    bitmap_resources = outlook_bmp_resources,
  #)
! outlook_dump_props = dict(
      script = os.path.join(sb_top_dir, r"Outlook2000\sandbox\dump_props.py"),
!     dest_base = "bin/outlook_dump_props",
  )

! service = dict(
!     dest_base = "bin/sb_service",
      modules = ["pop3proxy_service"]
  )
! sb_server = dict(
!     dest_base = "bin/sb_server",
      script = os.path.join(sb_top_dir, "scripts", "sb_server.py")
  )
! sb_upload = dict(
!     dest_base = "bin/sb_upload",
!     script = os.path.join(sb_top_dir, "scripts", "sb_upload.py")
! )
! pop3proxy_tray = dict(
!     dest_base = "bin/sb_tray",
      script = os.path.join(sb_top_dir, "windows", "pop3proxy_tray.py"),
      icon_resources = [(1000, os.path.join(sb_top_dir, r"windows\resources\sb-started.ico")),
***************
*** 90,100 ****

  outlook_data_files = [
!     ["outlook", [os.path.join(sb_top_dir, r"Outlook2000\about.html")]],
!     ["outlook/docs", glob.glob(os.path.join(sb_top_dir, r"Outlook2000\docs\*.html"))],
!     ["outlook/docs/images", glob.glob(os.path.join(sb_top_dir, r"Outlook2000\docs\images\*.jpg"))],
!     ["outlook", [os.path.join(sb_top_dir, r"Outlook2000\default_bayes_customize.ini")]],
  ]
  proxy_data_files = [
!     ["proxy", [os.path.join(sb_top_dir, r"windows\readme_proxy.html")]],
  ]

--- 88,98 ----

  outlook_data_files = [
!     ["docs/outlook", [os.path.join(sb_top_dir, r"Outlook2000\about.html")]],
!     ["docs/outlook/docs", glob.glob(os.path.join(sb_top_dir, r"Outlook2000\docs\*.html"))],
!     ["docs/outlook/docs/images", glob.glob(os.path.join(sb_top_dir, r"Outlook2000\docs\images\*.jpg"))],
!     ["docs/outlook", [os.path.join(sb_top_dir, r"Outlook2000\default_bayes_customize.ini")]],
  ]
  proxy_data_files = [
!     ["docs/sb_server", [os.path.join(sb_top_dir, r"windows\readme_proxy.html")]],
  ]

***************
*** 111,118 ****
        service=[service],
        # console exes for debugging
!       console=[sb_server, outlook_dump_props],
        # The taskbar
        windows=[pop3proxy_tray],
        # and the misc data files
        data_files = outlook_data_files + proxy_data_files,
  )
--- 109,118 ----
        service=[service],
        # console exes for debugging
!       console=[sb_server, sb_upload, outlook_dump_props],
        # The taskbar
        windows=[pop3proxy_tray],
        # and the misc data files
        data_files = outlook_data_files + proxy_data_files,
+       options = {"py2exe" : py2exe_options},
+       zipfile = "lib/spambayes.zip",
  )