+ Moved all resource strings to rtlconst/sysconst

rtl/linux/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/09/24]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
+MAKEFILETARGETS=linux
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@@ -10,7 +10,6 @@ SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
 else
 SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
-SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
 PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
@@ -239,9 +238,9 @@ GRAPHDIR=$(INC)/graph
 ifndef USELIBGGI
 USELIBGGI=NO
 endif
-override TARGET_UNITS+=$(SYSTEMUNIT) baseunix strings systhrds  objpas syscall unixutil heaptrc lineinfo $(LINUXUNIT1) termio unix $(LINUXUNIT2) initc $(CPU_UNITS) dos crt objects printer ggigraph sysutils typinfo math varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst cthreads classes
+override TARGET_UNITS+=$(SYSTEMUNIT) baseunix strings systhrds  objpas syscall unixutil heaptrc lineinfo $(LINUXUNIT1) termio unix $(LINUXUNIT2) initc $(CPU_UNITS) dos crt objects printer ggigraph sysutils typinfo math varutils charset ucomplex getopts errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard variants types dateutils sysconst cthreads classes strutils rtlconst
 override TARGET_LOADERS+=prt0 dllprt0 cprt0 gprt0 cprt21 gprt21
-override TARGET_RSTS+=math varutils typinfo variants classes sysconst
+override TARGET_RSTS+=math varutils typinfo variants classes sysconst rtlconst
 override CLEAN_UNITS+=syslinux linux
 override INSTALL_FPCPACKAGE=y
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(CPU_TARGET)
@@ -329,17 +328,9 @@ endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-ifdef CROSSCOMPILE
-INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
-else
 INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
-endif
-else
-ifdef CROSSCOMPILE
-INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
 else
 INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
-endif
 ifdef INSTALL_FPCPACKAGE
 INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
 endif
@@ -471,14 +462,6 @@ STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
-ifeq ($(OS_TARGET),watcom)
-STATICLIBPREFIX=
-FPCMADE=fpcmade.wat
-ZIPSUFFIX=watc
-OEXT=.obj
-ASMEXT=.asm
-SHAREDLIBEXT=.dll
-endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
 HASSHAREDLIB=1
@@ -581,11 +564,6 @@ STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
-ifeq ($(OS_TARGET),watcom)
-STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
-endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
 HASSHAREDLIB=1
@@ -774,11 +752,7 @@ endif
 endif
 export MVPROG
 ifndef ECHOREDIR
-ifndef inUnix
-ECHOREDIR=echo
-else
-ECHOREDIR=$(ECHO)
-endif
+ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))
 endif
 ifndef COPY
 COPY:=$(CPPROG) -fp
@@ -849,16 +823,14 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
-ASNAME=$(BINUTILSPREFIX)as
-LDNAME=$(BINUTILSPREFIX)ld
-ARNAME=$(BINUTILSPREFIX)ar
-RCNAME=$(BINUTILSPREFIX)rc
-ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
-ifeq ($(OS_TARGET),win32)
 ASNAME=as
 LDNAME=ld
 ARNAME=ar
-endif
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
 endif
 ifndef ASPROG
 ifdef CROSSBINDIR
@@ -940,14 +912,6 @@ endif
 ifeq ($(OS_SOURCE),openbsd)
 override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
