* latest versions from 1.0.5 branch

install/debian/changelog

@@ -1,3 +1,9 @@
+fpc (1.0.5-0) unstable; urgency=low
+
+  * Snapshot release
+
+ -- Peter Vreman <[email protected]>  Tue,  2 Jan 2001 11:01:50 +0100
+ 
 fpc (1.0.4-1) unstable; urgency=low
 
   * New upstream version.

install/debian/control

@@ -1,15 +1,14 @@
 Source: fpc
 Section: devel
 Priority: optional
-Architecture: i386
 Maintainer: Ulf Jaenicke-Roessler <[email protected]>
 Standards-Version: 3.1.1
 Build-Depends: fp-compiler, debhelper, tetex-bin, awk
 
 Package: fp-compiler
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
-Suggests: fp-utils, fp-docs (>= 1.0.3)
+Depends: fp-units-rtl (= 1.0.5-0)
+Suggests: fp-utils, fp-docs (>= 1.0.5)
 Replaces: fpc
 Description: Free Pascal Compiler
  The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
@@ -22,7 +21,7 @@ Description: Free Pascal Compiler
 
 Package: fp-utils
 Architecture: i386
-Recommends: fp-compiler (= 1.0.3-0.20001206.1)
+Recommends: fp-compiler (= 1.0.5-0)
 Replaces: fpc
 Description: Free Pascal Utils
  This package contains some handy utils for usage with the Free Pascal
@@ -46,14 +45,15 @@ Description: Free Pascal Documentation
 
 Package: fp-units-rtl
 Architecture: i386
-Recommends: fp-compiler (= 1.0.3-0.20001206.1)
-Replaces: fpc, fp-rtl
+Recommends: fp-compiler (= 1.0.5-0)
+Replaces: fpc, fp-rtl, fp-units-api
+Provides: fp-units-api
 Description: Free Pascal Runtime Library
  Runtime Libraries for the Free Pascal Compiler.
 
 Package: fp-units-base
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0)
 Description: Free Pascal base units
  Free Pascal units for common libraries, some of these units are also
  required by the Free Component Library :
@@ -63,37 +63,31 @@ Description: Free Pascal base units
 
 Package: fp-units-fcl
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1), fp-units-base (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0), fp-units-base (= 1.0.5-0)
 Replaces: fp-fcl
 Description: Free Pascal Free Component Library
  Free Component Library for the Free Pascal Compiler.
 
-Package: fp-units-api
-Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
-Replaces: fp-api
-Description: Free Pascal API units
- Free Pascal units for console keyboard,mouse,video and file handling.
-
 Package: fp-units-gtk
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0)
 Replaces: fp-gtk
 Description: Free Pascal units for GTK 1.2.x
  Free Pascal units and examples to create programs with GTK 1.2.x
 
 Package: fp-units-db
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0)
 Description: Free Pascal units for some database libraries
  Free Pascal units with bindings for:
   - Mysql
   - Interbase
   - Postgres
+  - Oracle
 
 Package: fp-units-gfx
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1), fp-units-base (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0), fp-units-base (= 1.0.5-0)
 Description: Free Pascal units for some graphics libraries
  Free Pascal units with bindings for:
   - Forms 0.88
@@ -103,7 +97,7 @@ Description: Free Pascal units for some graphics libraries
 
 Package: fp-units-net
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0)
 Description: Free Pascal units for networking
  Free Pascal units for creating network tools:
   - Inet unit for easier tcp/ip handling
@@ -111,7 +105,7 @@ Description: Free Pascal units for networking
 
 Package: fp-units-misc
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0)
 Description: Free Pascal miscellaneous units
  Free Pascal miscellaneous units for:
   - Utmp

install/debian/control.in

@@ -1,7 +1,6 @@
 Source: fpc
 Section: devel
 Priority: optional
-Architecture: i386
 Maintainer: Ulf Jaenicke-Roessler <[email protected]>
 Standards-Version: 3.1.1
 Build-Depends: fp-compiler, debhelper, tetex-bin, awk
@@ -47,7 +46,8 @@ Description: Free Pascal Documentation
 Package: fp-units-rtl
 Architecture: i386
 Recommends: fp-compiler (= %{packageversion})
-Replaces: fpc, fp-rtl
+Replaces: fpc, fp-rtl, fp-units-api
+Provides: fp-units-api
 Description: Free Pascal Runtime Library
  Runtime Libraries for the Free Pascal Compiler.
 
@@ -68,13 +68,6 @@ Replaces: fp-fcl
 Description: Free Pascal Free Component Library
  Free Component Library for the Free Pascal Compiler.
 
-Package: fp-units-api
-Architecture: i386
-Depends: fp-units-rtl (= %{packageversion})
-Replaces: fp-api
-Description: Free Pascal API units
- Free Pascal units for console keyboard,mouse,video and file handling.
-
 Package: fp-units-gtk
 Architecture: i386
 Depends: fp-units-rtl (= %{packageversion})
@@ -90,6 +83,7 @@ Description: Free Pascal units for some database libraries
   - Mysql
   - Interbase
   - Postgres
+  - Oracle
 
 Package: fp-units-gfx
 Architecture: i386

install/debian/fp-units-api.files.in

@@ -1,2 +0,0 @@
-/usr/share/doc/fp-units-api
-/usr/lib/fpc/%{fpcversion}/units/linux/api

install/debian/fp-units-base.files.in

@@ -1,28 +1,6 @@
 /usr/share/doc/fp-units-base
 
-/usr/lib/fpc/%{fpcversion}/units/linux/zlib.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libzlib.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/zlib.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/ncurses.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/panel.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ncrt.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ocrt.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libocrt.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/ocrt.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libncrt.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/ncrt.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libncurses.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/ncurses.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/x.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/xlib.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/xutil.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/xresource.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/regexpr.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libregexpr.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/regexpr.o
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib
+/usr/lib/fpc/%{fpcversion}/units/linux/ncurses
+/usr/lib/fpc/%{fpcversion}/units/linux/x11
+/usr/lib/fpc/%{fpcversion}/units/linux/regexpr

install/debian/fp-units-db.files.in

@@ -1,26 +1,6 @@
 /usr/share/doc/fp-units-db
 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql_com.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql_version.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libmysql.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libmysql_version.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql_version.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libmysql_com.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql_com.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/ibase40.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ibase60.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libibase40.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/ibase40.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/dllist.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/postgres.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libpostgres.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/postgres.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libdllist.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/dllist.o
+/usr/lib/fpc/%{fpcversion}/units/linux/mysql
+/usr/lib/fpc/%{fpcversion}/units/linux/ibase
+/usr/lib/fpc/%{fpcversion}/units/linux/postgres
+/usr/lib/fpc/%{fpcversion}/units/linux/oracle

install/debian/fp-units-gfx.files.in

@@ -1,29 +1,10 @@
 /usr/share/doc/fp-units-gfx
 
-/usr/lib/fpc/%{fpcversion}/units/linux/gl.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/glut.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libglut.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/glut.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libgl.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/gl.o
+/usr/lib/fpc/%{fpcversion}/units/linux/opengl
+/usr/lib/fpc/%{fpcversion}/units/linux/forms
+/usr/lib/fpc/%{fpcversion}/units/linux/svgalib
+/usr/lib/fpc/%{fpcversion}/units/linux/ggi
+/usr/lib/fpc/%{fpcversion}/units/linux/libgd
+/usr/lib/fpc/%{fpcversion}/units/linux/libpng
 
 /usr/bin/fd2pascal
-
-/usr/lib/fpc/%{fpcversion}/units/linux/forms.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libforms.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/forms.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/svgalib.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/vgamouse.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libsvgalib.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/svgalib.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/gii.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ggi.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ggi2d.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libggi.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/ggi.o

install/debian/fp-units-gtk.files.in

@@ -1,13 +1,3 @@
 /usr/share/doc/fp-units-gtk
 
-/usr/lib/fpc/%{fpcversion}/units/linux/glib.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/gmodule.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/gdk.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/gtk.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/glib.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libglib.a
-/usr/lib/fpc/%{fpcversion}/units/linux/gdk.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libgdk.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/gtk.o
-/usr/lib/fpc/%{fpcversion}/units/linux/libgtk.a
+/usr/lib/fpc/%{fpcversion}/units/linux/gtk

