[Zope-CVS] CVS: Packages/WinBuilders/etc - zope.iss.in:1.5

[Sidnei da Silva]

Update of /cvs-repository/Packages/WinBuilders/etc
In directory cvs.zope.org:/tmp/cvs-serv24787/etc

Modified Files:
	zope.iss.in 
Log Message:

- Use a newer pywin32 build
- Update build instructions
- Use python 2.3.5 for the installer
- Service improvements


=== Packages/WinBuilders/etc/zope.iss.in 1.4 => 1.5 ===
--- Packages/WinBuilders/etc/zope.iss.in:1.4	Sun Jan 25 23:13:31 2004
+++ Packages/WinBuilders/etc/zope.iss.in	Tue Apr 12 23:30:26 2005
@@ -30,8 +30,9 @@
 Source:"lib\*.*"; DestDir: "{app}\lib"; Flags: ignoreversion recursesubdirs
 Source:"skel\*.*"; DestDir: "{app}\skel"; Flags: ignoreversion recursesubdirs
 ; these are required to be put into the bin directory for proper function of NT services
-Source:"bin\Lib\site-packages\PythonService.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
-Source:"bin\Lib\site-packages\PyWinTypes23.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source:"bin\Lib\site-packages\win32\PythonService.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source:"bin\Lib\site-packages\pywin32_system32\PyWinTypes23.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source:"bin\Lib\site-packages\pywin32_system32\PythonCOM23.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
 ; This is a helper module for manging registry entries at uninstall time
 Source: "<<MAKEFILEDIR>>\bin\fixreg.py"; DestDir: "{app}\bin"; Flags: ignoreversion
 
@@ -49,7 +50,7 @@
 Filename: "{code:GetDataDir}\bin\runzope.bat"; Description: "Launch Zope"; Flags: nowait postinstall skipifsilent; Check: DontDoService
 
 [UninstallRun]
-Filename: "{app}\bin\pythonw.exe"; Parameters: """{code:GetDataDir}\bin\zopeservice.py"" stop"; Check: DoService
+Filename: "{app}\bin\pythonw.exe"; Parameters: """{code:GetDataDir}\bin\zopeservice.py"" --wait=30 stop"; Check: DoService
 Filename: "{app}\bin\pythonw.exe"; Parameters: """{code:GetDataDir}\bin\zopeservice.py"" remove"; Check: DoService
 Filename: "{app}\bin\pythonw.exe"; Parameters: """{app}\bin\decompilezpy.py"" ""{app}"""
 Filename: "{app}\bin\pythonw.exe"; Parameters: """{app}\bin\fixreg.py"" ""<<VERSION>>"""
@@ -105,7 +106,7 @@
 
 	{ Ask for a dir until the user has approved one or clicked Back or Cancel }
 	
-  Next:= InputDir(DataDirValues[0], DataDir);
+  Next:= InputDir(False, DataDirValues[0], DataDir);
 	
   if Next and FileOrDirExists(DataDir) then DirOk := False;
 
@@ -117,7 +118,7 @@
   	if FileOrDirExists(DataDir) then begin
 	      DirOk := MsgBox('Directory Exists' #13#13 'The directory ' + DataDir + ' already exists.  Would you like to create instance files in that directory anyway?', mbConfirmation, MB_YESNO) = idYes;
 	  end;
-	  if not DirOk then Next := InputDir(DataDirValues[0], DataDir);
+	  if not DirOk then Next := InputDir(False, DataDirValues[0], DataDir);
   end;
 
 	Result:=Next;