-ifndef CROSSBOOTSTRAP
-ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
-endif
-ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-Xr$(RLINKPATH)
-endif
-endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1094,7 +1058,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp .rc .res
 %$(PPUEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
@@ -1107,14 +1071,10 @@ fpc_release:
 %$(EXEEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
 %.res: %.rc
 	windres -i $< -o $@
 vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
@@ -1408,7 +1368,7 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in
 		    objpas$(PPUEXT) unix$(PPUEXT) errors$(PPUEXT) sysconst$(PPUEXT)
 	$(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
-		   sysutils$(PPUEXT) typinfo$(PPUEXT)
+		   sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT)
 	$(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp
 typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT)
 	$(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp
@@ -1423,6 +1383,11 @@ types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(OBJPASDIR)/types.pp
 sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(OBJPASDIR)/sysconst.pp
+rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
+	$(COMPILER) $(OBJPASDIR)/rtlconst.pp
+strutils$(PPUEXT) : $(OBJPASDIR)/strutils.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+		    sysutils$(PPUEXT)
+	$(COMPILER) $(OBJPASDIR)/strutils.pp
 cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
 mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)

rtl/linux/Makefile.fpc

@@ -15,9 +15,9 @@ units=$(SYSTEMUNIT) baseunix strings systhrds  objpas syscall unixutil \
       charset ucomplex getopts \
       errors sockets gpm ipc serial terminfo dl dynlibs \
       video mouse keyboard variants types dateutils sysconst \
-      cthreads classes
+      cthreads classes strutils rtlconst
 
-rsts=math varutils typinfo variants classes sysconst 
+rsts=math varutils typinfo variants classes sysconst rtlconst
 
 [require]
 nortl=y
@@ -213,7 +213,7 @@ sysutils$(PPUEXT) : $(UNIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.in
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils $(UNIXINC)/sysutils.pp
 
 classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
-                   sysutils$(PPUEXT) typinfo$(PPUEXT)
+                   sysutils$(PPUEXT) typinfo$(PPUEXT) rtlconst$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp
 
 typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT)
@@ -235,6 +235,13 @@ types$(PPUEXT) : $(OBJPASDIR)/types.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
         $(COMPILER) $(OBJPASDIR)/sysconst.pp
 
+rtlconst$(PPUEXT) : $(OBJPASDIR)/rtlconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
+        $(COMPILER) $(OBJPASDIR)/rtlconst.pp
+
+strutils$(PPUEXT) : $(OBJPASDIR)/strutils.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+                    sysutils$(PPUEXT)
+        $(COMPILER) $(OBJPASDIR)/strutils.pp
+
 #
 # Other $(SYSTEMUNIT)-independent RTL Units
 #

rtl/linux/classes.pp

@@ -30,7 +30,8 @@ interface
 
 uses
   sysutils,
-  typinfo;
+  typinfo,
+  rtlconst;
 
 {$i classesh.inc}
 
@@ -58,7 +59,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.3  2003-11-19 15:51:54  peter
+  Revision 1.4  2004-01-10 19:35:52  michael
+  + Moved all resource strings to rtlconst/sysconst
+
+  Revision 1.3  2003/11/19 15:51:54  peter
     * tthread disabled for 1.0.x
 
   Revision 1.2  2003/11/10 16:54:28  marco

rtl/objpas/classes/bits.inc

@@ -15,11 +15,6 @@
 {*                               TBits                                      *}
 {****************************************************************************}
 
-ResourceString
-  SErrInvalidBitIndex = 'Invalid bit index : %d';
-  SErrindexTooLarge   = 'Bit index exceeds array limit: %d';
-  SErrOutOfMemory     = 'Out of memory';
-
 Procedure BitsError (Msg : string);
 
 begin
@@ -380,7 +375,10 @@ end;
 
 {
   $Log$
-  Revision 1.2  2003-10-30 16:25:07  peter
+  Revision 1.3  2004-01-10 19:35:17  michael
+  + Moved all resource strings to rtlconst/sysconst
+
+  Revision 1.2  2003/10/30 16:25:07  peter
     * tbits.create is now supported
 
   Revision 1.1  2003/10/06 21:01:06  peter

rtl/objpas/dateutil.inc

@@ -401,13 +401,7 @@ Function UnixToDateTime(const AValue: Int64): TDateTime;
 
 implementation
 
-Resourcestring
-  SErrInvalidTimeStamp = 'Invalid date/timestamp : "%s"';
-  SErrInvalidDateWeek = '%d %d %d is not a valid dateweek';
-  SErrInvalidDayOfYear = 'Year %d does not have a day number %d';
-  SErrInvalidDateMonthWeek = 'Year %d, month %d, Week %d and day %d is not a valid date.';
-  SErrInvalidDayOfWeekInMonth = 'Year %d Month %d NDow %d DOW %d is not a valid date';
-  SErrInvalidDayOfWeek = '%d is not a valid day of the week';
+uses sysconst;
 
 { ---------------------------------------------------------------------
     Auxiliary routines
@@ -1958,7 +1952,10 @@ end.
 
 {
   $Log$
-  Revision 1.1  2003-12-06 18:03:46  hajny
+  Revision 1.2  2004-01-10 19:35:17  michael
+  + Moved all resource strings to rtlconst/sysconst
+
+  Revision 1.1  2003/12/06 18:03:46  hajny
     * include file for dateutil(s)
 
   Revision 1.2  2003/01/19 14:37:06  michael

rtl/objpas/rtlconst.pp

@@ -57,6 +57,9 @@ ResourceString
   SDuplicateItem                = 'Duplicates not allowed in this list ($0%x)';
   SDuplicateName                = 'Duplcate name: A component named "%s" already exists';
   SDuplicateString              = 'String list does not allow duplicates';
+  SErrOutOfMemory               = 'Out of memory';
+  SErrInvalidBitIndex           = 'Invalid bit index : %d';
+  SErrindexTooLarge             = 'Bit index exceeds array limit: %d';
   SFCreateError                 = 'Unable to create file "%s"';
   SFCreateErrorEx               = 'Unable to create file "%s": %s';
   SFOpenError                   = 'Unable to open file "%s"';
@@ -329,7 +332,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.2  2004-01-10 17:30:32  michael
+  Revision 1.3  2004-01-10 19:35:17  michael
+  + Moved all resource strings to rtlconst/sysconst
+
+  Revision 1.2  2004/01/10 17:30:32  michael
   + Implemented all constants for compatibility
 
   Revision 1.1  2003/09/03 14:09:37  florian

rtl/objpas/sysconst.pp

@@ -34,6 +34,12 @@ resourcestring
   SDispatchError         = 'No variant method call dispatch';
   SDivByZero             = 'Division by zero';
   SEndOfFile             = 'Read past end of file';
+  SErrInvalidDateMonthWeek = 'Year %d, month %d, Week %d and day %d is not a valid date.';
+  SErrInvalidDateWeek    = '%d %d %d is not a valid dateweek';
+  SErrInvalidDayOfWeek   = '%d is not a valid day of the week';
+  SErrInvalidDayOfWeekInMonth = 'Year %d Month %d NDow %d DOW %d is not a valid date';
+  SErrInvalidDayOfYear   = 'Year %d does not have a day number %d';
+  SErrInvalidTimeStamp   = 'Invalid date/timestamp : "%s"';
   SExceptionErrorMessage = 'exception at %p';
   SExceptionStack        = 'Exception stack error';
   SExternalException     = 'External exception %x';
@@ -199,7 +205,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.6  2004-01-10 17:55:45  michael
+  Revision 1.7  2004-01-10 19:35:17  michael
+  + Moved all resource strings to rtlconst/sysconst
+
+  Revision 1.6  2004/01/10 17:55:45  michael
   + Changed lookup table with Case: Array of resourcestring is not translated
 
   Revision 1.5  2003/11/30 15:04:56  michael

rtl/win32/classes.pp

@@ -29,6 +29,7 @@ unit Classes;
 interface
 
 uses
+  rtlconst,
   sysutils,
   typinfo,
   windows;
@@ -49,7 +50,10 @@ finalization
 end.
 {
   $Log$
-  Revision 1.2  2003-10-07 16:20:21  florian
+  Revision 1.3  2004-01-10 19:35:18  michael
+  + Moved all resource strings to rtlconst/sysconst
+
+  Revision 1.2  2003/10/07 16:20:21  florian
     * win32 now uses aliases from the windows unit for types like trect
 
   Revision 1.1  2003/10/06 21:01:07  peter