install/debian/fp-units-misc.files.in

@@ -1,87 +1,8 @@
 /usr/share/doc/fp-units-misc
 
-/usr/lib/fpc/%{fpcversion}/units/linux/cmem.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libcmem.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/cmem.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/utmp.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libutmp.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/utmp.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/systemlog.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libsystemlog.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/systemlog.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/gdbint.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/gdbcon.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libgdbcon.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/gdbcon.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/gdbint.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrc.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrcasm.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infcodes.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inffast.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inftrees.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infutil.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/strutils.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/trees.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zcompres.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zdeflate.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zinflate.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zbase.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zuncompr.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zutil.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzutil.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zutil.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzuncompr.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zuncompr.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzbase.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zbase.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzinflate.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zinflate.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzdeflate.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zdeflate.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzcompres.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zcompres.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libtrees.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/trees.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libstrutils.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/strutils.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinfutil.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infutil.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinftrees.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inftrees.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinffast.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inffast.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinfcodes.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infcodes.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinfblock.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzio.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzcrcasm.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrcasm.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzcrc.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrc.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libadler.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libpaszlib.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/ziptypes.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/unzip.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libunzip.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/unzip.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libziptypes.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/ziptypes.o
+/usr/lib/fpc/%{fpcversion}/units/linux/cmem
+/usr/lib/fpc/%{fpcversion}/units/linux/utmp
+/usr/lib/fpc/%{fpcversion}/units/linux/zlib
+/usr/lib/fpc/%{fpcversion}/units/linux/syslog
+/usr/lib/fpc/%{fpcversion}/units/linux/gdbint
+/usr/lib/fpc/%{fpcversion}/units/linux/unzip

install/debian/fp-units-net.files.in

@@ -1,11 +1,4 @@
 /usr/share/doc/fp-units-net
 
-/usr/lib/fpc/%{fpcversion}/units/linux/inet.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libinet.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/inet.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/uncgi.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libuncgi.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/uncgi.o
+/usr/lib/fpc/%{fpcversion}/units/linux/inet
+/usr/lib/fpc/%{fpcversion}/units/linux/uncgi

install/debian/fp-utils.files.in

@@ -10,6 +10,7 @@
 /usr/bin/plex
 /usr/bin/pyacc
 /usr/bin/h2pas
+/usr/bin/h2paspp
 /usr/bin/postw32
 /usr/bin/fpcmake
 /usr/bin/fprcp

install/debian/rules

@@ -14,12 +14,12 @@ PWD:=$(shell pwd)
 BUILD_DIR=$(PWD)/debian/build
 INSTALL_DIR=$(PWD)/debian/tmp
 DOC_DIR=$(INSTALL_DIR)/usr/share/doc
+EXAMPLE_TEMP=$(INSTALL_DIR)/usr/doc/fpc-$(FPCVERSION)/examples
 # Get utils
 NEWPP=$(PWD)/compiler/ppc386
-NEWPPUFILES=$(PWD)/utils/ppufiles
 # Create default options
 BUILDOPTS=PP=$(NEWPP)
-INSTALLOPTS=PP=$(NEWPP) PPUFILES=$(NEWPPUFILES) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+INSTALLOPTS=PP=$(NEWPP) INSTALL_PREFIX=$(INSTALL_DIR)/usr
 
 export DH_COMPAT=2
 # export DH_VERBOSE=1
@@ -40,10 +40,9 @@ clean:
 
 	$(MAKE) compiler_distclean
 	$(MAKE) rtl_distclean
+	$(MAKE) packages_distclean
 	$(MAKE) fcl_distclean
-	$(MAKE) api_distclean
 	$(MAKE) utils_distclean
-	$(MAKE) packages_distclean
 
 	$(MAKE) -C docs clean
 
@@ -81,11 +80,9 @@ build-arch-stamp: debian-files-stamp
 # First make a new Compiler and RTL using a make cycle
 	$(MAKE) compiler_cycle
 	$(MAKE) rtl_clean rtl_smart $(BUILDOPTS)
-	$(MAKE) fcl_smart $(BUILDOPTS)
-	$(MAKE) api_smart $(BUILDOPTS)
 	$(MAKE) packages_smart $(BUILDOPTS)
+	$(MAKE) fcl_smart $(BUILDOPTS)
 	$(MAKE) utils_all $(BUILDOPTS)
-	$(MAKE) compiler_fpcexe $(BUILDOPTS)
 
 	touch build-arch-stamp
 
@@ -98,25 +95,55 @@ install-arch-stamp: build-arch-stamp debian-files-stamp
 	dh_clean -k
 
 # Specify the compiler to use so installing will use the correct versioned dir
-	$(MAKE) compiler_install $(INSTALLOPTS)
-	$(MAKE) rtl_install $(INSTALLOPTS)
-	$(MAKE) fcl_install $(INSTALLOPTS)
-	$(MAKE) api_install $(INSTALLOPTS)
-	$(MAKE) utils_install $(INSTALLOPTS)
-	$(MAKE) packages_install $(INSTALLOPTS)
-
-	$(MAKE) fcl_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-fcl
-	$(MAKE) api_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-api
-	$(MAKE) -C packages pkggtk_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-gtk
-	$(MAKE) -C packages pkggfx_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-gfx
-	$(MAKE) -C packages pkgmisc_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-misc
-	$(MAKE) -C packages pkgbase_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-base
-	$(MAKE) -C packages pkgnet_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-net
-	$(MAKE) -C packages pkgdb_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-db
-
-	$(MAKE) man_install $(INSTALLOPTS) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr/share
-	$(MAKE) demo_install $(INSTALLOPTS) DOCINSTALLDIR=$(INSTALL_DIR)/usr/share/doc/fp-compiler
-	$(MAKE) doc_install $(INSTALLOPTS) DOCINSTALLDIR=$(INSTALL_DIR)/usr/share/doc/fp-compiler
+	$(MAKE) compiler_distinstall $(INSTALLOPTS)
+	$(MAKE) rtl_distinstall $(INSTALLOPTS)
+	$(MAKE) packages_distinstall $(INSTALLOPTS)
+	$(MAKE) fcl_distinstall $(INSTALLOPTS)
+	$(MAKE) utils_distinstall $(INSTALLOPTS)
+
+# Copy examples to the correct doc dir
+	install -d -m755 $(DOC_DIR)/fp-units-fcl/examples
+	install -d -m755 $(DOC_DIR)/fp-units-gtk/examples
+	install -d -m755 $(DOC_DIR)/fp-units-gfx/examples
+	install -d -m755 $(DOC_DIR)/fp-units-db/examples
+	install -d -m755 $(DOC_DIR)/fp-units-net/examples
+	install -d -m755 $(DOC_DIR)/fp-units-misc/examples
+	install -d -m755 $(DOC_DIR)/fp-units-base/examples
+
+	mv -f $(EXAMPLE_TEMP)/fcl $(DOC_DIR)/fp-units-fcl/examples
+
+	mv -f $(EXAMPLE_TEMP)/gtk $(DOC_DIR)/fp-units-gtk/examples
+
+	mv -f $(EXAMPLE_TEMP)/paszlib $(DOC_DIR)/fp-units-base/examples
+	mv -f $(EXAMPLE_TEMP)/regexpr $(DOC_DIR)/fp-units-base/examples
+	mv -f $(EXAMPLE_TEMP)/ncurses $(DOC_DIR)/fp-units-base/examples
+
+	mv -f $(EXAMPLE_TEMP)/forms $(DOC_DIR)/fp-units-gfx/examples
+	mv -f $(EXAMPLE_TEMP)/ggi $(DOC_DIR)/fp-units-gfx/examples
+	mv -f $(EXAMPLE_TEMP)/libgd $(DOC_DIR)/fp-units-gfx/examples
+	mv -f $(EXAMPLE_TEMP)/svgalib $(DOC_DIR)/fp-units-gfx/examples
+	mv -f $(EXAMPLE_TEMP)/opengl $(DOC_DIR)/fp-units-gfx/examples
+
+	mv -f $(EXAMPLE_TEMP)/ibase $(DOC_DIR)/fp-units-db/examples
+	mv -f $(EXAMPLE_TEMP)/mysql $(DOC_DIR)/fp-units-db/examples
+	mv -f $(EXAMPLE_TEMP)/oracle $(DOC_DIR)/fp-units-db/examples
+	mv -f $(EXAMPLE_TEMP)/postgres $(DOC_DIR)/fp-units-db/examples
+	
+	mv -f $(EXAMPLE_TEMP)/cmem $(DOC_DIR)/fp-units-misc/examples
+	mv -f $(EXAMPLE_TEMP)/gdbint $(DOC_DIR)/fp-units-misc/examples
+	mv -f $(EXAMPLE_TEMP)/utmp $(DOC_DIR)/fp-units-misc/examples
+	mv -f $(EXAMPLE_TEMP)/syslog $(DOC_DIR)/fp-units-misc/examples
+
+	mv -f $(EXAMPLE_TEMP)/inet $(DOC_DIR)/fp-units-net/examples
+	mv -f $(EXAMPLE_TEMP)/uncgi $(DOC_DIR)/fp-units-net/examples
+
+# Check if all examples are removed, if not then the rmdir will fail
+	rmdir $(EXAMPLE_TEMP)
+
+# Install man pages and RTL demos and whatsnew and readme
+	$(MAKE) man_install $(INSTALLOPTS) INSTALL_PREFIX=$(INSTALL_DIR)/usr/share
+	$(MAKE) demo_install $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-compiler
+	$(MAKE) doc_install $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-compiler
 
 # Create ppc386.cfg which is included as conffile
 	chmod 755 compiler/utils/samplecfg 
