diff --git a/components/cgi/Makefile b/components/cgi/Makefile
index cd3df13620..4ee65c4ae4 100644
--- a/components/cgi/Makefile
+++ b/components/cgi/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -114,10 +114,6 @@ FPC:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-else
-ifeq ($(strip $(wildcard $(FPC))),)
-FPC:=$(firstword $(FPCPROG))
-endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
diff --git a/components/cgi/Makefile.fpc b/components/cgi/Makefile.fpc
index d090a20877..0d12892396 100644
--- a/components/cgi/Makefile.fpc
+++ b/components/cgi/Makefile.fpc
@@ -2,7 +2,7 @@
#
# Makefile.fpc for cgiLaz 0.1.1
#
-# This file was generated on 07-10-08
+# This file was generated on 25-9-2008
[package]
name=cgilaz
diff --git a/components/cgi/ide/Makefile b/components/cgi/ide/Makefile
index 1e84a37da1..d8fdc34a10 100644
--- a/components/cgi/ide/Makefile
+++ b/components/cgi/ide/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -114,10 +114,6 @@ FPC:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-else
-ifeq ($(strip $(wildcard $(FPC))),)
-FPC:=$(firstword $(FPCPROG))
-endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
diff --git a/components/cgi/ide/Makefile.fpc b/components/cgi/ide/Makefile.fpc
index b0c387a9d8..23912c052c 100644
--- a/components/cgi/ide/Makefile.fpc
+++ b/components/cgi/ide/Makefile.fpc
@@ -2,7 +2,7 @@
#
# Makefile.fpc for CGILazIDE 0.0
#
-# This file was generated on 07-10-08
+# This file was generated on 25-9-2008
[package]
name=cgilazide
diff --git a/components/cgi/languages/cgimodules.de.po b/components/cgi/languages/cgimodules.de.po
index 606c11199a..2f59db0e36 100644
--- a/components/cgi/languages/cgimodules.de.po
+++ b/components/cgi/languages/cgimodules.de.po
@@ -9,11 +9,11 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cgimodules.serrnomainmodule
-msgid "No CGI datamodule to handle CGI request."
-msgstr "Kein CGI-Datenmodul, um CGI-Anfrage zu bearbeiten."
-
-#: cgimodules.serrnorequesthandler
+#: cgimodules:serrnorequesthandler
msgid "%s: No CGI request handler set."
msgstr "%s: Kein CGI-Abfrage-Handler gesetzt."
+#: cgimodules:serrnomainmodule
+msgid "No CGI datamodule to handle CGI request."
+msgstr "Kein CGI-Datenmodul, um CGI-Anfrage zu bearbeiten."
+
diff --git a/components/cgi/languages/cgimodules.id.po b/components/cgi/languages/cgimodules.id.po
index a7aecbc050..cfb30a2584 100644
--- a/components/cgi/languages/cgimodules.id.po
+++ b/components/cgi/languages/cgimodules.id.po
@@ -9,11 +9,11 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cgimodules.serrnomainmodule
-msgid "No CGI datamodule to handle CGI request."
-msgstr "Tidak ada modul data CGI untuk menangani permintaan CGI"
-
-#: cgimodules.serrnorequesthandler
+#: cgimodules:serrnorequesthandler
msgid "%s: No CGI request handler set."
msgstr "%s: Tidak ada set pengendali permintaan CGI."
+#: cgimodules:serrnomainmodule
+msgid "No CGI datamodule to handle CGI request."
+msgstr "Tidak ada modul data CGI untuk menangani permintaan CGI"
+
diff --git a/components/cgi/languages/cgimodules.lt.po b/components/cgi/languages/cgimodules.lt.po
index 3079f6e29c..db92568772 100644
--- a/components/cgi/languages/cgimodules.lt.po
+++ b/components/cgi/languages/cgimodules.lt.po
@@ -10,11 +10,11 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: cgimodules.serrnomainmodule
-msgid "No CGI datamodule to handle CGI request."
-msgstr "Nėra CGI „DataModule“ kad būtų galima apdoroti CGI užklausą."
-
-#: cgimodules.serrnorequesthandler
+#: cgimodules:serrnorequesthandler
msgid "%s: No CGI request handler set."
msgstr "%s: nenurodyta CGI užklausų tvarkyklė."
+#: cgimodules:serrnomainmodule
+msgid "No CGI datamodule to handle CGI request."
+msgstr "Nėra CGI „DataModule“ kad būtų galima apdoroti CGI užklausą."
+
diff --git a/components/cgi/languages/cgimodules.pb.po b/components/cgi/languages/cgimodules.pb.po
index b1a52980ab..459c1ce77f 100644
--- a/components/cgi/languages/cgimodules.pb.po
+++ b/components/cgi/languages/cgimodules.pb.po
@@ -4,11 +4,11 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cgimodules.serrnomainmodule
-msgid "No CGI datamodule to handle CGI request."
-msgstr "Nenhum datamodule de CGI para manipular o CGI request."
-
-#: cgimodules.serrnorequesthandler
+#: cgimodules:serrnorequesthandler
msgid "%s: No CGI request handler set."
msgstr "%s: Nenhum manipulador de CGI request configurado."
+#: cgimodules:serrnomainmodule
+msgid "No CGI datamodule to handle CGI request."
+msgstr "Nenhum datamodule de CGI para manipular o CGI request."
+
diff --git a/components/cgi/languages/cgimodules.pl.po b/components/cgi/languages/cgimodules.pl.po
index 51a9b7cef8..48238f2964 100644
--- a/components/cgi/languages/cgimodules.pl.po
+++ b/components/cgi/languages/cgimodules.pl.po
@@ -11,11 +11,11 @@ msgstr ""
"X-Poedit-Language: Polish\n"
"X-Poedit-Country: POLAND\n"
-#: cgimodules.serrnomainmodule
-msgid "No CGI datamodule to handle CGI request."
-msgstr ""
-
-#: cgimodules.serrnorequesthandler
+#: cgimodules:serrnorequesthandler
msgid "%s: No CGI request handler set."
msgstr ""
+#: cgimodules:serrnomainmodule
+msgid "No CGI datamodule to handle CGI request."
+msgstr ""
+
diff --git a/components/cgi/languages/cgimodules.po b/components/cgi/languages/cgimodules.po
index e77ee64129..5cfaf9f538 100644
--- a/components/cgi/languages/cgimodules.po
+++ b/components/cgi/languages/cgimodules.po
@@ -4,11 +4,11 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cgimodules.serrnomainmodule
+#: cgimodules:serrnomainmodule
msgid "No CGI datamodule to handle CGI request."
msgstr ""
-#: cgimodules.serrnorequesthandler
+#: cgimodules:serrnorequesthandler
msgid "%s: No CGI request handler set."
msgstr ""
diff --git a/components/cgi/languages/cgimodules.ru.po b/components/cgi/languages/cgimodules.ru.po
index df214dcc58..9f68c6b8ee 100644
--- a/components/cgi/languages/cgimodules.ru.po
+++ b/components/cgi/languages/cgimodules.ru.po
@@ -9,11 +9,11 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cgimodules.serrnomainmodule
-msgid "No CGI datamodule to handle CGI request."
-msgstr "Отсутствует модуль данных CGI для обработки запроса CGI."
-
-#: cgimodules.serrnorequesthandler
+#: cgimodules:serrnorequesthandler
msgid "%s: No CGI request handler set."
msgstr "%s: Не установлен обработчик запроса CGI."
+#: cgimodules:serrnomainmodule
+msgid "No CGI datamodule to handle CGI request."
+msgstr "Отсутствует модуль данных CGI для обработки запроса CGI."
+
diff --git a/components/fpcunit/ide/Makefile b/components/fpcunit/ide/Makefile
index 917a9fdcea..7422145cc0 100644
--- a/components/fpcunit/ide/Makefile
+++ b/components/fpcunit/ide/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -114,10 +114,6 @@ FPC:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-else
-ifeq ($(strip $(wildcard $(FPC))),)
-FPC:=$(firstword $(FPCPROG))
-endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
diff --git a/components/fpcunit/ide/Makefile.fpc b/components/fpcunit/ide/Makefile.fpc
index 5f52c99e0f..e112124eac 100644
--- a/components/fpcunit/ide/Makefile.fpc
+++ b/components/fpcunit/ide/Makefile.fpc
@@ -2,7 +2,7 @@
#
# Makefile.fpc for fpcunitide 0.1
#
-# This file was generated on 07-10-08
+# This file was generated on 25-9-2008
[package]
name=fpcunitide
diff --git a/components/lazreport/samples/editor/calleditorwithpkg.lpi b/components/lazreport/samples/editor/calleditorwithpkg.lpi
index 3a706f01e7..19b1b46ecf 100644
--- a/components/lazreport/samples/editor/calleditorwithpkg.lpi
+++ b/components/lazreport/samples/editor/calleditorwithpkg.lpi
@@ -8,6 +8,7 @@
+
@@ -47,12 +48,12 @@
-
+
-
+
@@ -63,304 +64,53 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
diff --git a/components/lazreport/samples/editor/languages/calleditorwithpkg.es.po b/components/lazreport/samples/editor/languages/calleditorwithpkg.es.po
index 8729264461..04c8684d90 100644
--- a/components/lazreport/samples/editor/languages/calleditorwithpkg.es.po
+++ b/components/lazreport/samples/editor/languages/calleditorwithpkg.es.po
@@ -1,16 +1,13 @@
-# translation of calleditorwithpkg.po to Espaol
-# Jesus Reyes Aguilar , 2008.
msgid ""
msgstr ""
-"Project-Id-Version: calleditorwithpkg\n"
+"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2008-10-08 16:07-0500\n"
-"Last-Translator: Jesus Reyes Aguilar \n"
-"Language-Team: Espaol \n"
+"PO-Revision-Date: 2008-04-22 03:05-0600\n"
+"Last-Translator: Jesus Reyes A. \n"
+"Language-Team: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
#: maincalleditor.ceractivereport
msgid "Active report: %s"
diff --git a/components/lazreport/samples/editor/maincalleditor.lfm b/components/lazreport/samples/editor/maincalleditor.lfm
index b3704c7bdd..fbf5af12fc 100644
--- a/components/lazreport/samples/editor/maincalleditor.lfm
+++ b/components/lazreport/samples/editor/maincalleditor.lfm
@@ -3,27 +3,28 @@ object frmMain: TfrmMain
Height = 405
Top = 127
Width = 573
+ HorzScrollBar.Page = 572
+ VertScrollBar.Page = 384
ActiveControl = btnCallEditor
Caption = 'LazReport Test Suite'
- ClientHeight = 386
+ ClientHeight = 385
ClientWidth = 573
Menu = MainMenu1
OnCreate = frmMainCreate
- ParentFont = False
ShowHint = True
- LCLVersion = '0.9.27'
+ LCLVersion = '0.9.25'
object lblIndex: TLabel
Left = 12
- Height = 19
+ Height = 14
Top = 44
- Width = 6
+ Width = 1
ParentColor = False
end
object lblExpr: TLabel
Left = 235
- Height = 19
+ Height = 14
Top = 44
- Width = 6
+ Width = 1
ParentColor = False
end
object btnCallEditor: TButton
@@ -36,30 +37,16 @@ object frmMain: TfrmMain
TabOrder = 0
end
object dbGrid1: TDBGrid
- Height = 299
+ Height = 294
Top = 68
Width = 573
Align = alBottom
Anchors = [akTop, akLeft, akRight, akBottom]
Color = clWhite
- Columns = <
- item
- FieldName = 'AUTHOR'
- end
- item
- FieldName = 'COMPANY'
- end
- item
- ReadOnly = True
- FieldName = 'PRICE'
- end
- item
- FieldName = 'COUNTRY'
- end>
DataSource = Datasource1
FixedColor = clBtnFace
FixedHotColor = cl3DLight
- Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColLines, dgRowLines, dgTabs, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit, dgMultiselect]
+ Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColLines, dgRowLines, dgTabs, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit]
OptionsExtra = [dgeAutoColumns, dgeCheckboxColumn]
ParentColor = False
TabOrder = 5
@@ -84,8 +71,8 @@ object frmMain: TfrmMain
TabOrder = 2
end
object sbar: TStatusBar
- Height = 19
- Top = 367
+ Height = 23
+ Top = 362
Width = 573
Panels = <
item
@@ -122,10 +109,11 @@ object frmMain: TfrmMain
end
object comboIndex: TComboBox
Left = 76
- Height = 23
+ Height = 21
Top = 40
Width = 148
- MaxLength = 65535
+ AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+ ItemHeight = 13
OnSelect = comboIndexSelect
TabOrder = 8
end
@@ -139,36 +127,8 @@ object frmMain: TfrmMain
}
end
object Dbf1: TDbf
- FilePath = '/home/prog/lazarus/components/lazreport/samples/editor/db/'
- IndexDefs = <
- item
- IndexFile = 'BYCOMPANY'
- SortField = 'COMPANY'
- Options = [ixExpression]
- end
- item
- IndexFile = 'BYCOUNTRY'
- SortField = 'COUNTRY'
- Options = [ixExpression]
- end
- item
- IndexFile = 'BYYEAR'
- SortField = 'YEAR'
- Options = [ixExpression]
- end
- item
- IndexFile = 'BYAUTHORYE'
- SortField = 'AUTHOR+STR(YEAR,10)'
- Options = [ixExpression]
- end
- item
- IndexFile = 'BYCNTYEAR'
- SortField = 'COUNTRY+STR(YEAR,10)'
- Options = [ixExpression]
- end>
- TableName = 'disco.dbf'
+ IndexDefs = <>
TableLevel = 3
- Active = True
left = 128
top = 72
end
diff --git a/components/lazreport/samples/editor/maincalleditor.lrs b/components/lazreport/samples/editor/maincalleditor.lrs
index e0a573042e..2ef4179b93 100644
--- a/components/lazreport/samples/editor/maincalleditor.lrs
+++ b/components/lazreport/samples/editor/maincalleditor.lrs
@@ -2,95 +2,87 @@
LazarusResources.Add('TfrmMain','FORMDATA',[
'TPF0'#8'TfrmMain'#7'frmMain'#4'Left'#3#21#1#6'Height'#3#149#1#3'Top'#2''#5
- +'Width'#3'='#2#13'ActiveControl'#7#13'btnCallEditor'#7'Caption'#6#20'LazRepo'
- +'rt Test Suite'#12'ClientHeight'#3#130#1#11'ClientWidth'#3'='#2#4'Menu'#7#9
- +'MainMenu1'#8'OnCreate'#7#13'frmMainCreate'#10'ParentFont'#8#8'ShowHint'#9#10
- +'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#8'lblIndex'#4'Left'#2#12#6'Height'#2#19
- +#3'Top'#2','#5'Width'#2#6#11'ParentColor'#8#0#0#6'TLabel'#7'lblExpr'#4'Left'
- +#3#235#0#6'Height'#2#19#3'Top'#2','#5'Width'#2#6#11'ParentColor'#8#0#0#7'TBu'
- +'tton'#13'btnCallEditor'#4'Left'#2#24#6'Height'#2#25#3'Top'#2#8#5'Width'#2'P'
- +#6'Action'#7#12'accNewReport'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2
- +#0#0#0#7'TDBGrid'#7'dbGrid1'#6'Height'#3'+'#1#3'Top'#2'D'#5'Width'#3'='#2#5
- +'Align'#7#8'alBottom'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'
- +#0#5'Color'#7#7'clWhite'#7'Columns'#14#1#9'FieldName'#6#6'AUTHOR'#0#1#9'Fiel'
- +'dName'#6#7'COMPANY'#0#1#8'ReadOnly'#9#9'FieldName'#6#5'PRICE'#0#1#9'FieldNa'
- +'me'#6#7'COUNTRY'#0#0#10'DataSource'#7#11'Datasource1'#10'FixedColor'#7#9'cl'
- +'BtnFace'#13'FixedHotColor'#7#9'cl3DLight'#7'Options'#11#9'dgEditing'#8'dgTi'
- +'tles'#11'dgIndicator'#14'dgColumnResize'#10'dgColLines'#10'dgRowLines'#6'dg'
- +'Tabs'#21'dgAlwaysShowSelection'#15'dgConfirmDelete'#14'dgCancelOnExit'#13'd'
- +'gMultiselect'#0#12'OptionsExtra'#11#14'dgeAutoColumns'#17'dgeCheckboxColumn'
- +#0#11'ParentColor'#8#8'TabOrder'#2#5#12'OnTitleClick'#7#17'dbGrid1TitleClick'
- +#0#0#7'TButton'#7'Button1'#4'Left'#3#223#1#6'Height'#2#25#3'Top'#2#8#5'Width'
- +#2'K'#6'Action'#7#12'accPrintGrid'#25'BorderSpacing.InnerBorder'#2#4#8'TabOr'
- +'der'#2#1#0#0#7'TButton'#7'Button2'#4'Left'#3'"'#1#6'Height'#2#25#3'Top'#2#8
- +#5'Width'#2'`'#6'Action'#7#16'accPreviewReport'#25'BorderSpacing.InnerBorder'
- +#2#4#8'TabOrder'#2#2#0#0#10'TStatusBar'#4'sbar'#6'Height'#2#19#3'Top'#3'o'#1
- +#5'Width'#3'='#2#6'Panels'#14#1#5'Width'#3#250#0#0#0#11'SimplePanel'#8#0#0#7
- +'TButton'#7'Button3'#4'Left'#3#210#0#6'Height'#2#25#3'Top'#2#8#5'Width'#2'K'
- +#6'Action'#7#13'accEditReport'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'
- +#2#3#0#0#7'TButton'#7'Button4'#4'Left'#3#135#1#6'Height'#2#25#3'Top'#2#8#5'W'
- +'idth'#2'S'#6'Action'#7#14'accPrintReport'#25'BorderSpacing.InnerBorder'#2#4
- +#8'TabOrder'#2#4#0#0#7'TButton'#13'btnOpenReport'#4'Left'#2'm'#6'Height'#2#25
- +#3'Top'#2#8#5'Width'#2'`'#6'Action'#7#13'accOpenReport'#25'BorderSpacing.Inn'
- +'erBorder'#2#4#8'TabOrder'#2#6#0#0#9'TComboBox'#10'comboIndex'#4'Left'#2'L'#6
- +'Height'#2#23#3'Top'#2'('#5'Width'#3#148#0#9'MaxLength'#4#255#255#0#0#8'OnSe'
- +'lect'#7#16'comboIndexSelect'#8'TabOrder'#2#8#0#0#9'TfrReport'#9'TheReport'#7
- +'Dataset'#7#12'frDBDataSet1'#14'PreviewButtons'#11#6'pbZoom'#6'pbLoad'#6'pbS'
- +'ave'#7'pbPrint'#6'pbFind'#6'pbHelp'#6'pbExit'#0#4'left'#2'`'#3'top'#2'p'#10
- +'ReportForm'#10#4#0#0#0#24#0#0#0#0#0#4'TDbf'#4'Dbf1'#8'FilePath'#6':/home/pr'
- +'og/lazarus/components/lazreport/samples/editor/db/'#9'IndexDefs'#14#1#9'Ind'
- +'exFile'#6#9'BYCOMPANY'#9'SortField'#6#7'COMPANY'#7'Options'#11#12'ixExpress'
- +'ion'#0#0#1#9'IndexFile'#6#9'BYCOUNTRY'#9'SortField'#6#7'COUNTRY'#7'Options'
- +#11#12'ixExpression'#0#0#1#9'IndexFile'#6#6'BYYEAR'#9'SortField'#6#4'YEAR'#7
- +'Options'#11#12'ixExpression'#0#0#1#9'IndexFile'#6#10'BYAUTHORYE'#9'SortFiel'
- +'d'#6#19'AUTHOR+STR(YEAR,10)'#7'Options'#11#12'ixExpression'#0#0#1#9'IndexFi'
- +'le'#6#9'BYCNTYEAR'#9'SortField'#6#20'COUNTRY+STR(YEAR,10)'#7'Options'#11#12
- +'ixExpression'#0#0#0#9'TableName'#6#9'disco.dbf'#10'TableLevel'#2#3#6'Active'
- +#9#4'left'#3#128#0#3'top'#2'H'#0#0#11'TDatasource'#11'Datasource1'#7'DataSet'
- +#7#4'Dbf1'#4'left'#2'`'#3'top'#2'H'#0#0#12'TfrDBDataSet'#12'frDBDataSet1'#7
- +'DataSet'#7#4'Dbf1'#4'left'#2'`'#3'top'#3#144#0#0#0#12'TFrPrintGrid'#2'PG'#6
- +'DBGrid'#7#7'dbGrid1'#11'Orientation'#7#11'poLandscape'#7'Caption'#6#4'Grid'
- +#11'ShowCaption'#9#4'left'#2'`'#3'top'#3#176#0#0#0#9'TMainMenu'#9'MainMenu1'
- +#4'left'#2#8#3'top'#2'`'#0#9'TMenuItem'#9'MenuItem1'#7'Caption'#6#5'Files'#0
- +#9'TMenuItem'#9'MenuItem2'#6'Action'#7#8'accClose'#7'OnClick'#7#15'accCloseE'
- +'xecute'#0#0#0#9'TMenuItem'#9'MenuItem3'#7'Caption'#6#5'Tests'#0#9'TMenuItem'
- +#9'MenuItem4'#6'Action'#7#12'accNewReport'#7'OnClick'#7#19'accNewReportExecu'
- +'te'#0#0#9'TMenuItem'#9'MenuItem5'#6'Action'#7#13'accEditReport'#7'OnClick'#7
- +#20'accEditReportExecute'#0#0#9'TMenuItem'#9'MenuItem6'#6'Action'#7#16'accPr'
- +'eviewReport'#7'OnClick'#7#23'accPreviewReportExecute'#0#0#9'TMenuItem'#9'Me'
- +'nuItem7'#6'Action'#7#14'accPrintReport'#7'OnClick'#7#21'accPrintReportExecu'
- +'te'#0#0#9'TMenuItem'#9'MenuItem8'#6'Action'#7#12'accPrintGrid'#7'OnClick'#7
- +#19'accPrintGridExecute'#0#0#0#9'TMenuItem'#9'MenuItem9'#7'Caption'#6#6'Expo'
- +'rt'#0#9'TMenuItem'#10'MenuItem10'#6'Action'#7#15'accExportToText'#7'OnClick'
- +#7#22'accExportToTextExecute'#0#0#9'TMenuItem'#10'MenuItem11'#6'Action'#7#15
- +'accExportToHtml'#7'OnClick'#7#22'accExportToHtmlExecute'#0#0#9'TMenuItem'#10
- +'MenuItem12'#6'Action'#7#14'accExportToCSV'#7'OnClick'#7#21'accExportToCSVEx'
- ,'ecute'#0#0#0#0#22'TApplicationProperties'#22'ApplicationProperties1'#17'Cap'
- +'tureExceptions'#9#9'HintColor'#7#8'clInfoBk'#13'HintHidePause'#3#196#9#9'Hi'
- +'ntPause'#2#10#13'HintShortCuts'#9#8'ShowHint'#9#10'OnShowHint'#7#30'Applica'
- +'tionProperties1ShowHint'#4'left'#2'`'#3'top'#3#240#0#0#0#11'TActionList'#11
- +'ActionList1'#4'left'#2'0'#3'top'#2'`'#0#7'TAction'#12'accNewReport'#8'Categ'
- +'ory'#6#5'Tests'#7'Caption'#6#10'New Report'#18'DisableIfNoHandler'#9#9'OnEx'
- +'ecute'#7#19'accNewReportExecute'#0#0#7'TAction'#13'accEditReport'#8'Categor'
- +'y'#6#5'Tests'#7'Caption'#6#11'Edit Report'#18'DisableIfNoHandler'#9#9'OnExe'
- +'cute'#7#20'accEditReportExecute'#0#0#7'TAction'#16'accPreviewReport'#8'Cate'
- +'gory'#6#5'Tests'#7'Caption'#6#14'Preview Report'#18'DisableIfNoHandler'#9#9
- +'OnExecute'#7#23'accPreviewReportExecute'#0#0#7'TAction'#12'accPrintGrid'#8
- +'Category'#6#5'Tests'#7'Caption'#6#10'Print Grid'#18'DisableIfNoHandler'#9#9
- +'OnExecute'#7#19'accPrintGridExecute'#0#0#7'TAction'#14'accPrintReport'#8'Ca'
- +'tegory'#6#5'Tests'#7'Caption'#6#12'Print Report'#18'DisableIfNoHandler'#9#9
- +'OnExecute'#7#21'accPrintReportExecute'#0#0#7'TAction'#8'accClose'#8'Categor'
- +'y'#6#5'Files'#7'Caption'#6#5'Close'#18'DisableIfNoHandler'#9#9'OnExecute'#7
- +#15'accCloseExecute'#0#0#7'TAction'#15'accExportToText'#8'Category'#6#6'Expo'
- +'rt'#7'Caption'#6#14'Export to text'#18'DisableIfNoHandler'#9#9'OnExecute'#7
- +#22'accExportToTextExecute'#0#0#7'TAction'#15'accExportToHtml'#8'Category'#6
- +#6'Export'#7'Caption'#6#14'Export to html'#18'DisableIfNoHandler'#9#9'OnExec'
- +'ute'#7#22'accExportToHtmlExecute'#0#0#7'TAction'#13'accOpenReport'#8'Catego'
- +'ry'#6#5'Files'#7'Caption'#6#11'Open Report'#18'DisableIfNoHandler'#9#9'OnEx'
- +'ecute'#7#20'accOpenReportExecute'#0#0#7'TAction'#14'accExportToCSV'#8'Categ'
- +'ory'#6#6'Export'#7'Caption'#6#13'Export to CSV'#18'DisableIfNoHandler'#9#9
- +'OnExecute'#7#21'accExportToCSVExecute'#0#0#0#11'TOpenDialog'#11'OpenDialog1'
- +#6'Filter'#6':LazReport Files|*.lrf|FreeReport Files|*.frf|All Files|*.*'#11
- +'FilterIndex'#2#0#4'left'#2'd'#3'top'#3#16#1#0#0#12'TfrCSVExport'#12'frCSVEx'
- +'port1'#4'left'#3#188#0#3'top'#2'H'#0#0#0
+ +'Width'#3'='#2#18'HorzScrollBar.Page'#3'<'#2#18'VertScrollBar.Page'#3#128#1
+ +#13'ActiveControl'#7#13'btnCallEditor'#7'Caption'#6#20'LazReport Test Suite'
+ +#12'ClientHeight'#3#129#1#11'ClientWidth'#3'='#2#4'Menu'#7#9'MainMenu1'#8'On'
+ +'Create'#7#13'frmMainCreate'#8'ShowHint'#9#10'LCLVersion'#6#6'0.9.25'#0#6'TL'
+ +'abel'#8'lblIndex'#4'Left'#2#12#6'Height'#2#14#3'Top'#2','#5'Width'#2#1#11'P'
+ +'arentColor'#8#0#0#6'TLabel'#7'lblExpr'#4'Left'#3#235#0#6'Height'#2#14#3'Top'
+ +#2','#5'Width'#2#1#11'ParentColor'#8#0#0#7'TButton'#13'btnCallEditor'#4'Left'
+ +#2#24#6'Height'#2#25#3'Top'#2#8#5'Width'#2'P'#6'Action'#7#12'accNewReport'#25
+ +'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#0#0#0#7'TDBGrid'#7'dbGrid1'#6
+ +'Height'#3'&'#1#3'Top'#2'D'#5'Width'#3'='#2#5'Align'#7#8'alBottom'#7'Anchors'
+ +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#5'Color'#7#7'clWhite'#10'Dat'
+ +'aSource'#7#11'Datasource1'#10'FixedColor'#7#9'clBtnFace'#13'FixedHotColor'#7
+ +#9'cl3DLight'#7'Options'#11#9'dgEditing'#8'dgTitles'#11'dgIndicator'#14'dgCo'
+ +'lumnResize'#10'dgColLines'#10'dgRowLines'#6'dgTabs'#21'dgAlwaysShowSelectio'
+ +'n'#15'dgConfirmDelete'#14'dgCancelOnExit'#0#12'OptionsExtra'#11#14'dgeAutoC'
+ +'olumns'#17'dgeCheckboxColumn'#0#11'ParentColor'#8#8'TabOrder'#2#5#12'OnTitl'
+ +'eClick'#7#17'dbGrid1TitleClick'#0#0#7'TButton'#7'Button1'#4'Left'#3#223#1#6
+ +'Height'#2#25#3'Top'#2#8#5'Width'#2'K'#6'Action'#7#12'accPrintGrid'#25'Borde'
+ +'rSpacing.InnerBorder'#2#4#8'TabOrder'#2#1#0#0#7'TButton'#7'Button2'#4'Left'
+ +#3'"'#1#6'Height'#2#25#3'Top'#2#8#5'Width'#2'`'#6'Action'#7#16'accPreviewRep'
+ +'ort'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#2#0#0#10'TStatusBar'#4
+ +'sbar'#6'Height'#2#23#3'Top'#3'j'#1#5'Width'#3'='#2#6'Panels'#14#1#5'Width'#3
+ +#250#0#0#0#11'SimplePanel'#8#0#0#7'TButton'#7'Button3'#4'Left'#3#210#0#6'Hei'
+ +'ght'#2#25#3'Top'#2#8#5'Width'#2'K'#6'Action'#7#13'accEditReport'#25'BorderS'
+ +'pacing.InnerBorder'#2#4#8'TabOrder'#2#3#0#0#7'TButton'#7'Button4'#4'Left'#3
+ +#135#1#6'Height'#2#25#3'Top'#2#8#5'Width'#2'S'#6'Action'#7#14'accPrintReport'
+ +#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#4#0#0#7'TButton'#13'btnOpen'
+ +'Report'#4'Left'#2'm'#6'Height'#2#25#3'Top'#2#8#5'Width'#2'`'#6'Action'#7#13
+ +'accOpenReport'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#6#0#0#9'TCom'
+ +'boBox'#10'comboIndex'#4'Left'#2'L'#6'Height'#2#21#3'Top'#2'('#5'Width'#3#148
+ +#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscendin'
+ +'g'#0#10'ItemHeight'#2#13#8'OnSelect'#7#16'comboIndexSelect'#8'TabOrder'#2#8
+ +#0#0#9'TfrReport'#9'TheReport'#7'Dataset'#7#12'frDBDataSet1'#14'PreviewButto'
+ +'ns'#11#6'pbZoom'#6'pbLoad'#6'pbSave'#7'pbPrint'#6'pbFind'#6'pbHelp'#6'pbExi'
+ +'t'#0#4'left'#2'`'#3'top'#2'p'#10'ReportForm'#10#4#0#0#0#24#0#0#0#0#0#4'TDbf'
+ +#4'Dbf1'#9'IndexDefs'#14#0#10'TableLevel'#2#3#4'left'#3#128#0#3'top'#2'H'#0#0
+ +#11'TDatasource'#11'Datasource1'#7'DataSet'#7#4'Dbf1'#4'left'#2'`'#3'top'#2
+ +'H'#0#0#12'TfrDBDataSet'#12'frDBDataSet1'#7'DataSet'#7#4'Dbf1'#4'left'#2'`'#3
+ +'top'#3#144#0#0#0#12'TFrPrintGrid'#2'PG'#6'DBGrid'#7#7'dbGrid1'#11'Orientati'
+ +'on'#7#11'poLandscape'#7'Caption'#6#4'Grid'#11'ShowCaption'#9#4'left'#2'`'#3
+ +'top'#3#176#0#0#0#9'TMainMenu'#9'MainMenu1'#4'left'#2#8#3'top'#2'`'#0#9'TMen'
+ +'uItem'#9'MenuItem1'#7'Caption'#6#5'Files'#0#9'TMenuItem'#9'MenuItem2'#6'Act'
+ +'ion'#7#8'accClose'#7'OnClick'#7#15'accCloseExecute'#0#0#0#9'TMenuItem'#9'Me'
+ +'nuItem3'#7'Caption'#6#5'Tests'#0#9'TMenuItem'#9'MenuItem4'#6'Action'#7#12'a'
+ +'ccNewReport'#7'OnClick'#7#19'accNewReportExecute'#0#0#9'TMenuItem'#9'MenuIt'
+ +'em5'#6'Action'#7#13'accEditReport'#7'OnClick'#7#20'accEditReportExecute'#0#0
+ +#9'TMenuItem'#9'MenuItem6'#6'Action'#7#16'accPreviewReport'#7'OnClick'#7#23
+ +'accPreviewReportExecute'#0#0#9'TMenuItem'#9'MenuItem7'#6'Action'#7#14'accPr'
+ +'intReport'#7'OnClick'#7#21'accPrintReportExecute'#0#0#9'TMenuItem'#9'MenuIt'
+ +'em8'#6'Action'#7#12'accPrintGrid'#7'OnClick'#7#19'accPrintGridExecute'#0#0#0
+ +#9'TMenuItem'#9'MenuItem9'#7'Caption'#6#6'Export'#0#9'TMenuItem'#10'MenuItem'
+ +'10'#6'Action'#7#15'accExportToText'#7'OnClick'#7#22'accExportToTextExecute'
+ +#0#0#9'TMenuItem'#10'MenuItem11'#6'Action'#7#15'accExportToHtml'#7'OnClick'#7
+ +#22'accExportToHtmlExecute'#0#0#9'TMenuItem'#10'MenuItem12'#6'Action'#7#14'a'
+ +'ccExportToCSV'#7'OnClick'#7#21'accExportToCSVExecute'#0#0#0#0#22'TApplicati'
+ +'onProperties'#22'ApplicationProperties1'#17'CaptureExceptions'#9#9'HintColo'
+ +'r'#7#8'clInfoBk'#13'HintHidePause'#3#196#9#9'HintPause'#2#10#13'HintShortCu'
+ +'ts'#9#8'ShowHint'#9#10'OnShowHint'#7#30'ApplicationProperties1ShowHint'#4'l'
+ +'eft'#2'`'#3'top'#3#240#0#0#0#11'TActionList'#11'ActionList1'#4'left'#2'0'#3
+ +'top'#2'`'#0#7'TAction'#12'accNewReport'#8'Category'#6#5'Tests'#7'Caption'#6
+ +#10'New Report'#18'DisableIfNoHandler'#9#9'OnExecute'#7#19'accNewReportExecu'
+ +'te'#0#0#7'TAction'#13'accEditReport'#8'Category'#6#5'Tests'#7'Caption'#6#11
+ +'Edit Report'#18'DisableIfNoHandler'#9#9'OnExecute'#7#20'accEditReportExecut'
+ ,'e'#0#0#7'TAction'#16'accPreviewReport'#8'Category'#6#5'Tests'#7'Caption'#6
+ +#14'Preview Report'#18'DisableIfNoHandler'#9#9'OnExecute'#7#23'accPreviewRep'
+ +'ortExecute'#0#0#7'TAction'#12'accPrintGrid'#8'Category'#6#5'Tests'#7'Captio'
+ +'n'#6#10'Print Grid'#18'DisableIfNoHandler'#9#9'OnExecute'#7#19'accPrintGrid'
+ +'Execute'#0#0#7'TAction'#14'accPrintReport'#8'Category'#6#5'Tests'#7'Caption'
+ +#6#12'Print Report'#18'DisableIfNoHandler'#9#9'OnExecute'#7#21'accPrintRepor'
+ +'tExecute'#0#0#7'TAction'#8'accClose'#8'Category'#6#5'Files'#7'Caption'#6#5
+ +'Close'#18'DisableIfNoHandler'#9#9'OnExecute'#7#15'accCloseExecute'#0#0#7'TA'
+ +'ction'#15'accExportToText'#8'Category'#6#6'Export'#7'Caption'#6#14'Export t'
+ +'o text'#18'DisableIfNoHandler'#9#9'OnExecute'#7#22'accExportToTextExecute'#0
+ +#0#7'TAction'#15'accExportToHtml'#8'Category'#6#6'Export'#7'Caption'#6#14'Ex'
+ +'port to html'#18'DisableIfNoHandler'#9#9'OnExecute'#7#22'accExportToHtmlExe'
+ +'cute'#0#0#7'TAction'#13'accOpenReport'#8'Category'#6#5'Files'#7'Caption'#6
+ +#11'Open Report'#18'DisableIfNoHandler'#9#9'OnExecute'#7#20'accOpenReportExe'
+ +'cute'#0#0#7'TAction'#14'accExportToCSV'#8'Category'#6#6'Export'#7'Caption'#6
+ +#13'Export to CSV'#18'DisableIfNoHandler'#9#9'OnExecute'#7#21'accExportToCSV'
+ +'Execute'#0#0#0#11'TOpenDialog'#11'OpenDialog1'#6'Filter'#6':LazReport Files'
+ +'|*.lrf|FreeReport Files|*.frf|All Files|*.*'#11'FilterIndex'#2#0#4'left'#2
+ +'d'#3'top'#3#16#1#0#0#12'TfrCSVExport'#12'frCSVExport1'#4'left'#3#188#0#3'to'
+ +'p'#2'H'#0#0#0
]);
diff --git a/components/lazreport/samples/editor/maincalleditor.pas b/components/lazreport/samples/editor/maincalleditor.pas
index fda541e8a5..242ad0155e 100644
--- a/components/lazreport/samples/editor/maincalleditor.pas
+++ b/components/lazreport/samples/editor/maincalleditor.pas
@@ -108,7 +108,7 @@ var
implementation
-uses gettext,translations,lclproc;
+uses gettext,translations;
resourcestring
cerOpenReport = 'Open report';
@@ -223,9 +223,7 @@ end;
procedure TfrmMain.accPreviewReportExecute(Sender: TObject);
begin
- DataSource1.Enabled:=false;
TheReport.ShowReport;
- DataSource1.Enabled:=true;
end;
procedure TfrmMain.accPrintGridExecute(Sender: TObject);
@@ -267,32 +265,9 @@ begin
SetIndex('');
end;
-function dbgwstr(w: widestring):string;
-var
- p: pchar;
- i: integer;
-begin
- p := @w[1];
- i := length(w)*2;
-
- result := '';
-
- while i>0 do begin
- if p^ in [#0..#31,#128..#255] then
- result := result + '#'+IntToStr(ord(p^))
- else
- result := result + p^;
-
- inc(p);
- dec(i);
- end;
-end;
-
procedure TfrmMain.frmMainCreate(Sender: TObject);
var
i: integer;
- w: widestring;
- s: string;
begin
UpdateAppTranslation;
@@ -310,12 +285,6 @@ begin
if FileExistsUTF8(ExtractFilePath(ParamStrUTF8(0))+'salida.lrf') then
OpenReport(ExtractFilePath(ParamStrUTF8(0))+'salida.lrf');
-
- s := 'LazReport/Title/Value';
- SetLength(W, UTF8Length(s));
- UTF8ToUnicode(PUnicodeChar(w), pchar(s), UTF8Length(s)+1);
-
- WriteLn('W Len=',Length(W),' data="',dbgwstr(w),'"');
end;
procedure TfrmMain.SetIndex(const aIndexName: string);
diff --git a/components/memds/Makefile b/components/memds/Makefile
index 05a36a48f5..0088cd0e7e 100644
--- a/components/memds/Makefile
+++ b/components/memds/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -114,10 +114,6 @@ FPC:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-else
-ifeq ($(strip $(wildcard $(FPC))),)
-FPC:=$(firstword $(FPCPROG))
-endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
diff --git a/components/memds/Makefile.fpc b/components/memds/Makefile.fpc
index dac5ebe64c..7d7065fdff 100644
--- a/components/memds/Makefile.fpc
+++ b/components/memds/Makefile.fpc
@@ -2,7 +2,7 @@
#
# Makefile.fpc for MemDSLaz 1.2.1
#
-# This file was generated on 07-10-08
+# This file was generated on 25-9-2008
[package]
name=memdslaz
diff --git a/components/printers/Makefile b/components/printers/Makefile
index c23dfc6f82..798ec37180 100644
--- a/components/printers/Makefile
+++ b/components/printers/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/03]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -114,10 +114,6 @@ FPC:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-else
-ifeq ($(strip $(wildcard $(FPC))),)
-FPC:=$(firstword $(FPCPROG))
-endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
@@ -628,178 +624,178 @@ ifeq ($(FULL_TARGET),armeb-embedded)
override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
endif
ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+override COMPILER_OPTIONS+=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
endif
ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_INCLUDEDIR+=unix/ win32/ carbon/ qt/ ./
diff --git a/components/printers/Makefile.fpc b/components/printers/Makefile.fpc
index 849764ac5f..119c50ad72 100644
--- a/components/printers/Makefile.fpc
+++ b/components/printers/Makefile.fpc
@@ -2,7 +2,7 @@
#
# Makefile.fpc for Printer4Lazarus 0.5
#
-# This file was generated on 07-10-08
+# This file was generated on 25-9-2008
[package]
name=printer4lazarus
@@ -12,7 +12,7 @@ version=0.5
unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
unitdir=unix/ win32/ carbon/ qt/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
includedir=unix/ win32/ carbon/ qt/ ./
-options=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
+options=-dUseCache -dNativePrint -dLCL -dLCL$(LCL_PLATFORM) -MObjFPC -Scgi
[target]
units=printer4lazarus.pas
diff --git a/components/printers/design/Makefile b/components/printers/design/Makefile
index 576d9018b6..0d2f0c800a 100644
--- a/components/printers/design/Makefile
+++ b/components/printers/design/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -114,10 +114,6 @@ FPC:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-else
-ifeq ($(strip $(wildcard $(FPC))),)
-FPC:=$(firstword $(FPCPROG))
-endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
diff --git a/components/printers/design/Makefile.fpc b/components/printers/design/Makefile.fpc
index a73673c4eb..a64ec85538 100644
--- a/components/printers/design/Makefile.fpc
+++ b/components/printers/design/Makefile.fpc
@@ -2,7 +2,7 @@
#
# Makefile.fpc for printers4lazide 0.0
#
-# This file was generated on 07-10-08
+# This file was generated on 25-9-2008
[package]
name=printers4lazide
diff --git a/components/printers/design/languages/ideprinting.ru.po b/components/printers/design/languages/ideprinting.ru.po
index 71359e3015..92e436941c 100644
--- a/components/printers/design/languages/ideprinting.ru.po
+++ b/components/printers/design/languages/ideprinting.ru.po
@@ -9,23 +9,23 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ideprinting.sdescrpfselection
-msgid "Print..."
-msgstr "Печать..."
-
-#: ideprinting.sprintfile
+#: ideprinting:sprintfile
msgid "Complete file"
msgstr "Весь файл"
-#: ideprinting.sprintselection
-msgid "Selected text"
-msgstr "Выделенный текст"
-
-#: ideprinting.sprintsources
+#: ideprinting:sprintsources
msgid "Print sources"
msgstr "Печать исходного кода"
-#: ideprinting.sprintwhat
+#: ideprinting:sdescrpfselection
+msgid "Print..."
+msgstr "Печать..."
+
+#: ideprinting:sprintselection
+msgid "Selected text"
+msgstr "Выделенный текст"
+
+#: ideprinting:sprintwhat
msgid "What would you like to print ?"
msgstr "Что вы хотите напечатать?"
diff --git a/components/rtticontrols/Makefile b/components/rtticontrols/Makefile
index 0450982abf..305c10743c 100644
--- a/components/rtticontrols/Makefile
+++ b/components/rtticontrols/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -114,10 +114,6 @@ FPC:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-else
-ifeq ($(strip $(wildcard $(FPC))),)
-FPC:=$(firstword $(FPCPROG))
-endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
diff --git a/components/rtticontrols/Makefile.fpc b/components/rtticontrols/Makefile.fpc
index 92e20c1166..790cb5a61a 100644
--- a/components/rtticontrols/Makefile.fpc
+++ b/components/rtticontrols/Makefile.fpc
@@ -2,7 +2,7 @@
#
# Makefile.fpc for RunTimeTypeInfoControls 0.1
#
-# This file was generated on 07-10-08
+# This file was generated on 25-9-2008
[package]
name=runtimetypeinfocontrols
diff --git a/components/sdf/Makefile b/components/sdf/Makefile
index ce0bce21fd..9047ece2fc 100644
--- a/components/sdf/Makefile
+++ b/components/sdf/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -114,10 +114,6 @@ FPC:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-else
-ifeq ($(strip $(wildcard $(FPC))),)
-FPC:=$(firstword $(FPCPROG))
-endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
diff --git a/components/sdf/Makefile.fpc b/components/sdf/Makefile.fpc
index 3ca1423e85..6ff89cc48e 100644
--- a/components/sdf/Makefile.fpc
+++ b/components/sdf/Makefile.fpc
@@ -2,7 +2,7 @@
#
# Makefile.fpc for SDFLaz 0.1.1
#
-# This file was generated on 07-10-08
+# This file was generated on 25-9-2008
[package]
name=sdflaz
diff --git a/components/sqldb/Makefile b/components/sqldb/Makefile
index c9e4b5ea78..149d3b783d 100644
--- a/components/sqldb/Makefile
+++ b/components/sqldb/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -114,10 +114,6 @@ FPC:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-else
-ifeq ($(strip $(wildcard $(FPC))),)
-FPC:=$(firstword $(FPCPROG))
-endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
diff --git a/components/sqldb/Makefile.fpc b/components/sqldb/Makefile.fpc
index 813bc5d5b5..9b329c7e32 100644
--- a/components/sqldb/Makefile.fpc
+++ b/components/sqldb/Makefile.fpc
@@ -2,7 +2,7 @@
#
# Makefile.fpc for SQLDBLaz 1.0.1
#
-# This file was generated on 07-10-08
+# This file was generated on 25-9-2008
[package]
name=sqldblaz
diff --git a/components/tachart/Makefile b/components/tachart/Makefile
index c14646b6a7..c010d606a6 100644
--- a/components/tachart/Makefile
+++ b/components/tachart/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/07]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -114,10 +114,6 @@ FPC:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-else
-ifeq ($(strip $(wildcard $(FPC))),)
-FPC:=$(firstword $(FPCPROG))
-endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
diff --git a/components/tachart/Makefile.fpc b/components/tachart/Makefile.fpc
index 8a58bfb17c..11d2384fb2 100644
--- a/components/tachart/Makefile.fpc
+++ b/components/tachart/Makefile.fpc
@@ -2,7 +2,7 @@
#
# Makefile.fpc for TAChartLazarusPkg 0.0
#
-# This file was generated on 07-10-08
+# This file was generated on 25-9-2008
[package]
name=tachartlazaruspkg
diff --git a/components/tdbf/Makefile b/components/tdbf/Makefile
index 78c4c49cbb..7d05cdf28c 100644
--- a/components/tdbf/Makefile
+++ b/components/tdbf/Makefile
@@ -1,5 +1,5 @@
#
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/03]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/09/11]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -114,10 +114,6 @@ FPC:=$(shell $(FPCPROG) -PB)
endif
ifneq ($(findstring Error,$(FPC)),)
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
-else
-ifeq ($(strip $(wildcard $(FPC))),)
-FPC:=$(firstword $(FPCPROG))
-endif
endif
else
override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
diff --git a/components/tdbf/Makefile.fpc b/components/tdbf/Makefile.fpc
index 8af9a1adab..204a2fb85c 100644
--- a/components/tdbf/Makefile.fpc
+++ b/components/tdbf/Makefile.fpc
@@ -2,7 +2,7 @@
#
# Makefile.fpc for DBFLaz 0.1.1
#
-# This file was generated on 07-10-08
+# This file was generated on 25-9-2008
[package]
name=dbflaz
diff --git a/lcl/interfaces/gtk/gtkwinapi.inc b/lcl/interfaces/gtk/gtkwinapi.inc
index 8e7501890b..f07416adc0 100644
--- a/lcl/interfaces/gtk/gtkwinapi.inc
+++ b/lcl/interfaces/gtk/gtkwinapi.inc
@@ -7399,7 +7399,7 @@ begin
{$IFDEF EnabledGtkThreading}
g_idle_add_full(G_PRIORITY_DEFAULT,TGSourceFunc(@DummyFuncToWakeUpGtkLoop),nil,nil);
{$ELSE}
- //DebugLn(['TGtkWidgetSet.PostMessage ToDo: wake up gtk']);
+ DebugLn(['TGtkWidgetSet.PostMessage ToDo: wake up gtk']);
{$ENDIF}
end;
finally
diff --git a/localize.bat b/localize.bat
index 117261a09b..cb28def209 100644
--- a/localize.bat
+++ b/localize.bat
@@ -50,6 +50,11 @@ rstconv -c UTF-8 -i %Installer_RST% -o languages\installerstrconsts.po
tools\updatepofiles languages\installerstrconsts.po
:SkipInstaller
+@REM CodeTools
+@set CodeTools_RST=components\codetools\units\%ArchOS%\CodeToolsStrConsts.rst
+rstconv -c UTF-8 -i %CodeTools_RST% -o components\codetools\languages\codetoolsstrconsts.po
+tools\updatepofiles components\codetools\languages\codetoolsstrconsts.po
+
@REM SynEdit
@set SynEdit_RST=components\synedit\units\%ArchOS%\SynEditStrConst.rst
rstconv -c UTF-8 -i %SynEdit_RST% -o components\synedit\languages\synedit.po
@@ -60,11 +65,44 @@ tools\updatepofiles components\synedit\languages\synedit.po
rstconv -c UTF-8 -i %SynMacroRec_RST% -o components\synedit\languages\synmacrorecorder.po
tools\updatepofiles components\synedit\languages\synmacrorecorder.po
+@REM SynUniHighLighterShellScript
+@set SynUniHighLighterShellScript_RST=components\synedit\units\%ArchOS%\synhighlighterunixshellscript.rst
+rstconv -c UTF-8 -i %SynUniHighLighterShellScript_RST% -o components\synedit\languages\synhighlighterunixshellscript.po
+tools\updatepofiles components\synedit\languages\synhighlighterunixshellscript.po
+
@REM LCL
@set LCL_RST=lcl\units\%ArchOS%\lclstrconsts.rst
rstconv -c UTF-8 -i %LCL_RST% -o lcl\languages\lclstrconsts.po
tools\updatepofiles lcl\languages\lclstrconsts.po
+@REM CGI
+@set CGI_RST=components\cgi\lib\%ArchOS%\cgimodules.rst
+rstconv -c UTF-8 -i %CGI_RST% -o components\cgi\languages\cgimodules.po
+tools\updatepofiles components\cgi\languages\cgimodules.po
+
+@REM Printers
+@set Printers_RST=components\printers\design\lib\%ArchOS%\ideprinting.rst
+rstconv -c UTF-8 -i %Printers_RST% -o components\printers\design\languages\ideprinting.po
+tools\updatepofiles components\printers\design\languages\ideprinting.po
+
+@REM ProjectTemplates
+@set ProjectTemplates_RST=components\projecttemplates\lib\%ArchOS%\frmtemplatevariables.rst
+rstconv -c UTF-8 -i %ProjectTemplates_RST% -o components\projecttemplates\languages\frmtemplatevariables.po
+tools\updatepofiles components\projecttemplates\languages\frmtemplatevariables.po
+
+@set ProjectTemplates_RST=components\projecttemplates\lib\%ArchOS%\idetemplateproject.rst
+rstconv -c UTF-8 -i %ProjectTemplates_RST% -o components\projecttemplates\languages\idetemplateproject.po
+tools\updatepofiles components\projecttemplates\languages\idetemplateproject.po
+
+@set ProjectTemplates_RST=components\projecttemplates\lib\%ArchOS%\projecttemplates.rst
+rstconv -c UTF-8 -i %ProjectTemplates_RST% -o components\projecttemplates\languages\projecttemplates.po
+tools\updatepofiles components\projecttemplates\languages\projecttemplates.po
+
+@REM MessageComposer
+@set MessageComposer_RST=components\messagecomposer\lib\%ArchOS%\messagecomposer.rst
+rstconv -c UTF-8 -i %MessageComposer_RST% -o components\messagecomposer\languages\messagecomposer.po
+tools\updatepofiles components\messagecomposer\languages\messagecomposer.po
+
@goto Exit
:Exit_Error