* last fixes for 0.99.14a release

base/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/14]
+# Makefile generated by fpcmake v0.99.13 [2000/02/23]
 #
 
 defaultrule: help
@@ -1370,7 +1370,7 @@ endif
 	$(DELTREE) $(INSTALLERBUILDDIR)
 
 installersrc:
-	$(COPYTREE) fpinst $(INSTALLERBUILDDIR)
+	$(COPYTREE) $(CVSINSTALL)/fpinst $(INSTALLERBUILDDIR)
 	$(MAKE) -C $(INSTALLERBUILDDIR) zipsourceinstall
 	$(DELTREE) $(INSTALLERBUILDDIR)
 
@@ -1492,14 +1492,10 @@ docsrc:
 # Demos
 ##########################################################################
 
-.PHONY: demo demoinstall
-
-demoinstall:
-	$(COPYTREE) $(CVSINSTALL)/demo $(PREFIXINSTALLDIR)
-
-demo:
-	$(MAKE) fpc_zipinstall ZIPTARGET=demoinstall ZIPNAME=demo
+.PHONY: demozip
 
+demozip:
+	$(MAKE) -C $(CVSINSTALL)/demo zipsourceinstall ZIPNAME=demo
 
 
 ##########################################################################
@@ -1515,7 +1511,7 @@ sourcebase:
 	$(COPY) rtl/Makefile* $(SOURCEINSTALLDIR)/rtl
 	$(COPY) packages/Makefile* $(SOURCEINSTALLDIR)/packages
 
-zipsource:
+sourcezip:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=basesrc
 	$(MAKE) compiler_zipsourceinstall
 	$(MAKE) rtl_zipsourceinstall

base/Makefile.fpc

@@ -245,7 +245,7 @@ endif
         $(DELTREE) $(INSTALLERBUILDDIR)
 
 installersrc:
-        $(COPYTREE) fpinst $(INSTALLERBUILDDIR)
+        $(COPYTREE) $(CVSINSTALL)/fpinst $(INSTALLERBUILDDIR)
         $(MAKE) -C $(INSTALLERBUILDDIR) zipsourceinstall
         $(DELTREE) $(INSTALLERBUILDDIR)
 
@@ -367,14 +367,10 @@ docsrc:
 # Demos
 ##########################################################################
 
-.PHONY: demo demoinstall
-
-demoinstall:
-        $(COPYTREE) $(CVSINSTALL)/demo $(PREFIXINSTALLDIR)
-
-demo:
-        $(MAKE) fpc_zipinstall ZIPTARGET=demoinstall ZIPNAME=demo
+.PHONY: demozip
 
+demozip:
+        $(MAKE) -C $(CVSINSTALL)/demo zipsourceinstall ZIPNAME=demo
 
 
 ##########################################################################
@@ -390,7 +386,7 @@ sourcebase:
         $(COPY) rtl/Makefile* $(SOURCEINSTALLDIR)/rtl
         $(COPY) packages/Makefile* $(SOURCEINSTALLDIR)/packages
 
-zipsource:
+sourcezip:
         $(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=basesrc
         $(MAKE) compiler_zipsourceinstall
         $(MAKE) rtl_zipsourceinstall

install/fpinst/install.dat

@@ -3,7 +3,7 @@
 #
 # Install file for Go32v2/Win32/OS2
 #
-title=Free Pascal Compiler 0.99.14
+title=Free Pascal Compiler 0.99.14a
 version=0.99.14
 
 #
@@ -21,8 +21,10 @@ cfgfile=ppc386.cfg
 filecheck=*go32.zip
 package=basego32.zip,~B~asic system for Go32v2 (required)
 package=asldgo32.zip,GNU ~L~inker and GNU Assembler for Go32v2 (required)
+package=idego32.zip,~I~DE with integrated debugger/compiler (BETA)
+package=utilgo32.zip,~E~xtra Utilities
+package=makego32.zip,GNU ~U~tilities (needed for Makefile usage)
 package=gdbgo32.zip,GNU ~D~ebugger for Go32v2
-package=utilgo32.zip,GNU ~U~tilities (needed by Makefiles)
 package=ufclgo32.zip,~F~ree Component Libary (FCL)
 package=uapigo32.zip,~A~PI units (needed by FV)
 package=ubasgo32.zip,Basic ~u~nits (needed by FCL)
@@ -41,8 +43,10 @@ cfgfile=ppc386.cfg
 filecheck=*w32.zip
 package=basew32.zip,~B~asic system for Win32 (required)
 package=asldw32.zip,GNU ~L~inker and GNU Assembler for Win32 (required)
+package=idew32.zip,~I~DE with integrated debugger/compiler (BETA)
+package=utilw32.zip,~E~xtra Utilities
+package=makew32.zip,GNU ~U~tilities (needed for Makefile usage)
 package=gdbw32.zip,GNU ~D~ebugger for Win32
-package=utilw32.zip,GNU ~U~tilities (for makefiles)
 package=ufclw32.zip,~F~ree Component Libary (FCL)
 package=uapiw32.zip,~A~PI units (needed by FV)
 package=ubasw32.zip,~B~asic units (needed by FCL)

install/fpinst/install.pas

@@ -553,7 +553,7 @@ program install;
   constructor tinstalldialog.init;
     const
        width = 76;
-       height = 20;
+       height = 21;
        x1 = (79-width) div 2;
        y1 = (23-height) div 2;
        x2 = x1+width;
@@ -1154,7 +1154,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.17  2000-02-23 17:17:56  peter
+  Revision 1.18  2000-02-24 17:47:47  peter
+    * last fixes for 0.99.14a release
+
+  Revision 1.17  2000/02/23 17:17:56  peter
     * write ppc386.cfg for all found targets
 
   Revision 1.16  2000/02/06 12:59:39  peter

install/fpinst/unzip.pas

@@ -3318,6 +3318,7 @@ BEGIN
    inuse := FALSE;    {Not yet in use!}
    lastusedtime := 0; {Not yet used}
   {$endif}
+  if inuse then; { to remove warning }
   SetUnZipReportProc ( NIL );
   SetUnZipQuestionProc ( NIL );
   SetNoRecurseDirs ( FALSE );
@@ -3330,7 +3331,10 @@ BEGIN
 END.
 {
   $Log$
-  Revision 1.4  2000-01-26 21:49:33  peter
+  Revision 1.5  2000-02-24 17:47:47  peter
+    * last fixes for 0.99.14a release
+
+  Revision 1.4  2000/01/26 21:49:33  peter
     * install.pas compilable by FPC again
     * removed some notes from unzip.pas
     * support installer creation under linux (install has name conflict)