@@ -204,9 +231,8 @@ binary-arch: build-arch arrange-arch debian-files
 
 	dh_installchangelogs -pfp-compiler logs/Changes.compiler
 	dh_installchangelogs -pfp-units-rtl logs/Changes.rtl
-	dh_installchangelogs -pfp-utils logs/Changes.utils
 	dh_installchangelogs -pfp-units-fcl logs/Changes.fcl
-	dh_installchangelogs -pfp-units-api logs/Changes.api
+	dh_installchangelogs -pfp-utils logs/Changes.utils
 
 	dh_undocumented -a
 	dh_installexamples -a

install/fpc-docs.spec

@@ -1,15 +1,15 @@
 Name: fpc-docs
-Version: 1.0.4
+Version: 1.0.5
 Release: 1
 Copyright: GPL
 Group: Development/Languages
-Source: fpc-docs-1.0.4-src.tar.gz
+Source: fpc-docs-1.0.5-src.tar.gz
 Summary: Free Pascal Compiler Documentation
 Packager: Peter Vreman ([email protected])
 URL: http://www.freepascal.org/
 BuildRoot: /tmp/fpc-docs-build
 
-%define fpcversion 1.0.4
+%define fpcversion 1.0.5
 %define fpcdir /usr/lib/fpc/%{fpcversion}
 %define docdir /usr/doc/fpc-%{fpcversion}
 

install/os2snap.bat

@@ -17,25 +17,23 @@ rem *** One of the following parameters may be specified: rtl, compiler,
 rem *** both, cycle and snapshot ("snapshot" being the default), optionally
 rem *** followed by parameters "debug" (causing debugging symbols not to be
 rem *** stripped from the created compiler), "release" (code optimization,
-rem *** debug info stripped out, no SNAPSHOT.TXT file generated), and
-rem *** "verbose" (compiler messages are shown). Parameters "debug" and
-rem *** "release" are mutually exclusive (the later one is used if both are
-rem *** present). Parameter "ppas" forces only PPAS script to be created by
-rem *** the compiler and called manually afterwards. This might help to
-rem *** resolve LD crashes due to low stack (e.g. under WinXX). Parameter
-rem *** "continue" disables the standard cleanup (deleting possible
-rem *** previously compiled versions), so compilation can continue after
-rem *** previous unsuccessful attempt. All the parameters _must_ be in
-rem *** lowercase to be recognized correctly, unless running under 4dos
-rem *** or compatible (e.g. NDOS for DOS, 4nt under WinNT, etc.).
-rem *** Meaning of basic parameters:
+rem *** debug info stripped out), and "verbose" (compiler messages are
+rem *** shown; the same can be accomplished with setting environment
+rem *** variable DOVERBOSE to 1). Parameters "debug" and "release" are
+rem *** mutually exclusive (the later one is used if both are present).
+rem *** Parameter "ppas" forces only PPAS script to be created
+rem *** by the compiler and called manually afterwards. This might help
+rem *** to resolve LD crashes due to low stack (e.g. under WinXX).
+rem *** Parameters _must_ be in lowercase to be recognized correctly,
+rem *** unless running under 4dos or compatible (e.g. NDOS).
+rem *** Meaning of parameters:
 rem ***  rtl .......... RTL only, _no_ snapshot created
 rem ***  compiler ..... compiler only, _no_ snapshot created
 rem ***  both ......... both RTL and compiler, _no_ snapshot created
 rem ***  snapshot ..... both RTL and compiler, snapshot _is_ created
 rem ***  cycle ........ RTL and compiler compiled, the resulting compiler
 rem ***                 is then copied to %FPCTOOLS% (BIN\OS2 by default)
