Merge lp:~openerp-groupes/openobject-client-web/client-web-win32-packaging into lp:openobject-client-web/trunk

[Julien Thewys]

Fixed config file path lookup
Fixed win32/* for windows service
Fixed setup.nsi

Tested (packaged and deployed with python 2.5 on Windows Server 2008 SP2 and Win XP SP3).

[Xavier (Open ERP) (xmo-deactivatedaccount)]

* Why not leave setup.nsi in win32? (also it was removed and re-added I think, not moved via bzr)
* Can't we not just merge win32/setup.py into py2exe_utils?
* Maybe make win32/ into a package and move py2exe_utils stuff into it, if setup(service=) needs a Python module?

review: Needs Information

[Julien Thewys (julien-thewys)]

* setup.nsi: I ported the one from server so I considered it more like a re-add, and it is outside win32 in the server (same for pixmaps/)
* maybe we could merge it, I didn't find a quick way to do it without py2exe complaining/failing.
* nice to have ;-)

[Xavier (Open ERP) (xmo-deactivatedaccount)]

OK. Going to try to check/test this afternoon and maybe ask stw to check if he can do his own packaging using that, if everything works I'll merge. Thanks.

=== modified file 'openobject/commands.py'
--- openobject/commands.py	2010-10-29 10:00:32 +0000
+++ openobject/commands.py	2010-11-02 15:59:41 +0000
@@ -16,11 +16,14 @@
 
 DISTRIBUTION_CONFIG = os.path.join('doc', 'openerp-web.cfg')
 def get_config_file():
-    setupdir = os.path.dirname(os.path.dirname(__file__))
-    isdevdir = os.path.isfile(os.path.join(setupdir, 'setup.py'))
-    configfile = '/etc/openerp-web.cfg'
-    if isdevdir or not os.path.exists(configfile):
-        configfile = os.path.join(setupdir, DISTRIBUTION_CONFIG)
+    if hasattr(sys, 'frozen'):
+        configfile = os.path.join(openobject.paths.root(), DISTRIBUTION_CONFIG)
+    else:
+        setupdir = os.path.dirname(os.path.dirname(__file__))
+        isdevdir = os.path.isfile(os.path.join(setupdir, 'setup.py'))
+        configfile = '/etc/openerp-web.cfg'
+        if isdevdir or not os.path.exists(configfile):
+            configfile = os.path.join(setupdir, DISTRIBUTION_CONFIG)
     return configfile
 
 def configure_babel():

=== renamed directory 'win32/pixmaps' => 'pixmaps'
=== added file 'setup.nsi'
--- setup.nsi	1970-01-01 00:00:00 +0000
+++ setup.nsi	2010-11-02 15:59:41 +0000
@@ -0,0 +1,267 @@
+##############################################################################
+#
+# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+###############################################################################
+!ifndef VERSION
+    !error "Do not forget to specify the version of OpenERP - /DVERSION=<VERSION>"
+!endif 
+
+!include "MUI.nsh"
+
+;--------------------------------
+;General
+
+;Name and file
+Name "OpenERP Web"
+OutFile "openerp-web-setup-${VERSION}.exe"
+SetCompressor lzma
+SetCompress auto
+
+;Default installation folder
+InstallDir "$PROGRAMFILES\OpenERP Web"
+
+;Get installation folder from registry if available
+InstallDirRegKey HKLM "Software\OpenERP Web" ""
+
+BrandingText "OpenERP Web ${VERSION}"
+
+;Vista redirects $SMPROGRAMS to all users without this
+RequestExecutionLevel admin
+
+;--------------------------------
+;Variables
+
+Var MUI_TEMP
+Var STARTMENU_FOLDER
+
+;--------------------------------
+;Interface Settings
+
+!define MUI_ABORTWARNING
+
+!define REGKEY "SOFTWARE\$(^Name)"
+!define MUI_LANGDLL_REGISTRY_ROOT HKLM
+!define MUI_LANGDLL_REGISTRY_KEY ${REGKEY}
+!define MUI_LANGDLL_REGISTRY_VALUENAME InstallerLanguage
+
+!insertmacro MUI_RESERVEFILE_LANGDLL
+;--------------------------------
+;Pages
+
+!define MUI_ICON ".\pixmaps\openerp-icon.ico"
+!define MUI_WELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
+!define MUI_HEADER_TRANSPARENT_TEXT ""
+!define MUI_HEADERIMAGE_BITMAP ".\pixmaps\openerp-slogan.bmp"
+!define MUI_LICENSEPAGE_TEXT_BOTTOM "$(LicenseText)"
+!define MUI_LICENSEPAGE_BUTTON "$(LicenseNext)"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE ".\doc\LICENSE.TXT"
+!insertmacro MUI_PAGE_DIRECTORY
+
+;Start Menu Folder Page Configuration
+!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" 
+!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\OpenERP Web"
+!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "OpenERP Web"
+
+!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+
+!insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_FINISHPAGE_NOAUTOCLOSE
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_CHECKED
+!define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageText)" 
+!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
+!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\README.txt
+!insertmacro MUI_PAGE_FINISH
+
+
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+;Languages
+
+!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "French"
+
+!macro CreateInternetShortcut FILENAME URL
+	WriteINIStr "${FILENAME}.url" "InternetShortcut" "URL" "${URL}"
+!macroend
+
+;--------------------------------
+;Installer Sections
+Function .onInit 
+!ifndef ALLINONE
+    ;Language selection dialog
+    Push ""
+    Push ${LANG_ENGLISH}
+    Push English
+    Push ${LANG_FRENCH}
+    Push French
+    Push A ; A means auto count languages
+    ; for the auto count to work the first empty push (Push "") must remain
+    LangDLL::LangDialog "Installer Language" "Please select the language of the installer"
+
+    Pop $LANGUAGE
+    StrCmp $LANGUAGE "cancel" 0 +2
+        Abort
+!endif
+
+    ClearErrors
+    ReadRegStr $0 HKLM "Software\OpenERP Web" ""
+    IfErrors DoInstall 0
+        MessageBox MB_OK "$(CannotInstallWebText)"
+        Quit
+    DoInstall:
+FunctionEnd
+
+Section "OpenERP Web" SecOpenERPWeb
+    nsExec::Exec "net stop openerp-web"
+    sleep 2
+
+    SetOutPath "$INSTDIR"
+
+    ;ADD YOUR OWN FILES HERE...
+    File /r "dist\*"
+
+    SetOutPath "$INSTDIR\service"
+    File /r "win32\dist\*"
+    File "win32\start.bat"
+    File "win32\stop.bat"
+
+    SetOutPath "$INSTDIR\conf"
+    File "/oname=openerp-web.cfg" ".\doc\openerp-web.cfg"
+
+    ;Store installation folder
+    WriteRegStr HKLM "Software\OpenERP Web" "" $INSTDIR
+
+!ifndef ALLINONE
+    ;Create uninstaller
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenERP Web" "DisplayName" "OpenERP Web ${VERSION}"
+    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenERP Web" "UninstallString" "$INSTDIR\Uninstall.exe"
+!else
+    WriteRegStr HKLM  "Software\OpenERP AllInOne" "UninstallWeb" "$INSTDIR\Uninstall.exe"
+!endif
+    WriteUninstaller "$INSTDIR\Uninstall.exe"
+
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+        ;Create shortcuts
+        CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+        
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Start OpenERP Web.lnk" "$INSTDIR\service\start.bat"
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Stop OpenERP Web.lnk" "$INSTDIR\service\stop.bat"
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Edit Web Config.lnk" "notepad.exe" "$INSTDIR\conf\openerp-web.cfg"
+!ifndef ALLINONE
+        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+!endif
+	!insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Forum" "http://www.openerp.com/forum"
+	!insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Translation" "https://translations.launchpad.net/openobject"
+    !insertmacro MUI_STARTMENU_WRITE_END
+
+
+    nsExec::Exec '"$INSTDIR\service\OpenERPWebService.exe" -auto -install'
+
+SectionEnd
+
+;Descriptions
+
+ 
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+    nsExec::Exec "net stop openerp-web"
+    sleep 2
+    nsExec::Exec '"$INSTDIR\service\OpenERPWebService.exe" -remove'
+    sleep 2
+
+    RMDIR /r "$INSTDIR" 
+    !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+
+    Delete "$SMPROGRAMS\$MUI_TEMP\Forum.url"
+    Delete "$SMPROGRAMS\$MUI_TEMP\Translation.url"
+!ifndef ALLINONE
+    Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+!endif 
+    Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+    Delete "$SMPROGRAMS\$MUI_TEMP\Start OpenERP Web.lnk"
+    Delete "$SMPROGRAMS\$MUI_TEMP\Stop OpenERP Web.lnk"
+    Delete "$SMPROGRAMS\$MUI_TEMP\Edit Web Config.lnk"
+
+    ;Delete empty start menu parent diretories
+    StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
+ 
+    startMenuDeleteLoop:
+        ClearErrors
+        RMDir $MUI_TEMP
+        GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
+
+        IfErrors startMenuDeleteLoopDone
+
+        StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop
+
+    startMenuDeleteLoopDone:
+
+!ifndef ALLINONE
+        DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenERP Web"
+!else 
+        DeleteRegKey HKLM "Software\OpenERP AllInOne\UninstallWeb"
+!endif
+        DeleteRegKey /ifempty HKLM "Software\OpenERP Web"
+
+SectionEnd
+
+Function LaunchLink
+    nsExec::Exec "net start openerp-web"
+FunctionEnd
+
+LangString LicenseText ${LANG_ENGLISH} "Usually, a proprietary license is provided with the software: limited number of users, limited in time usage, etc. This Open Source license is the opposite: it garantees you the right to use, copy, study, distribute and modify Open ERP for free."
+LangString LicenseText ${LANG_FRENCH} "Normalement, une licence propriétaire est fournie avec le logiciel: limitation du nombre d'utilisateurs, limitation dans le temps, etc. Cette licence Open Source est l'opposé: Elle vous garantie le droit d'utiliser, de copier, d'étudier, de distribuer et de modifier Open ERP librement."
+
+LangString LicenseNext ${LANG_ENGLISH} "Next >"
+LangString LicenseNext ${LANG_FRENCH} "Suivant >"
+
+LangString FinishPageText ${LANG_ENGLISH} "Start OpenERP Web"
+LangString FinishPageText ${LANG_FRENCH} "Lancer le serveur Web OpenERP"
+
+;Language strings
+LangString DESC_SecOpenERPWeb ${LANG_ENGLISH} "OpenERP Web."
+LangString DESC_SecOpenERPWeb ${LANG_FRENCH} "Serveur Web OpenERP."
+
+LangString CannotInstallWebText ${LANG_ENGLISH} "Can not install the OpenERP Web because a previous installation already exists on this system. Please uninstall your current installation and relaunch this setup wizard."
+LangString CannotInstallWebText ${LANG_FRENCH} "Ne peut pas installer le serveur Web Open ERP parce qu'une installation existe déjà sur ce système. S'il vous plait, désinstallez votre installation actuelle et relancer l'installeur."
+
+
+;Assign language strings to sections
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenERPWeb} $(DESC_SecOpenERPWeb)
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+

=== modified file 'win32/OpenERPWebService.py'
--- win32/OpenERPWebService.py	2010-09-16 10:37:47 +0000
+++ win32/OpenERPWebService.py	2010-11-02 15:59:41 +0000
@@ -1,50 +1,51 @@
-import os
-import sys
-import thread
-import subprocess
-
-# Working Directory
-WORK_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-# Update PATH
-p = os.environ.get('PATH', '').split(';')
-
-p.insert(0, WORK_DIR)
-p.insert(0, WORK_DIR+"\\python25")
-p.insert(0, WORK_DIR+"\\python25\\Scripts")
-
-os.environ['PATH'] = ';'.join(p)
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
 
 # Win32 python extensions modules
 import win32serviceutil
 import win32service
 import win32event
 import win32api
-import win32con
 import win32process
 import servicemanager
 
-# The command itself
-#EXECUTABLE = ["openerp-web.exe", "--config", "conf\openerp-web.cfg"]
-EXECUTABLE = ["python.exe", "python25\Scripts\openerp-web", "--config", "conf\openerp-web.cfg"]
-
-class TinyService(win32serviceutil.ServiceFramework):
-
+import sys
+import subprocess
+import os
+import thread
+
+class OpenERPWebService(win32serviceutil.ServiceFramework):
+    # required info
     _svc_name_ = "openerp-web"
     _svc_display_name_ = "OpenERP Web"
-
-    _svc_description_ = "OpenERP Web Client"
+    # optionnal info
+    _svc_description_ = "OpenERP Web service"
 
     def __init__(self, args):
         win32serviceutil.ServiceFramework.__init__(self, args)
-
         # Create an event which we will use to wait on.
         # The "service stop" request will set this event.
         self.hWaitStop = win32event.CreateEvent(None, 0, 0, None)
-
         # a reference to the server's process
-        self.proc = None
-
+        self.openerp_process = None
         # info if the service terminates correctly or if the server crashed
         self.stopping = False
 
@@ -52,18 +53,22 @@
     def SvcStop(self):
         # Before we do anything, tell the SCM we are starting the stop process.
         self.ReportServiceStatus(win32service.SERVICE_STOP_PENDING)
-
-        # stop the running TERP Server: say it's a normal exit
-        win32api.TerminateProcess(int(self.proc._handle), 0)
-        servicemanager.LogInfoMsg(TinyService._svc_display_name_ + " stopped correctly.")
-
+        # stop the running OpenERP Web: say it's a normal exit
+        win32api.TerminateProcess(int(self.openerp_process._handle), 0)
+        servicemanager.LogInfoMsg("OpenERP Web stopped correctly")
         # And set my event.
         win32event.SetEvent(self.hWaitStop)
 
-    def StartService(self):
-
-        self.proc = subprocess.Popen(EXECUTABLE, cwd=WORK_DIR,
-                                     creationflags=win32process.CREATE_NO_WINDOW)
+
+    def StartOpenERP(self):
+        # The server finds now its configuration automatically on Windows
+        # We start the ERP Web as an independent process, but we keep its handle
+        # The server's binary must be one directory above the service's binary (when py2exe'd the python libraries shouldn' mix)
+        service_dir = os.path.dirname(sys.argv[0])
+        server_dir = os.path.split(service_dir)[0]
+        server_path = os.path.join(server_dir, 'openerp-web.exe')
+        self.openerp_process = subprocess.Popen([server_path], cwd=server_dir, creationflags=win32process.CREATE_NO_WINDOW)
+
 
     def StartControl(self,ws):
         # this listens to the Service Manager's events
@@ -71,23 +76,22 @@
         self.stopping = True
 
     def SvcDoRun(self):
-
-        # Start the service itself
-        self.StartService()
-
+        # Start OpenERP Web itself
+        self.StartOpenERP()
         # start the loop waiting for the Service Manager's stop signal
         thread.start_new_thread(self.StartControl, (self.hWaitStop,))
-
         # Log a info message that the server is running
-        servicemanager.LogInfoMsg(TinyService._svc_display_name_ + " is up and running.")
-
+        servicemanager.LogInfoMsg("OpenERP Web up and running")
         # verification if the server is really running, else quit with an error
-        self.proc.wait()
-
+        self.openerp_process.wait()
         if not self.stopping:
-            sys.exit(TinyService._svc_display_name_ + " is not running, check the logfile for more info.")
+            sys.exit("OpenERP Web check: server not running, check the logfile for more info")
+
+
 
 if __name__=='__main__':
     # Do with the service whatever option is passed in the command line
-    win32serviceutil.HandleCommandLine(TinyService)
+    win32serviceutil.HandleCommandLine(OpenERPWebService)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== removed file 'win32/fixps.py'
--- win32/fixps.py	2009-04-15 07:40:52 +0000
+++ win32/fixps.py	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-import os, sys
-import re
-
-PY_DIR = os.path.dirname(sys.executable)
-MY_DIR = os.path.dirname(os.path.abspath(__file__))
-
-pat = re.compile('^#!.*$', re.M)
-
-for f in os.listdir(MY_DIR):
-
-    if not f.endswith('.py') or f.endswith('.pyw') or f == 'fixps.py':
-        continue
-
-    f = os.path.join(MY_DIR, f)
-
-    src = open(f).read()
-    src = pat.sub('#!"%s\python.exe"' % PY_DIR, src)
-
-    fo = open(f, 'w')
-    fo.write(src)
-    fo.close()
-

=== removed file 'win32/setup.nsi'
--- win32/setup.nsi	2010-09-15 17:46:36 +0000
+++ win32/setup.nsi	1970-01-01 00:00:00 +0000
@@ -1,266 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004-2008 Tiny SPRL (http://tiny.be) All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-###############################################################################
-!ifndef VERSION
-    !error "Do not forget to specify the version of OpenERP - /DVERSION=<VERSION>"
-!endif 
-
-!include "MUI.nsh"
-
-;--------------------------------
-;General
-
-;Name and file
-Name "OpenERP Web"
-OutFile "openerp-web-setup-${VERSION}.exe"
-SetCompressor lzma
-SetCompress auto
-
-;Default installation folder
-InstallDir "$PROGRAMFILES\OpenERP Web"
-
-;Get installation folder from registry if available
-InstallDirRegKey HKLM "Software\OpenERP Web" ""
-
-BrandingText "OpenERP Web ${VERSION}"
-
-;Vista redirects $SMPROGRAMS to all users without this
-RequestExecutionLevel admin
-
-;--------------------------------
-;Variables
-
-Var MUI_TEMP
-Var STARTMENU_FOLDER
-
-;--------------------------------
-;Interface Settings
-
-!define MUI_ABORTWARNING
-
-!define REGKEY "SOFTWARE\$(^Name)"
-!define MUI_LANGDLL_REGISTRY_ROOT HKLM
-!define MUI_LANGDLL_REGISTRY_KEY ${REGKEY}
-!define MUI_LANGDLL_REGISTRY_VALUENAME InstallerLanguage
-
-!insertmacro MUI_RESERVEFILE_LANGDLL
-;--------------------------------
-;Pages
-
-!define MUI_ICON ".\pixmaps\openerp-icon.ico"
-!define MUI_WELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp"
-!define MUI_UNWELCOMEFINISHPAGE_BITMAP ".\pixmaps\openerp-intro.bmp"
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP_NOSTRETCH
-!define MUI_HEADER_TRANSPARENT_TEXT ""
-!define MUI_HEADERIMAGE_BITMAP ".\pixmaps\openerp-slogan.bmp"
-!define MUI_LICENSEPAGE_TEXT_BOTTOM "$(LicenseText)"
-!define MUI_LICENSEPAGE_BUTTON "$(LicenseNext)"
-
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "..\doc\LICENSE.TXT"
-!insertmacro MUI_PAGE_DIRECTORY
-
-;Start Menu Folder Page Configuration
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" 
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\OpenERP Web"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "OpenERP Web"
-
-!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-
-!insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_FINISHPAGE_NOAUTOCLOSE
-!define MUI_FINISHPAGE_RUN
-!define MUI_FINISHPAGE_RUN_CHECKED
-!define MUI_FINISHPAGE_RUN_TEXT "$(FinishPageText)" 
-!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-!define MUI_FINISHPAGE_SHOWREADME $INSTDIR\README.txt
-!insertmacro MUI_PAGE_FINISH
-
-
-!insertmacro MUI_UNPAGE_WELCOME
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-;--------------------------------
-;Languages
-
-!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "French"
-
-!macro CreateInternetShortcut FILENAME URL
-	WriteINIStr "${FILENAME}.url" "InternetShortcut" "URL" "${URL}"
-!macroend
-
-;--------------------------------
-;Installer Sections
-Function .onInit 
-!ifndef ALLINONE
-    ;Language selection dialog
-    Push ""
-    Push ${LANG_ENGLISH}
-    Push English
-    Push ${LANG_FRENCH}
-    Push French
-    Push A ; A means auto count languages
-    ; for the auto count to work the first empty push (Push "") must remain
-    LangDLL::LangDialog "Installer Language" "Please select the language of the installer"
-
-    Pop $LANGUAGE
-    StrCmp $LANGUAGE "cancel" 0 +2
-        Abort
-!endif
-
-    ClearErrors
-    ReadRegStr $0 HKLM "Software\OpenERP Web" ""
-    IfErrors DoInstall 0
-        MessageBox MB_OK "$(CannotInstallWebText)"
-        Quit
-    DoInstall:
-FunctionEnd
-
-Section "OpenERP Web" SecOpenERPWeb
-    nsExec::Exec "net stop openerp-web"
-    sleep 2
-
-    SetOutPath "$INSTDIR\python25"
-
-    ;ADD YOUR OWN FILES HERE...
-    File /r /x "*.pyc" /x "*.pyo" /x "*.msi" /x "*~" "build\python25\*"
-
-    SetOutPath "$INSTDIR\bin"
-    File "start.bat"
-    File "stop.bat"
-    File "OpenERPWebService.py"
-
-    SetOutPath "$INSTDIR\conf"
-    File "/oname=openerp-web.cfg" "..\doc\openerp-web.cfg"
-
-    ;Store installation folder
-    WriteRegStr HKLM "Software\OpenERP Web" "" $INSTDIR
-
-!ifndef ALLINONE
-    ;Create uninstaller
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenERP Web" "DisplayName" "OpenERP Web ${VERSION}"
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenERP Web" "UninstallString" "$INSTDIR\Uninstall.exe"
-!else
-    WriteRegStr HKLM  "Software\OpenERP AllInOne" "UninstallWeb" "$INSTDIR\Uninstall.exe"
-!endif
-    WriteUninstaller "$INSTDIR\Uninstall.exe"
-
-    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-        ;Create shortcuts
-        CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Start OpenERP Web.lnk" "$INSTDIR\bin\start.bat"
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Stop OpenERP Web.lnk" "$INSTDIR\bin\stop.bat"
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Edit Web Config.lnk" "notepad.exe" "$INSTDIR\conf\openerp-web.cfg"
-!ifndef ALLINONE
-        CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe"
-!endif
-	!insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Forum" "http://www.openerp.com/forum"
-	!insertmacro CreateInternetShortcut "$SMPROGRAMS\$STARTMENU_FOLDER\Translation" "https://translations.launchpad.net/openobject"
-    !insertmacro MUI_STARTMENU_WRITE_END
-
-    nsExec::Exec '"$INSTDIR\python25\python.exe" "$INSTDIR\python25\Scripts\fixps.py"'
-    nsExec::Exec '"$INSTDIR\python25\python.exe" "$INSTDIR\bin\OpenERPWebService.py" --startup auto install'
-
-SectionEnd
-
-;Descriptions
-
- 
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-    nsExec::Exec "net stop openerp-web"
-    sleep 2
-    nsExec::Exec '"$INSTDIR\python25\python.exe" "$INSTDIR\bin\OpenERPWebService.py" remove'
-    sleep 2
-
-    RMDIR /r "$INSTDIR" 
-    !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-
-    Delete "$SMPROGRAMS\$MUI_TEMP\Forum.url"
-    Delete "$SMPROGRAMS\$MUI_TEMP\Translation.url"
-!ifndef ALLINONE
-    Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-!endif 
-    Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-    Delete "$SMPROGRAMS\$MUI_TEMP\Start OpenERP Web.lnk"
-    Delete "$SMPROGRAMS\$MUI_TEMP\Stop OpenERP Web.lnk"
-    Delete "$SMPROGRAMS\$MUI_TEMP\Edit Web Config.lnk"
-
-    ;Delete empty start menu parent diretories
-    StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
- 
-    startMenuDeleteLoop:
-        ClearErrors
-        RMDir $MUI_TEMP
-        GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-
-        IfErrors startMenuDeleteLoopDone
-
-        StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop
-
-    startMenuDeleteLoopDone:
-
-!ifndef ALLINONE
-        DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenERP Web"
-!else 
-        DeleteRegKey HKLM "Software\OpenERP AllInOne\UninstallWeb"
-!endif
-        DeleteRegKey /ifempty HKLM "Software\OpenERP Web"
-
-SectionEnd
-
-Function LaunchLink
-    nsExec::Exec "net start openerp-web"
-FunctionEnd
-
-LangString LicenseText ${LANG_ENGLISH} "Usually, a proprietary license is provided with the software: limited number of users, limited in time usage, etc. This Open Source license is the opposite: it garantees you the right to use, copy, study, distribute and modify Open ERP for free."
-LangString LicenseText ${LANG_FRENCH} "Normalement, une licence propriétaire est fournie avec le logiciel: limitation du nombre d'utilisateurs, limitation dans le temps, etc. Cette licence Open Source est l'opposé: Elle vous garantie le droit d'utiliser, de copier, d'étudier, de distribuer et de modifier Open ERP librement."
-
-LangString LicenseNext ${LANG_ENGLISH} "Next >"
-LangString LicenseNext ${LANG_FRENCH} "Suivant >"
-
-LangString FinishPageText ${LANG_ENGLISH} "Start OpenERP Web"
-LangString FinishPageText ${LANG_FRENCH} "Lancer le serveur Web OpenERP"
-
-;Language strings
-LangString DESC_SecOpenERPWeb ${LANG_ENGLISH} "OpenERP Web."
-LangString DESC_SecOpenERPWeb ${LANG_FRENCH} "Serveur Web OpenERP."
-
-LangString CannotInstallWebText ${LANG_ENGLISH} "Can not install the OpenERP Web because a previous installation already exists on this system. Please uninstall your current installation and relaunch this setup wizard."
-LangString CannotInstallWebText ${LANG_FRENCH} "Ne peut pas installer le serveur Web Open ERP parce qu'une installation existe déjà sur ce système. S'il vous plait, désinstallez votre installation actuelle et relancer l'installeur."
-
-
-;Assign language strings to sections
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-    !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenERPWeb} $(DESC_SecOpenERPWeb)
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-

=== modified file 'win32/setup.py'
--- win32/setup.py	2010-10-14 11:27:00 +0000
+++ win32/setup.py	2010-11-02 15:59:41 +0000
@@ -1,156 +1,35 @@
-import os
-import sys
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
 
 from distutils.core import setup
-from distutils.core import Command
-from distutils.errors import *
-
-import fnmatch
-import util
-
-URLS = {
-    "python": ("http://www.python.org/ftp/python/2.5.4/python-2.5.4.msi", "python-2.5.4.msi"),
-    "ez_setup": ("http://peak.telecommunity.com/dist/ez_setup.py", "ez_setup.py"),
-    "pywin32": ("http://nchc.dl.sourceforge.net/sourceforge/pywin32/pywin32-212.win32-py2.5.exe", "pywin32-212.win32-py2.5.exe")
-}
-
-BUILD_DIR=os.path.join(os.path.dirname(os.path.abspath(__file__)), "build")
-PYDIR=os.path.join(BUILD_DIR, "python25")
-
-execfile(os.path.join("openobject", "release.py"))
-
-class bdist_wininst(Command):
-    user_options = [('allinone', None, 'Generate the windows installer for the All In One')]
-
-    def initialize_options (self):
-        self.allinone = None
-
-    def finalize_options (self):
-        pass
-
-    def run (self):
-
-        if (sys.platform != "win32"):
-            raise DistutilsPlatformError("Distribution must be compiled on a Windows 32 platform")
-
-        if not os.path.exists(BUILD_DIR):
-            os.mkdir(BUILD_DIR)
-
-        # change to the build dir
-        os.chdir(BUILD_DIR)
-
-        self._check_python()
-        self._check_setuptools()
-        self._check_pywin32()
-        self._check_openerp_web()
-        self._check_fixps()
-
-        for package in [
-            ('cherrypy', 'CherryPy >= 3.1.2'),
-            ('mako', 'mako >= 0.2.4'),
-            ('babel', 'Babel >= 0.9.4'),
-            ('formencode', 'FormEncode >= 1.2.2'),
-            ('simplejson', 'simplejson >= 2.0.9'),
-            ('dateutil', 'python-dateutil >= 1.4.1'),
-            ('pytz', 'pytz >= 2009j')
-            ]:
-            self._check_package(*package)
-
-        # finally compile the setup.nsi
-        self._make_nsis()
-
-    def run_py(self, *args):
-        return not os.system(PYDIR + "\\python.exe " + " ".join(args))
-
-    def run_ez(self, *args):
-        return not os.system(PYDIR + "\\Scripts\\easy_install.exe -Z " + " ".join(args))
-
-    def check_module(self, module):
-        return self.run_py('-c', '"import %s"' % module)
-
-    def _check_python(self):
-
-        if os.path.exists(os.path.join(PYDIR, "python.exe")):
-            return True
-
-        url, name = URLS['python']
-        util.download(url)
-
-        print "Extracting the the python installer..."
-        os.system('msiexec /a %s /qn TARGETDIR="%s"' % (name, PYDIR))
-
-    def _check_setuptools(self):
-
-        if self.check_module("setuptools"):
-            return
-
-        url, name = URLS['ez_setup']
-        util.download(url)
-
-        self.run_py(name)
-
-    def _check_pywin32(self):
-
-        if self.check_module("pywintypes"):
-            return
-
-        url, name = URLS['pywin32']
-        util.download(url, name)
-
-        util.unzip(name, 'tmp_pyw32')
-
-        os.system("xcopy /q /y /e tmp_pyw32\\PLATLIB\\* \"%s\\Lib\\site-packages\"" % PYDIR)
-        os.system("copy /y \"%s\\Lib\\site-packages\\pywin32_system32\\*\" \"%s\"" % (PYDIR, PYDIR))
-        os.system("copy /y \"%s\\Lib\\site-packages\\win32\\*.exe\" \"%s\"" % (PYDIR, PYDIR))
-        os.system("copy /y \"%s\\Lib\\site-packages\\win32\\*.dll\" \"%s\"" % (PYDIR, PYDIR))
-        os.system("rmdir /s /q tmp_pyw32")
-
-    def _check_package(self, package, dependency):
-        if self.check_module(package):
-            return
-        self.run_ez(dependency)
-
-    def _check_pyparsing(self):
-
-        if self.check_module("pyparsing"):
-            return
-
-        url, name = URLS['pyparsing']
-        util.download(url, name)
-
-        self.run_ez(name)
-
-    def _check_openerp_web(self):
-
-        if self.check_module("openobject"):
-            # remove old version
-            self.run_ez("-m", "openerp-web")
-
-            for f in os.listdir("%s\\Scripts" % PYDIR):
-                if fnmatch.fnmatch(f, "*openerp-web*"):
-                    os.remove(os.path.join(PYDIR, "Scripts", f))
-
-            for f in os.listdir("%s\\Lib\\site-packages" % PYDIR):
-                if fnmatch.fnmatch(f, "openerp_web*"):
-                    os.system("rd /s /q \"%s\\Lib\\site-packages\\%s\"" %(PYDIR, f))
-
-        self.run_ez("-N", "..\\..")
-
-    def _check_fixps(self):
-        os.system("copy /y ..\\fixps.py \"%s\\Scripts\"" % PYDIR)
-
-    def _make_nsis(self):
-
-        #TODO: read registry
-        makensis = "C:\\Program Files\\NSIS\\makensis.exe"
-        if not os.path.exists(makensis):
-            makensis = "makensis.exe"
-
-        cmd = '"%s" %s /DVERSION=%s ..\\setup.nsi' % (makensis,
-                                                      self.allinone and '/DALLINONE=1' or '',
-                                                      version,)
-
-        os.system(cmd)
-
-setup(cmdclass={'bdist_wininst': bdist_wininst})
+import py2exe
+
+
+setup(service=["OpenERPWebService"],
+      options={"py2exe":{"excludes":["Tkconstants","Tkinter","tcl",
+                                     "_imagingtk","PIL._imagingtk",
+                                     "ImageTk", "PIL.ImageTk",
+                                     "FixTk"],
+                         "compressed": 1}}
+      )
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== removed file 'win32/util.py'
--- win32/util.py	2010-10-14 11:27:00 +0000
+++ win32/util.py	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-import os
-import sys
-import zipfile
-import urllib
-
-def _reporthook(numblocks, blocksize, filesize, url=None):
-    base = os.path.basename(url)
-    try:
-        percent = min((numblocks*blocksize*100)/filesize, 100)
-    except:
-        percent = 100
-    if numblocks != 0:
-        sys.stdout.write("\b"*70)
-    sys.stdout.write("%-66s%3d%%" % (base, percent))
-
-def download(url, dst=None):
-
-    if not dst:
-        dst = url.split('/')[-1]
-
-    if os.path.exists(dst):
-        return
-
-    print "Downloading %s..." % (url)
-
-    try:
-        if sys.stdout.isatty():
-            urllib.urlretrieve(url, dst,
-                               lambda nb, bs, fs, url=url: _reporthook(nb,bs,fs,url))
-            sys.stdout.write('\n')
-        else:
-            urllib.urlretrieve(url, dst)
-    except:
-        os.remove(dst)
-
-def unzip(file, dir):
-    zf = zipfile.ZipFile(file)
-    for i, name in enumerate(zf.namelist()):
-        if not name.endswith('/'):
-            outfile = os.path.join(dir, name)
-            outdir = os.path.dirname(outfile)
-
-            if not os.path.exists(outdir):
-                os.makedirs(outdir)
-
-            outfile = open(outfile, 'wb')
-            outfile.write(zf.read(name))
-            outfile.flush()
-            outfile.close()