* more fixes for win32 installer

installer/install.dat

@@ -65,7 +65,7 @@ package=ufvgo32.zip,Free ~V~ision (FV)
 pack=~W~in32
 binsub=\bin\i386-win32
 ppc386=ppc386
-targetname=win32
+targetname=i386-win32
 cfgfile=fpc.cfg
 idecfgfile=fp.cfg
 ideinifile=fp.ini
@@ -128,7 +128,7 @@ package=units-fv.i386-win32.zip,Free ~V~ision (FV)
 pack=~O~S/2
 binsub=\bin\os2
 ppc386=ppc386
-targetname=os2
+targetname=i386-os2
 cfgfile=fpc.cfg
 idecfgfile=fp.cfg
 ideinifile=fp.ini
@@ -281,7 +281,7 @@ pack=Commo~n~
 # Common 1
 package=docs-pdf.zip,Documentation (~P~DF)
 # Common 2
-package=doc-htm.zip[doc-html.zip],Documentation (~H~MTL)
+package=doc-html.zip[doc-htm.zip],Documentation (~H~MTL)
 # Common 3
 package=demo.zip,D~e~mos
 
@@ -447,8 +447,8 @@ defaultcfg=
 #     -Op2  set target processor to Pentium/PentiumMMX (tm)
 #     -Op3  set target processor to PPro/PII/c6x86/K6 (tm)
 
-# Optimize always for Size and Pentium
-#-Og2p2
+# Optimize always for Size and PentiumII
+#-Og2p3
 
 
 # -----------------------
@@ -638,8 +638,8 @@ endcfg
 
 defaultsetpath=
 @echo off
-echo Setting PATH for use with $FPCTARGET Free Pascal compiler
-set A=$1\bin\$FPCTARGET;%PATH%
+echo Setting PATH for use with $2 Free Pascal Compiler
+set A=$1\bin\$2;%PATH%
 set Path=
 set PATH=%A%
 set A=

installer/install.pas

@@ -130,7 +130,7 @@ program install;
        name     : string[12];
        binsub   : string[40];
        ppc386   : string[20];
-       targetname : string[20];
+       targetname : string[40];
        defidecfgfile,
        defideinifile,
        defcfgfile,
@@ -695,7 +695,7 @@ program install;
          begin
            s:=cfgdata[i]^;
            Replace(s,'$1',data.basepath);
-           Replace(s,'$target',targetname);
+           Replace(s,'$2',targetname);
            writeln(t,s);
          end
        else
@@ -1913,7 +1913,7 @@ end;
 
 var
    i : longint;
-
+   vm : tvideomode;
 begin
    { register objects for help streaming }
    RegisterWHTMLScan;
@@ -1977,6 +1977,10 @@ begin
    fillchar(data, SizeOf(data), 0);
 
    installapp.init;
+   vm.col:=80;
+   vm.row:=25;
+   vm.color:=true;
+   installapp.SetScreenVideoMode(vm);
 
    FSplit (FExpand (ParamStr (0)), DStr, CfgName, EStr);
 
@@ -1995,7 +1999,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.22  2004-12-21 18:52:31  peter
+  Revision 1.23  2004-12-22 15:28:48  peter
+    * more fixes for win32 installer
+
+  Revision 1.22  2004/12/21 18:52:31  peter
   checkbox mask works, scrollbox still not
 
   Revision 1.21  2004/12/20 18:27:00  peter

installer/scroll.pas

@@ -137,7 +137,8 @@ procedure TScrollBox.ScrollTo(X, Y: Sw_Integer);
 var DX,DY: sw_integer;
 begin
   Inc(DrawLock);
-  DX:=Delta.X-X; DY:=Delta.Y-Y;
+  DX:=Delta.X-X;
+  DY:=Delta.Y-Y;
   if HScrollBar <> nil then
    HScrollBar^.SetValue(X);
   if VScrollBar <> nil then
@@ -265,7 +266,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.5  2004-12-21 18:52:31  peter
+  Revision 1.6  2004-12-22 15:28:48  peter
+    * more fixes for win32 installer
+
+  Revision 1.5  2004/12/21 18:52:31  peter
   checkbox mask works, scrollbox still not
 
   Revision 1.4  2004/12/20 18:27:00  peter