-rem ***                 backing up possible previous version to ppc386.x),
+rem ***                 backing up possible previous version to ppos2.x),
 rem ***                 the whole procedure is started again (RTL is compiled
 rem ***                 with the new compiler version this time) and after
 rem ***                 another cycle (to make sure the new compiler works
@@ -75,8 +73,6 @@ if exist %FPCDIR%\makefile goto DirOK
 if exist %FPCDIR%\COMPILER\pp.pas goto DirOK
 if exist %FPCDIR%\SOURCE\makefile goto DirOK
 if exist %FPCDIR%\SOURCE\COMPILER\pp.pas goto DirOK
-if exist %FPCDIR%\SRC\makefile goto DirOK
-if exist %FPCDIR%\SRC\COMPILER\pp.pas goto DirOK
 goto ErrorDir
 
 :DirOK
@@ -86,19 +82,11 @@ if exist %FPCDIR%\SOURCE goto SrcExists
 if exist %FPCDIR%\SOURCE\. goto SrcExists
 if exist %FPCDIR%\SOURCE\makefile goto SrcExists
 if exist %FPCDIR%\SOURCE\COMPILER\pp.pas goto SrcExists
-if exist %FPCDIR%\SRC goto Src2Exists
-if exist %FPCDIR%\SRC\. goto Src2Exists
-if exist %FPCDIR%\SRC\makefile goto Src2Exists
-if exist %FPCDIR%\SRC\COMPILER\pp.pas goto Src2Exists
 set FPCSRC=%FPCDIR%
 goto SnapDir
 
 :SrcExists
 set FPCSRC=%FPCDIR%\SOURCE
-goto SnapDir
-
-:Src2Exists
-set FPCSRC=%FPCDIR%\SRC
 
 :SnapDir
 set FPCSNAP=%FPCSNAPPATH%
@@ -217,9 +205,8 @@ set OS2OPT2=-dGDB
 set OS2OPT3=-dI386
 set OS2OPT4=-Sg
 rem "Release" options (optimizations, strip debug symbols)
-set RELEASEOPT1=-OG3p3
+set RELEASEOPT1=-Og2p1
 set RELEASEOPT2=-Xs
-set DORELEASE=
 rem "Debug" options (add debug symbols, do all code generation checks)
 set DEBUGOPT1=-g
 set DEBUGOPT2=-Crtoi
@@ -237,9 +224,9 @@ set OS2OBJP=-Fo%OS2RTL%
 rem Path to units
 set OS2UNITP=-Fu%FPCSNAPRTL%
 rem Path to compiler units
-set COMPUNITP=-Fu%COMPSPATH%
+set COMPUNITP=-Fu%COMPSPATH%;%COMPSPATH%\i386;%COMPSPATH%\targets
 rem Path to compiler include files
-set COMPINCP=-Fi%COMPSPATH%
+set COMPINCP=-Fi%COMPSPATH%;%COMPSPATH%\i386
 rem Path to compiler object files
 set COMPOBJP=-Fo%COMPSPATH%
 rem Target path for RTL units
@@ -256,8 +243,6 @@ rem Name of the PPAS script
 set PPASNAME=PPAS.BAT
 rem Default compiler for the first compilation
 set CYCLE=0
-rem Do the cleanup by default
-set CONT=
 if not .%CYCLE% == .0 goto EnvErr
 set COMPILER=%FPCCOMPILER%
 if not .%COMPILER% == .%FPCCOMPILER% goto EnvErr
@@ -309,26 +294,22 @@ if not %@EVAL[0] == 0 goto ParLoop
 set PARAMS=%@LOWER[%PARAMS%]
 :ParLoop
 shift
-if .%1 == . goto NoPars
+if %1. == . goto NoPars
 if %@EVAL[0] == 0 goto Shl1
 if %1 == debug set CURRENTOPT1=%DEBUGOPT1%
 if %1 == debug set CURRENTOPT2=%DEBUGOPT2%
 if %1 == release set CURRENTOPT1=%RELEASEOPT1%
 if %1 == release set CURRENTOPT2=%RELEASEOPT2%
-if %1 == release set DORELEASE=1
 if %1 == verbose set DOVERBOSE=1
 if %1 == ppas set FORCEPPAS=1
-if %1 == continue set CONT=1
 goto ParLoop
 :Shl1
 if %@LOWER[%1] == debug set CURRENTOPT1=%DEBUGOPT1%
 if %@LOWER[%1] == debug set CURRENTOPT2=%DEBUGOPT2%
 if %@LOWER[%1] == release set CURRENTOPT1=%RELEASEOPT1%
 if %@LOWER[%1] == release set CURRENTOPT2=%RELEASEOPT2%
-if %@LOWER[%1] == release set DORELEASE=1
 if %@LOWER[%1] == verbose set DOVERBOSE=1
 if %@LOWER[%1] == ppas set FORCEPPAS=1
-if %@LOWER[%1] == continue set CONT=1
 goto ParLoop
 :NoPars
 if %PARAMS% == clean goto CleanRTL
@@ -341,7 +322,6 @@ echo *Error: Unknown parameter - %PARAMS% >> %FPCERRLOG%
 goto End
 
 :CleanRTL
-if .%CONT% == .1 goto ContClRTL
 if %@EVAL[0] == 0 goto JPCleanRTL
 echo *Cleaning up the RTL (error messages are OK here) ... >> %FPCERRLOG%
 del %OS2OPTF% >> %FPCERRLOG%
@@ -372,7 +352,6 @@ del %FPCSNAPRTL%\link.res >& nul >> %FPCERRLOG%
 :ContClRTL
 if %PARAMS% == rtl goto Branches
 :CleanCompiler
-if .%CONT% == .1 goto ContClComp
 if %@EVAL[0] == 0 goto JPCleanComp
 echo *Cleaning up the compiler (error messages are OK here) ... >> %FPCERRLOG%
 del %OS2OPTF% >> %FPCERRLOG%
@@ -380,7 +359,7 @@ del %COMPSPATH%\*.ppo >> %FPCERRLOG%
 del %COMPSPATH%\*.oo2 >> %FPCERRLOG%
 del %COMPSPATH%\pp >> %FPCERRLOG%
 del %COMPSPATH%\pp.exe >> %FPCERRLOG%
-del %COMPSPATH%\ppc386.exe >> %FPCERRLOG%
+del %COMPSPATH%\ppos2.exe >> %FPCERRLOG%
 del %COMPSPATH%\ppas.bat >> %FPCERRLOG%
 del %COMPSPATH%\ppas.cmd >> %FPCERRLOG%
 del %COMPSPATH%\link.res >> %FPCERRLOG%
@@ -388,7 +367,7 @@ del %FPCSNAPBIN%\*.ppo >> %FPCERRLOG%
 del %FPCSNAPBIN%\*.oo2 >> %FPCERRLOG%
 del %FPCSNAPBIN%\pp >> %FPCERRLOG%
 del %FPCSNAPBIN%\pp.exe >> %FPCERRLOG%
-del %FPCSNAPBIN%\ppc386.exe >> %FPCERRLOG%
+del %FPCSNAPBIN%\ppos2.exe >> %FPCERRLOG%
 del %FPCSNAPBIN%\ppas.bat >> %FPCERRLOG%
 del %FPCSNAPBIN%\ppas.cmd >> %FPCERRLOG%
 del %FPCSNAPBIN%\link.res >> %FPCERRLOG%
@@ -400,7 +379,7 @@ del %COMPSPATH%\*.ppo >& nul >> %FPCERRLOG%
 del %COMPSPATH%\*.oo2 >& nul >> %FPCERRLOG%
 del %COMPSPATH%\pp >& nul >> %FPCERRLOG%
 del %COMPSPATH%\pp.exe >& nul >> %FPCERRLOG%
-del %COMPSPATH%\ppc386.exe >& nul >> %FPCERRLOG%
+del %COMPSPATH%\ppos2.exe >& nul >> %FPCERRLOG%
 del %COMPSPATH%\ppas.bat >& nul >> %FPCERRLOG%
 del %COMPSPATH%\ppas.cmd >& nul >> %FPCERRLOG%
 del %COMPSPATH%\link.res >& nul >> %FPCERRLOG%
@@ -408,7 +387,7 @@ del %FPCSNAPBIN%\*.ppo >& nul >> %FPCERRLOG%
 del %FPCSNAPBIN%\*.oo2 >& nul >> %FPCERRLOG%
 del %FPCSNAPBIN%\pp >& nul >> %FPCERRLOG%
 del %FPCSNAPBIN%\pp.exe >& nul >> %FPCERRLOG%
-del %FPCSNAPBIN%\ppc386.exe >& nul >> %FPCERRLOG%
+del %FPCSNAPBIN%\ppos2.exe >& nul >> %FPCERRLOG%
 del %FPCSNAPBIN%\ppas.bat >& nul >> %FPCERRLOG%
 del %FPCSNAPBIN%\ppas.cmd >& nul >> %FPCERRLOG%
 del %FPCSNAPBIN%\link.res >& nul >> %FPCERRLOG%
@@ -416,7 +395,6 @@ del %FPCSNAPBIN%\link.res >& nul >> %FPCERRLOG%
 if %PARAMS% == compiler goto Branches
 if %PARAMS% == both goto Branches
 :CleanSnapshot
-if .%CONT% == .1 goto ContClSnap
 if %@EVAL[0] == 0 goto JPCleanSnap
 echo *Deleting the old snapshot (error messages are OK here) ... >> %FPCERRLOG%
 del %FPCSNAPDOC%\*.txt >> %FPCERRLOG%
@@ -514,10 +492,6 @@ echo *Compiling unit SysUtils ... >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\SYSUTILS.PP
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
-echo *Compiling unit VarUtils (doesn't exist in 1.0.x - won't be found then) ... >> %FPCERRLOG%
-%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\VARUTILS.PP
-if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
-if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
 echo *Compiling unit TypInfo ... >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\TYPINFO.PP
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
@@ -546,10 +520,6 @@ echo *Compiling unit LineInfo ... >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\LINEINFO.PP
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
-echo *Compiling unit DynLibs (doesn't exist in 1.0.x - won't be found then) ... >> %FPCERRLOG%
-%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\DYNLIBS.PP
-if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
-if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
 echo *Compiling unit KbdCalls ... >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\KBDCALLS.PAS
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
@@ -585,6 +555,16 @@ echo *Compiling MMOS2 units ... >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DIVE.PAS
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
+echo *Compiling API unts ... >> %FPCERRLOG%
+%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\MOUSE.PP
+if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
+if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
+%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\KEYBOARD.PP
+if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
+if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
+%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\VIDEO.PP
+if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
+if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 echo * Deleting the PPAS script >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 del %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
 
@@ -618,12 +598,6 @@ echo *End of basic options used for compilation >> %FPCERRLOG%
 if not .%OTHEROPTS% == . echo *User specified options: %OTHEROPTS% >> %FPCERRLOG%
 :CompS2
 echo *Compiling the compiler ... >> %FPCERRLOG%
-%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %COMPSPATH%\FPC.PAS
-if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
-if .%FORCEPPAS% == .1 call %FPCSNAPBIN%\%PPASNAME% >> %FPCERRLOG%
-if .%FORCEPPAS% == .1 echo * Deleting the PPAS script >> %FPCERRLOG%
-if .%FORCEPPAS% == .1 del %FPCSNAPBIN%\%PPASNAME% >> %FPCERRLOG%
-if .%FORCEPPAS% == .1 del %FPCSNAPBIN%\link.res >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %COMPSPATH%\PP.PAS
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 call %FPCSNAPBIN%\%PPASNAME% >> %FPCERRLOG%
@@ -631,8 +605,8 @@ if .%FORCEPPAS% == .1 echo * Deleting the PPAS script >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 del %FPCSNAPBIN%\%PPASNAME% >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 del %FPCSNAPBIN%\link.res >> %FPCERRLOG%
 :Comp2
-ren %FPCSNAPBIN%\pp.exe ppc386.exe >> %FPCERRLOG%
-if exist %FPCSNAPBIN%\ppc386.exe goto OKCompiler
+ren %FPCSNAPBIN%\pp.exe ppos2.exe >> %FPCERRLOG%
+if exist %FPCSNAPBIN%\ppos2.exe goto OKCompiler
 if not exist %FPCSNAPBIN%\pp goto C2Cont
 if exist %FPCSNAPBIN%\ppas.bat goto PPasBat
 if exist %FPCSNAPBIN%\ppas.cmd goto PPasCmd
@@ -658,13 +632,13 @@ goto CopyFiles
 :Cycle
 
 rem Another loop?
-if .%CYCLE% == .2 goto CopyFiles
-echo *Backing up previous compiler version to ppc386.%CYCLE% ... >> %FPCERRLOG%
-copy %REALTOOLS%ppc386.exe %REALTOOLS%ppc386.%CYCLE% >> %FPCERRLOG%
+if %CYCLE% == 2 goto CopyFiles
+echo *Backing up previous compiler version to ppos2.%CYCLE% ... >> %FPCERRLOG%
+copy %REALTOOLS%ppos2.exe %REALTOOLS%ppos2.%CYCLE% >> %FPCERRLOG%
 echo *Copying the newly created compiler to %REALTOOLS% ... >> %FPCERRLOG%
-copy %FPCSNAPBIN%\ppc386.exe %REALTOOLS%. >> %FPCERRLOG%
-if .%CYCLE% == .1 goto Cycle2
-set COMPILER=PPC386.EXE
+copy %FPCSNAPBIN%\ppos2.exe %REALTOOLS%. >> %FPCERRLOG%
+if %CYCLE% == 1 goto Cycle2
+set COMPILER=PPOS2.EXE
 set CYCLE=1
 goto NoPars
 
@@ -673,15 +647,12 @@ set CYCLE=2
 goto NoPars
 
 :CopyFiles
-echo *Copying the message files ... >> %FPCERRLOG%
-copy %COMPSPATH%\*.msg %FPCSNAPMSG% >> %FPCERRLOG%
+set FPCSNAPTXT=%FPCSNAPDOC%\snapshot.txt
 echo *Copying the documentation ... >> %FPCERRLOG%
 copy %FPCSRC%\INSTALL\DOC\*.txt %FPCSNAPDOC% >> %FPCERRLOG%
 copy %FPCSRC%\INSTALL\DOC\*.htm* %FPCSNAPDOC% >> %FPCERRLOG%
 copy %FPCSRC%\INSTALL\DOC\copying.* %FPCSNAPDOC% >> %FPCERRLOG%
-if .%DORELEASE% == .1 goto CopyDone
 echo *Creating the snapshot readme file ... >> %FPCERRLOG%
-set FPCSNAPTXT=%FPCSNAPDOC%\snapshot.txt
 echo This is a FPC snapshot for OS/2. It contains compilation of the most current >> %FPCSNAPTXT%
 echo developers' sources as of time of its creation. It contains the latest fixes >> %FPCSNAPTXT%
 echo but might contain some new bugs as well, since it's less tested than regular >> %FPCSNAPTXT%
@@ -691,29 +662,30 @@ echo the list in your e-mail, if it's the case). >> %FPCSNAPTXT%
 echo The snapshot has the same structure as the release ZIP files, so it may be >> %FPCSNAPTXT%
 echo installed using the normal installer (INSTALL.EXE and INSTALL.DAT must be >> %FPCSNAPTXT%
 echo in the same directory) or directly unzipped into your FPC tree. >> %FPCSNAPTXT%
+echo *Copying the message files ... >> %FPCERRLOG%
+copy %COMPSPATH%\msg\*.msg %FPCSNAPMSG% >> %FPCERRLOG%
 
-:CopyDone
 if %@EVAL[0] == 0 goto Pack
 echo *Warning: Packing in this environment might fail. >> %FPCERRLOG%
-echo *Should you encounter any problems, make sure the current directory, i.e. >> %FPCERRLOG%
-cd >> %FPCERRLOG%
-echo *is on the same drive as %FPCSNAP%. >> %FPCERRLOG%
+echo *You should press Ctrl-Break now if the current drive is different from that >> %FPCERRLOG%
+echo *of %FPCSNAP%; otherwise press any key to continue. >> %FPCERRLOG%
+if not %FPCERRLOG% == CON echo *Warning: Packing in this environment might fail.
+if not %FPCERRLOG% == CON echo *You should press Ctrl-Break now if the current drive is different from that
+if not %FPCERRLOG% == CON echo *of %FPCDIR%; otherwise press any key to continue.
+pause>nul
 cd %FPCSNAP%
 
 :Pack
 echo *Packing the snapshot ... >> %FPCERRLOG%
 if %@EVAL[0] == 0 goto SHL2
-rem ZIP.EXE must be on the PATH
-rem Redirection to the log file doesn't fit to the maximum command line length
-zip -9r baseemx bin\os2\*.exe doc\*.* msg\*.* units\os2\rtl\*.ppo units\os2\rtl\*.oo2 units\os2\rtl\*.ao2 units\os2\rtl\*.rst
 goto Cmd2
 :Shl2
 pushd
 cdd %FPCSNAP%
-rem ZIP.EXE must be on the PATH
-zip -9r baseemx bin\os2\*.exe doc\*.* msg\*.* units\os2\rtl\*.ppo units\os2\rtl\*.oo2 units\os2\rtl\*.ao2 units\os2\rtl\*.rst  >> %FPCERRLOG%
-
 :Cmd2
+
+rem ZIP.EXE must be on the PATH
+zip -9 -r baseemx.zip bin\os2\ppos2.exe doc\*.* msg\*.* units\os2\rtl\*.ppo units\os2\rtl\*.oo2 units\os2\rtl\*.ao2 >> %FPCERRLOG%
 if exist baseemx.zip goto ZipOK
 echo *Error: The ZIP file hasn't been created!! >> %FPCERRLOG%
 :ZipOK
@@ -733,17 +705,11 @@ goto End
 
 
   $Log$
-  Revision 1.5  2000-12-03 18:40:56  hajny
-    * fpc.pas added
-
-  Revision 1.4  2000/10/14 19:46:58  hajny
-    * fix for continue parameter
-
-  Revision 1.3  2000/10/08 18:44:36  hajny
-    + DynLibs added
+  Revision 1.6  2001-06-28 21:09:43  peter
+    * latest versions from 1.0.5 branch
 
-  Revision 1.2  2000/10/07 11:47:54  hajny
-    * updates for 1.1, etc.
+  Revision 1.1.2.1  2001/05/15 18:41:00  carl
+  * updated to work with FPC v1.0.x
 
   Revision 1.1  2000/07/14 10:09:29  michael
   + Moved from base

install/os2snap.cmd

@@ -5,7 +5,7 @@ rem ***  $Id$
 rem *** Batch file for creating of FPC snapshot for OS/2.
 rem *** FPCDIR variable must be set to your base FPC directory and
 rem *** must _not_ contain forward slashes (only backslashes allowed).
-rem *** Your compiler (PPC386.EXE per default) and AS.EXE must be somewhere
+rem *** Your compiler (PPOS2.EXE per default) and AS.EXE must be somewhere
 rem *** on PATH (unless you set path to them explicitly using FPCTOOLS
 rem *** variable, which must end with \ if present). However, be sure which
 rem *** version of AS.EXE, etc. gets called if several such files exist.
@@ -13,33 +13,31 @@ rem *** One of the following parameters may be specified: rtl, compiler,
 rem *** both, cycle and snapshot ("snapshot" being the default), optionally
 rem *** followed by parameters "debug" (causing debugging symbols not to be
 rem *** stripped from the created compiler), "release" (code optimization,
-rem *** debug info stripped out, no SNAPSHOT.TXT file generated), and
-rem *** "verbose" (compiler messages are shown). Parameters "debug" and
-rem *** "release" are mutually exclusive (the later one is used if both are
-rem *** present). Parameter "ppas" forces only PPAS script to be created by
-rem *** the compiler and called manually afterwards.  This might help to
-rem *** resolve LD crashes due to low stack (e.g. under WinXX). Parameter
-rem *** "continue" disables the standard cleanup (deleting possible
-rem *** previously compiled versions), so compilation can continue after
-rem *** previous unsuccessful attempt. All the parameters _must_ be in
-rem *** lowercase to be recognized correctly, unless running under 4os2
-rem *** or compatible (e.g. 4nt under WinNT).
-rem *** Meaning of basic parameters:
+rem *** debug info stripped out), and "verbose" (compiler messages are
+rem *** shown; the same can be accomplished with setting environment
+rem *** variable DOVERBOSE to 1). Parameters "debug" and "release" are
+rem *** mutually exclusive (the later one is used if both are present).
+rem *** Parameter "ppas" forces only PPAS script to be created
+rem *** by the compiler and called manually afterwards. This might help
+rem *** to resolve LD crashes due to low stack (e.g. under WinXX).
+rem *** Parameters _must_ be in lowercase to be recognized correctly,
+rem *** unless running under 4os2 or compatible.
+rem *** Meaning of parameters:
 rem ***  rtl .......... RTL only, _no_ snapshot created
 rem ***  compiler ..... compiler only, _no_ snapshot created
 rem ***  both ......... both RTL and compiler, _no_ snapshot created
 rem ***  snapshot ..... both RTL and compiler, snapshot _is_ created
 rem ***  cycle ........ RTL and compiler compiled, the resulting compiler
 rem ***                 is then copied to %FPCTOOLS% (BIN\OS2 by default)
