[Zope-CVS] CVS: Packages/WinBuilders/etc - zeo.iss.in:1.2

[Chris McDonough]

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

Modified Files:
	zeo.iss.in 
Log Message:
Make ZEO buildout nominally work.


=== Packages/WinBuilders/etc/zeo.iss.in 1.1.1.1 => 1.2 ===
--- Packages/WinBuilders/etc/zeo.iss.in:1.1.1.1	Tue Aug 12 17:55:49 2003
+++ Packages/WinBuilders/etc/zeo.iss.in	Wed Aug 20 16:53:50 2003
@@ -26,6 +26,7 @@
 Source:"bin\*.*"; DestDir: "{app}\bin"; Flags: ignoreversion recursesubdirs
 Source:"doc\*.*"; DestDir: "{app}\doc"; Flags: ignoreversion recursesubdirs
 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\PyWinTypes22.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
@@ -37,14 +38,14 @@
 
 [Run]
 Filename: "{app}\bin\pythonw.exe"; Parameters: """{app}\bin\compilezpy.py"" ""{app}"" "; Description: "Byte-compiling Python files"; StatusMsg: "Byte-compiling Python files..."
-Filename:"{app}\bin\pythonw.exe"; Parameters: """{app}\bin\mkzeoinstance.py"" ""{code:GetDataDir}"" "; Description: "Creating default instance"; StatusMsg: "Creating default instance..."; Check: DoInstanceHome
-Filename: "{app}\bin\pythonw.exe"; Parameters: """{code:GetDataDir}\bin\ntservice.py"" --startup auto install"; Check: DoService
-Filename: "{app}\bin\pythonw.exe"; Parameters: """{code:GetDataDir}\bin\ntservice.py"" start"; Description: "Launch ZEO"; Flags: nowait postinstall skipifsilent; Check: DoService
-Filename: "{code:GetDataDir}\bin\runzope.bat"; Description: "Launch ZEO"; Flags: nowait postinstall skipifsilent; Check: DontDoService
+Filename:"{app}\bin\pythonw.exe"; Parameters: """{app}\bin\mkzeoinstance.py"" ""--dir={code:GetDataDir}"" "; Description: "Creating default instance"; StatusMsg: "Creating default instance..."; Check: DoInstanceHome
+Filename: "{app}\bin\pythonw.exe"; Parameters: """{code:GetDataDir}\bin\zeoservice.py"" --startup auto install"; Check: DoService
+Filename: "{app}\bin\pythonw.exe"; Parameters: """{code:GetDataDir}\bin\zeoservice.py"" start"; Description: "Launch ZEO"; Flags: nowait postinstall skipifsilent; Check: DoService
+Filename: "{code:GetDataDir}\bin\runzeo.bat"; Description: "Launch ZEO"; Flags: nowait postinstall skipifsilent; Check: DontDoService
 
 [UninstallRun]
-Filename: "{app}\bin\pythonw.exe"; Parameters: """{code:GetDataDir}\bin\ntservice.py"" stop"; Check: DoService
-Filename: "{app}\bin\pythonw.exe"; Parameters: """{code:GetDataDir}\bin\ntservice.py"" remove"; Check: DoService
+Filename: "{app}\bin\pythonw.exe"; Parameters: """{code:GetDataDir}\bin\zeoservice.py"" stop"; Check: DoService
+Filename: "{app}\bin\pythonw.exe"; Parameters: """{code:GetDataDir}\bin\zeoservice.py"" remove"; Check: DoService
 Filename: "{app}\bin\pythonw.exe"; Parameters: """{app}\bin\decompilezpy.py"" ""{app}"""
 
 [Code]
@@ -110,22 +111,6 @@
 
 end;
 
-function CollectPassword(): Boolean;
-var
-  Next: Boolean;
-begin
-  ScriptDlgPageSetSubCaption1('Specify adminisrator password');
-	ScriptDlgPageSetSubCaption2('The login name for your ZEO administrator account is "admin". When you first connect to the ZEO management interface, you will need to login using the "admin" username and the password you specify below.');
-	Next := InputQueryArrayEx(PasswordPrompts, PasswordChars, PasswordValues);
-	
-	while Next and (PasswordValues[0] = '') do begin
-	  MsgBox('You must enter an administrator password', mbError, MB_OK)
-		Next := InputQueryArrayEx(PasswordPrompts, PasswordChars, PasswordValues);
-	end;
-	Password := PasswordValues[0];
-  Result:=Next;
-end;
-
 function DoInstanceHome():Boolean;
 var
    S : String;
@@ -155,18 +140,9 @@
   Next:=True;
   if ( (not BackClicked and (CurPage = wpSelectTasks)) or (BackClicked and (CurPage = wpReady))  )
         and DoInstanceHome() then begin
-    if not BackClicked then CurSubPage:=0 else CurSubPage:=1;
-     
     ScriptDlgPageOpen();
     ScriptDlgPageSetCaption('Instance Setup');
-
-    while (CurSubPage >=0) and (CurSubPage <=1) and not Terminated do begin
-      case CurSubPage of
-	      0:  Next:=CollectInstanceDir();
-	      1:  Next:=CollectPassword();
-	    end;
-	    if Next then CurSubPage := CurSubPage +1 else CurSubPage := CurSubPage -1;
-	  end;
+    Next:=CollectInstanceDir();
 
     if not BackClicked then
       Result := Next