-rem ***                 backing up possible previous version to ppc386.x),
+rem ***                 backing up possible previous version to ppos2.x),
 rem ***                 the whole procedure is started again (RTL is compiled
 rem ***                 with the new compiler version this time) and after
 rem ***                 another cycle (to make sure the new compiler works
 rem ***                 correctly) the snapshot is finally created
-rem *** PPC386.EXE is used for the compilation, unless a different compiler
-rem *** name is specified in FPCCOMPILER variable. In any case, the
-rem *** compiler should reside in the same directory as the other required
-rem *** tools (AS.EXE, LD.EXE, etc.).
+rem *** PPOS2.EXE is used for the compilation, unless a different compiler name
+rem *** is specified in FPCCOMPILER variable. In any case, the compiler should
+rem *** reside in the same directory as the other required tools (AS.EXE,
+rem *** LD.EXE, etc.).
 rem *** Environment variable OTHEROPTS may be used to specify additional
 rem *** switches (e.g. setting level of verbosity, etc.).
 rem *** Environment variable FPCLOG can specify a file for error logging
@@ -68,8 +66,6 @@ if exist %FPCDIR%\makefile goto DirOK
 if exist %FPCDIR%\COMPILER\pp.pas goto DirOK
 if exist %FPCDIR%\SOURCE\makefile goto DirOK
 if exist %FPCDIR%\SOURCE\COMPILER\pp.pas goto DirOK
-if exist %FPCDIR%\SRC\makefile goto DirOK
-if exist %FPCDIR%\SRC\COMPILER\pp.pas goto DirOK
 goto ErrorDir
 
 :DirOK
@@ -79,19 +75,11 @@ if exist %FPCDIR%\SOURCE goto SrcExists
 if exist %FPCDIR%\SOURCE\. goto SrcExists
 if exist %FPCDIR%\SOURCE\makefile goto SrcExists
 if exist %FPCDIR%\SOURCE\COMPILER\pp.pas goto SrcExists
-if exist %FPCDIR%\SRC goto Src2Exists
-if exist %FPCDIR%\SRC\. goto Src2Exists
-if exist %FPCDIR%\SRC\makefile goto Src2Exists
-if exist %FPCDIR%\SRC\COMPILER\pp.pas goto Src2Exists
 set FPCSRC=%FPCDIR%
 goto SnapDir
 
 :SrcExists
 set FPCSRC=%FPCDIR%\SOURCE
-goto SnapDir
-
-:Src2Exists
-set FPCSRC=%FPCDIR%\SRC
 
 :SnapDir
 set FPCSNAP=%FPCSNAPPATH%
@@ -185,9 +173,8 @@ set OS2OPT2=-dGDB
 set OS2OPT3=-dI386
 set OS2OPT4=-Sg
 rem "Release" options (optimizations, strip debug symbols)
-set RELEASEOPT1=-OG3p3
+set RELEASEOPT1=-Og2p1
 set RELEASEOPT2=-Xs
-set DORELEASE=
 rem "Debug" options (add debug symbols, do all code generation checks)
 set DEBUGOPT1=-g
 set DEBUGOPT2=-Crtoi
@@ -205,10 +192,16 @@ set OS2OBJP=-Fo%OS2RTL%
 rem Path to units
 set OS2UNITP=-Fu%FPCSNAPRTL%
 rem Path to compiler units
-set COMPUNITP=-Fu%COMPSPATH%
+set COMPUNITP=-Fu%COMPSPATH%;%COMPSPATH%\i386;%COMPSPATH%\targets
+set COMPUNIT386=-Fu%COMPSPATH%\i386
+set COMPUNITTRG=-Fu%COMPSPATH%\targets
+
 rem Path to compiler include files
-set COMPINCP=-Fi%COMPSPATH%
+set COMPINCP=-Fi%COMPSPATH%;%COMPSPATH%\i386
+set COMPINCP386=-Fu%COMPSPATH%\i386
 rem Path to compiler object files
+
+
 set COMPOBJP=-Fo%COMPSPATH%
 rem Target path for RTL units
 set OS2UNITT=-FU%FPCSNAPRTL%
@@ -224,14 +217,11 @@ rem Name of the PPAS script
 set PPASNAME=PPAS.CMD
 rem Default compiler for the first compilation
 set CYCLE=0
-rem Do the cleanup by default
-set CONT=
-if not .%CYCLE% == .0 goto EnvErr
 set COMPILER=%FPCCOMPILER%
 if .%FPCCOMPILER% == . goto SetCompiler
 goto PrgFound
 :SetCompiler
-set COMPILER=PPC386.EXE
+set COMPILER=PPOS2.EXE
 
 :PrgFound
 
@@ -275,26 +265,22 @@ if not %@EVAL[0] == 0 goto ParLoop
 set PARAMS=%@LOWER[%PARAMS%]
 :ParLoop
 shift
-if .%1 == . goto NoPars
+if %1. == . goto NoPars
 if %@EVAL[0] == 0 goto Shl1
 if %1 == debug set CURRENTOPT1=%DEBUGOPT1%
 if %1 == debug set CURRENTOPT2=%DEBUGOPT2%
 if %1 == release set CURRENTOPT1=%RELEASEOPT1%
 if %1 == release set CURRENTOPT2=%RELEASEOPT2%
-if %1 == release set DORELEASE=1
 if %1 == verbose set DOVERBOSE=1
 if %1 == ppas set FORCEPPAS=1
-if %1 == continue set CONT=1
 goto ParLoop
 :Shl1
 if %@LOWER[%1] == debug set CURRENTOPT1=%DEBUGOPT1%
 if %@LOWER[%1] == debug set CURRENTOPT2=%DEBUGOPT2%
 if %@LOWER[%1] == release set CURRENTOPT1=%RELEASEOPT1%
 if %@LOWER[%1] == release set CURRENTOPT2=%RELEASEOPT2%
-if %@LOWER[%1] == release set DORELEASE=1
 if %@LOWER[%1] == verbose set DOVERBOSE=1
 if %@LOWER[%1] == ppas set FORCEPPAS=1
-if %@LOWER[%1] == continue set CONT=1
 goto ParLoop
 :NoPars
 if %PARAMS% == clean goto CleanRTL
@@ -307,7 +293,6 @@ echo *Error: Unknown parameter - %PARAMS% >> %FPCERRLOG%
 goto End
 
 :CleanRTL
-if .%CONT% == .1 goto ContClRTL
 if %@EVAL[0] == 0 goto JPCleanRTL
 echo *Cleaning up the RTL (error messages are OK here) ... >> %FPCERRLOG%
 del %OS2OPTF% >> %FPCERRLOG%
@@ -338,7 +323,6 @@ del %FPCSNAPRTL%\link.res >& nul >> %FPCERRLOG%
 :ContClRTL
 if %PARAMS% == rtl goto Branches
 :CleanCompiler
-if .%CONT% == .1 goto ContClComp
 if %@EVAL[0] == 0 goto JPCleanComp
 echo *Cleaning up the compiler (error messages are OK here) ... >> %FPCERRLOG%
 del %OS2OPTF% >> %FPCERRLOG%
@@ -346,7 +330,7 @@ del %COMPSPATH%\*.ppo >> %FPCERRLOG%
 del %COMPSPATH%\*.oo2 >> %FPCERRLOG%
 del %COMPSPATH%\pp >> %FPCERRLOG%
 del %COMPSPATH%\pp.exe >> %FPCERRLOG%
-del %COMPSPATH%\ppc386.exe >> %FPCERRLOG%
+del %COMPSPATH%\ppos2.exe >> %FPCERRLOG%
 del %COMPSPATH%\ppas.bat >> %FPCERRLOG%
 del %COMPSPATH%\ppas.cmd >> %FPCERRLOG%
 del %COMPSPATH%\link.res >> %FPCERRLOG%
@@ -354,7 +338,7 @@ del %FPCSNAPBIN%\*.ppo >> %FPCERRLOG%
 del %FPCSNAPBIN%\*.oo2 >> %FPCERRLOG%
 del %FPCSNAPBIN%\pp >> %FPCERRLOG%
 del %FPCSNAPBIN%\pp.exe >> %FPCERRLOG%
-del %FPCSNAPBIN%\ppc386.exe >> %FPCERRLOG%
+del %FPCSNAPBIN%\ppos2.exe >> %FPCERRLOG%
 del %FPCSNAPBIN%\ppas.bat >> %FPCERRLOG%
 del %FPCSNAPBIN%\ppas.cmd >> %FPCERRLOG%
 del %FPCSNAPBIN%\link.res >> %FPCERRLOG%
@@ -366,7 +350,7 @@ del %COMPSPATH%\*.ppo >& nul >> %FPCERRLOG%
 del %COMPSPATH%\*.oo2 >& nul >> %FPCERRLOG%
 del %COMPSPATH%\pp >& nul >> %FPCERRLOG%
 del %COMPSPATH%\pp.exe >& nul >> %FPCERRLOG%
-del %COMPSPATH%\ppc386.exe >& nul >> %FPCERRLOG%
+del %COMPSPATH%\ppos2.exe >& nul >> %FPCERRLOG%
 del %COMPSPATH%\ppas.bat >& nul >> %FPCERRLOG%
 del %COMPSPATH%\ppas.cmd >& nul >> %FPCERRLOG%
 del %COMPSPATH%\link.res >& nul >> %FPCERRLOG%
@@ -374,7 +358,7 @@ del %FPCSNAPBIN%\*.ppo >& nul >> %FPCERRLOG%
 del %FPCSNAPBIN%\*.oo2 >& nul >> %FPCERRLOG%
 del %FPCSNAPBIN%\pp >& nul >> %FPCERRLOG%
 del %FPCSNAPBIN%\pp.exe >& nul >> %FPCERRLOG%
-del %FPCSNAPBIN%\ppc386.exe >& nul >> %FPCERRLOG%
+del %FPCSNAPBIN%\ppos2.exe >& nul >> %FPCERRLOG%
 del %FPCSNAPBIN%\ppas.bat >& nul >> %FPCERRLOG%
 del %FPCSNAPBIN%\ppas.cmd >& nul >> %FPCERRLOG%
 del %FPCSNAPBIN%\link.res >& nul >> %FPCERRLOG%
@@ -382,7 +366,6 @@ del %FPCSNAPBIN%\link.res >& nul >> %FPCERRLOG%
 if %PARAMS% == compiler goto Branches
 if %PARAMS% == both goto Branches
 :CleanSnapshot
-if .%CONT% == .1 goto ContClSnap
 if %@EVAL[0] == 0 goto JPCleanSnap
 echo *Deleting the old snapshot (error messages are OK here) ... >> %FPCERRLOG%
 del %FPCSNAPDOC%\*.txt >> %FPCERRLOG%
@@ -436,10 +419,10 @@ echo *End of basic options used for compilation >> %FPCERRLOG%
 if not .%OTHEROPTS% == . echo *User specified options: %OTHEROPTS% >> %FPCERRLOG%
 :CompS1
 echo *Assembling the helpers ... >> %FPCERRLOG%
-%REALTOOLS%\as -o %FPCSNAPRTL%\prt0.oo2 %OS2RTL%\prt0.as >> %FPCERRLOG%
-%REALTOOLS%\as -o %FPCSNAPRTL%\prt1.oo2 %OS2RTL%\prt1.as >> %FPCERRLOG%
-%REALTOOLS%\as -o %FPCSNAPRTL%\code2.oo2 %OS2RTL%\code2.as >> %FPCERRLOG%
-%REALTOOLS%\as -o %FPCSNAPRTL%\code3.oo2 %OS2RTL%\code3.as >> %FPCERRLOG%
+%REALTOOLS%as -o %FPCSNAPRTL%\prt0.oo2 %OS2RTL%\prt0.as >> %FPCERRLOG%
+%REALTOOLS%as -o %FPCSNAPRTL%\prt1.oo2 %OS2RTL%\prt1.as >> %FPCERRLOG%
+%REALTOOLS%as -o %FPCSNAPRTL%\code2.oo2 %OS2RTL%\code2.as >> %FPCERRLOG%
+%REALTOOLS%as -o %FPCSNAPRTL%\code3.oo2 %OS2RTL%\code3.as >> %FPCERRLOG%
 echo *Compiling the system unit ... >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% -Us %OTHEROPTS% %OS2RTL%\SYSOS2.PAS
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
@@ -480,10 +463,6 @@ echo *Compiling unit SysUtils ... >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\SYSUTILS.PP
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
-echo *Compiling unit VarUtils (doesn't exist in 1.0.x - won't be found then) ... >> %FPCERRLOG%
-%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\VARUTILS.PP
-if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
-if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
 echo *Compiling unit TypInfo ... >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLO%\TYPINFO.PP
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
@@ -512,10 +491,6 @@ echo *Compiling unit LineInfo ... >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\LINEINFO.PP
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
-echo *Compiling unit DynLibs (doesn't exist in 1.0.x - won't be found then) ... >> %FPCERRLOG%
-%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTLC%\DYNLIBS.PP
-if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
-if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
 echo *Compiling unit KbdCalls ... >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\KBDCALLS.PAS
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
@@ -549,6 +524,10 @@ if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
 echo *Compiling MMOS2 units ... >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\DIVE.PAS
+echo *Compiling API units... >> %FPCERRLOG%
+%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\MOUSE.PP
+%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\KEYBOARD.PP
+%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %OS2RTL%\VIDEO.PP
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 call %FPCSNAPRTL%\%PPASNAME% >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 echo * Deleting the PPAS script >> %FPCERRLOG%
@@ -584,12 +563,6 @@ echo *End of basic options used for compilation >> %FPCERRLOG%
 if not .%OTHEROPTS% == . echo *User specified options: %OTHEROPTS% >> %FPCERRLOG%
 :CompS2
 echo *Compiling the compiler ... >> %FPCERRLOG%
-%REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %COMPSPATH%\FPC.PAS
-if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
-if .%FORCEPPAS% == .1 call %FPCSNAPBIN%\%PPASNAME% >> %FPCERRLOG%
-if .%FORCEPPAS% == .1 echo * Deleting the PPAS script >> %FPCERRLOG%
-if .%FORCEPPAS% == .1 del %FPCSNAPBIN%\%PPASNAME% >> %FPCERRLOG%
-if .%FORCEPPAS% == .1 del %FPCSNAPBIN%\link.res >> %FPCERRLOG%
 %REALTOOLS%%COMPILER% @%OS2OPTF% %OTHEROPTS% %COMPSPATH%\PP.PAS
 if .%FORCEPPAS% == .1 echo *Calling the PPAS script >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 call %FPCSNAPBIN%\%PPASNAME% >> %FPCERRLOG%
@@ -597,8 +570,9 @@ if .%FORCEPPAS% == .1 echo * Deleting the PPAS script >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 del %FPCSNAPBIN%\%PPASNAME% >> %FPCERRLOG%
 if .%FORCEPPAS% == .1 del %FPCSNAPBIN%\link.res >> %FPCERRLOG%
 :Comp2
-ren %FPCSNAPBIN%\pp.exe ppc386.exe >> %FPCERRLOG%
-if exist %FPCSNAPBIN%\ppc386.exe goto OKCompiler
+ren %FPCSNAPBIN%\pp.exe ppos2.exe >> %FPCERRLOG%
+copy %FPCSNAPBIN%\ppos2.exe ppc386.exe >> %FPCERRLOG%
+if exist %FPCSNAPBIN%\ppos2.exe goto OKCompiler
 if not exist %FPCSNAPBIN%\pp goto C2Cont
 if exist %FPCSNAPBIN%\ppas.bat goto PPasBat
 if exist %FPCSNAPBIN%\ppas.cmd goto PPasCmd
@@ -627,13 +601,14 @@ goto CopyFiles
 :Cycle
 
 rem Another loop?
-if .%CYCLE% == .2 goto CopyFiles
-echo *Backing up previous compiler version to ppc386.%CYCLE% ... >> %FPCERRLOG%
-copy %REALTOOLS%ppc386.exe %REALTOOLS%ppc386.%CYCLE% >> %FPCERRLOG%
+if %CYCLE% == 2 goto CopyFiles
+echo *Backing up previous compiler version to ppos2.%CYCLE% ... >> %FPCERRLOG%
+copy %REALTOOLS%ppos2.exe %REALTOOLS%ppos2.%CYCLE% >> %FPCERRLOG%
 echo *Copying the newly created compiler to %REALTOOLS% ... >> %FPCERRLOG%
-copy %FPCSNAPBIN%\ppc386.exe %REALTOOLS%. >> %FPCERRLOG%
-if .%CYCLE% == .1 goto Cycle2
-set COMPILER=PPC386.EXE
+copy %FPCSNAPBIN%\ppos2.exe %REALTOOLS%. >> %FPCERRLOG%
+copy %FPCSNAPBIN%\ppos2.exe %REALTOOLS%ppc386.exe >> %FPCERRLOG%
+if %CYCLE% == 1 goto Cycle2
+set COMPILER=PPOS2.EXE
 set CYCLE=1
 goto NoPars
 
@@ -642,15 +617,12 @@ set CYCLE=2
 goto NoPars
 
 :CopyFiles
-echo *Copying the message files ... >> %FPCERRLOG%
-copy %COMPSPATH%\*.msg %FPCSNAPMSG% >> %FPCERRLOG%
+set FPCSNAPTXT=%FPCSNAPDOC%\snapshot.txt
 echo *Copying the documentation ... >> %FPCERRLOG%
 copy %FPCSRC%\INSTALL\DOC\*.txt %FPCSNAPDOC% >> %FPCERRLOG%
 copy %FPCSRC%\INSTALL\DOC\*.htm* %FPCSNAPDOC% >> %FPCERRLOG%
 copy %FPCSRC%\INSTALL\DOC\copying.* %FPCSNAPDOC% >> %FPCERRLOG%
-if .%DORELEASE% == .1 goto CopyDone
 echo *Creating the snapshot readme file ... >> %FPCERRLOG%
-set FPCSNAPTXT=%FPCSNAPDOC%\snapshot.txt
 echo This is a FPC snapshot for OS/2. It contains compilation of the most current >> %FPCSNAPTXT%
 echo developers' sources as of time of its creation. It contains the latest fixes >> %FPCSNAPTXT%
 echo but might contain some new bugs as well, since it's less tested than regular >> %FPCSNAPTXT%
@@ -660,13 +632,17 @@ echo the list in your e-mail, if it's the case). >> %FPCSNAPTXT%
 echo The snapshot has the same structure as the release ZIP files, so it may be >> %FPCSNAPTXT%
 echo installed using the normal installer (INSTALL.EXE and INSTALL.DAT must be >> %FPCSNAPTXT%
 echo in the same directory) or directly unzipped into your FPC tree. >> %FPCSNAPTXT%
+echo *Copying the message files ... >> %FPCERRLOG%
+copy %COMPSPATH%\msg\*.msg %FPCSNAPMSG% >> %FPCERRLOG%
 
-:CopyDone
 if %@EVAL[0] == 0 goto Pack
 echo *Warning: Packing in this environment might fail. >> %FPCERRLOG%
-echo *Should you encounter any problems, make sure the current directory, i.e. >> %FPCERRLOG%
-cd >> %FPCERRLOG%
-echo *is on the same drive as %FPCSNAP%. >> %FPCERRLOG%
+echo *You should press Ctrl-Break now if the current drive is different from that >> %FPCERRLOG%
+echo *of %FPCSNAP%; otherwise press any key to continue. >> %FPCERRLOG%
+if not %FPCERRLOG% == CON echo *Warning: Packing in this environment might fail.
+if not %FPCERRLOG% == CON echo *You should press Ctrl-Break now if the current drive is different from that
+if not %FPCERRLOG% == CON echo *of %FPCDIR%; otherwise press any key to continue.
+pause>nul
 cd %FPCSNAP%
 
 :Pack
@@ -679,7 +655,7 @@ cdd %FPCSNAP%
 :Cmd2
 
 rem ZIP.EXE must be on the PATH
-zip -9r baseemx bin\os2\*.exe doc\* msg\* units\os2\rtl\*.ppo units\os2\rtl\*.oo2 units\os2\rtl\*.ao2 units\os2\rtl\*.rst  >> %FPCERRLOG%
+zip -9 -r baseemx.zip bin\os2\ppc386.exe doc\* msg\* units\os2\rtl\*.ppo units\os2\rtl\*.oo2 units\os2\rtl\*.ao2 >> %FPCERRLOG%
 if exist baseemx.zip goto ZipOK
 echo *Error: The ZIP file hasn't been created!! >> %FPCERRLOG%
 :ZipOK
@@ -695,17 +671,11 @@ goto End
 
 
   $Log$
-  Revision 1.5  2000-12-03 18:40:56  hajny
-    * fpc.pas added
-
-  Revision 1.4  2000/10/14 19:46:58  hajny
-    * fix for continue parameter
-
-  Revision 1.3  2000/10/08 18:44:36  hajny
-    + DynLibs added
+  Revision 1.6  2001-06-28 21:09:43  peter
+    * latest versions from 1.0.5 branch
 
-  Revision 1.2  2000/10/07 11:47:54  hajny
-    * updates for 1.1, etc.
+  Revision 1.1.2.1  2001/05/15 18:41:14  carl
+  * updated to work with FPC v1.0.x
 
   Revision 1.1  2000/07/14 10:09:29  michael
   + Moved from base