From fb88fadd74288719214b8a0679bcc037ffb171b1 Mon Sep 17 00:00:00 2001 From: joost Date: Fri, 2 Jan 2015 20:45:33 +0000 Subject: [PATCH] fpmake: re-generated several fpmake.pp files git-svn-id: trunk@47285 - --- components/codetools/fpmake.pp | 6 +++--- components/debuggerintf/fpmake.pp | 7 +++---- components/ideintf/fpmake.pp | 11 ++++------- components/lazcontrols/fpmake.pp | 10 ++++------ components/lazdebuggergdbmi/fpmake.pp | 13 ++++--------- components/lazutils/fpmake.pp | 14 ++++++-------- components/synedit/fpmake.pp | 10 ++++------ ide/fpmake.pp | 2 +- lcl/fpmake.pp | 6 +++--- packager/registration/fpmake.pp | 4 +++- 10 files changed, 35 insertions(+), 48 deletions(-) diff --git a/components/codetools/fpmake.pp b/components/codetools/fpmake.pp index 776af925eb..7949fd60c3 100644 --- a/components/codetools/fpmake.pp +++ b/components/codetools/fpmake.pp @@ -3,7 +3,7 @@ fpmake.pp for CodeTools 1.0.1 - This file was generated on 28-12-2014 + This file was generated on 02-01-2015 } {$ifndef ALLPACKAGES} @@ -27,6 +27,8 @@ begin P.Directory:=ADirectory; + P.Flags.Add('LazarusDsgnPkg'); + P.Dependencies.Add('lazutils'); P.Options.Add('-MObjFPC'); P.Options.Add('-Sci'); @@ -36,8 +38,6 @@ begin P.Options.Add('-l'); P.Options.Add('-vh-'); P.Options.Add('-vewnibq'); - P.UnitPath.Add('../../packager/units/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET)'); P.UnitPath.Add('.'); T:=P.Targets.AddUnit('codetools.pas'); t.Dependencies.AddUnit('basiccodetools'); diff --git a/components/debuggerintf/fpmake.pp b/components/debuggerintf/fpmake.pp index e7d2499f28..6627be814e 100644 --- a/components/debuggerintf/fpmake.pp +++ b/components/debuggerintf/fpmake.pp @@ -3,7 +3,7 @@ fpmake.pp for DebuggerIntf 0.1 - This file was generated on 28-12-2014 + This file was generated on 02-01-2015 } {$ifndef ALLPACKAGES} @@ -27,6 +27,8 @@ begin P.Directory:=ADirectory; + P.Flags.Add('LazarusDsgnPkg'); + P.Dependencies.Add('lclbase'); P.Options.Add('-MObjFPC'); P.Options.Add('-Scghi'); @@ -38,9 +40,6 @@ begin P.Options.Add('-vh-'); P.Options.Add('-venibq'); P.Options.Add('-vm4046'); - P.UnitPath.Add('../../packager/units/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)'); P.UnitPath.Add('.'); T:=P.Targets.AddUnit('debuggerintf.pas'); t.Dependencies.AddUnit('dbgintfbasetypes'); diff --git a/components/ideintf/fpmake.pp b/components/ideintf/fpmake.pp index d44e6fb52f..e35e24f16c 100644 --- a/components/ideintf/fpmake.pp +++ b/components/ideintf/fpmake.pp @@ -3,7 +3,7 @@ fpmake.pp for IDEIntf 1.0 - This file was generated on 28-12-2014 + This file was generated on 02-01-2015 } {$ifndef ALLPACKAGES} @@ -27,6 +27,8 @@ begin P.Directory:=ADirectory; + P.Flags.Add('LazarusDsgnPkg'); + P.Dependencies.Add('lazcontrols'); P.Options.Add('-MObjFPC'); P.Options.Add('-Scghi'); @@ -37,14 +39,9 @@ begin P.Options.Add('-vi-'); P.Options.Add('-vewnhbq'); P.Options.Add('-dLCL'); - P.Options.Add('-dLCL$(LCL_PLATFORM)'); + P.Options.Add('-dLCL$(LCLWidgetType)'); P.Options.Add('-dNoCarbon'); P.IncludePath.Add('images'); - P.UnitPath.Add('../../packager/units/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)'); - P.UnitPath.Add('../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)'); P.UnitPath.Add('.'); T:=P.Targets.AddUnit('ideintf.pas'); t.Dependencies.AddUnit('actionseditor'); diff --git a/components/lazcontrols/fpmake.pp b/components/lazcontrols/fpmake.pp index f0d4c5f28d..e01a127c63 100644 --- a/components/lazcontrols/fpmake.pp +++ b/components/lazcontrols/fpmake.pp @@ -3,7 +3,7 @@ fpmake.pp for LazControls 1.0.1 - This file was generated on 28-12-2014 + This file was generated on 02-01-2015 } {$ifndef ALLPACKAGES} @@ -27,6 +27,8 @@ begin P.Directory:=ADirectory; + P.Flags.Add('LazarusDsgnPkg'); + P.Dependencies.Add('lcl'); P.Options.Add('-MObjFPC'); P.Options.Add('-Scghi'); @@ -36,12 +38,8 @@ begin P.Options.Add('-l'); P.Options.Add('-vewnhibq'); P.Options.Add('-dLCL'); - P.Options.Add('-dLCL$(LCL_PLATFORM)'); + P.Options.Add('-dLCL$(LCLWidgetType)'); P.Options.Add('-dNoCarbon'); - P.UnitPath.Add('../../packager/units/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)'); P.UnitPath.Add('.'); T:=P.Targets.AddUnit('lazcontrols.pas'); t.Dependencies.AddUnit('checkboxthemed'); diff --git a/components/lazdebuggergdbmi/fpmake.pp b/components/lazdebuggergdbmi/fpmake.pp index 627c56ef9f..49e95b3a02 100644 --- a/components/lazdebuggergdbmi/fpmake.pp +++ b/components/lazdebuggergdbmi/fpmake.pp @@ -3,7 +3,7 @@ fpmake.pp for LazDebuggerGdbmi 0.1 - This file was generated on 29-12-2014 + This file was generated on 02-01-2015 } {$ifndef ALLPACKAGES} @@ -27,6 +27,8 @@ begin P.Directory:=ADirectory; + P.Flags.Add('LazarusDsgnPkg'); + P.Dependencies.Add('ideintf'); P.Dependencies.Add('debuggerintf'); P.Options.Add('-MObjFPC'); @@ -37,15 +39,8 @@ begin P.Options.Add('-l'); P.Options.Add('-vewnhibq'); P.Options.Add('-dLCL'); - P.Options.Add('-dLCL$(LCL_PLATFORM)'); + P.Options.Add('-dLCL$(LCLWidgetType)'); P.Options.Add('-dNoCarbon'); - P.UnitPath.Add('../../packager/units/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../debuggerintf/lib/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)'); - P.UnitPath.Add('../lazcontrols/lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)'); - P.UnitPath.Add('../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)'); P.UnitPath.Add('.'); T:=P.Targets.AddUnit('lazdebuggergdbmi.pas'); t.Dependencies.AddUnit('cmdlinedebugger'); diff --git a/components/lazutils/fpmake.pp b/components/lazutils/fpmake.pp index b2ee35ae5f..4786c4bb8f 100644 --- a/components/lazutils/fpmake.pp +++ b/components/lazutils/fpmake.pp @@ -3,7 +3,7 @@ fpmake.pp for LazUtils 1.0 - This file was generated on 23-12-2014 + This file was generated on 02-01-2015 } {$ifndef ALLPACKAGES} @@ -13,7 +13,7 @@ program fpmake; uses fpmkunit; {$endif ALLPACKAGES} -procedure add_LazUtils; +procedure add_LazUtils(const ADirectory: string); var P : TPackage; @@ -25,10 +25,9 @@ begin P:=AddPAckage('lazutils'); P.Version:='1.0'; -{$ifdef ALLPACKAGES} - // when this is part of a meta package, set here the sub directory - P.Directory:='components/lazutils/'; -{$endif ALLPACKAGES} + P.Directory:=ADirectory; + + P.Flags.Add('LazarusDsgnPkg'); P.Dependencies.Add('fcl'); P.Options.Add('-MObjFPC'); @@ -38,7 +37,6 @@ begin P.Options.Add('-gl'); P.Options.Add('-l'); P.Options.Add('-vewnhibq'); - P.UnitPath.Add('../../packager/units/$(CPU_TARGET)-$(OS_TARGET)'); P.UnitPath.Add('.'); T:=P.Targets.AddUnit('lazutils.pas'); t.Dependencies.AddUnit('laz2_dom'); @@ -157,7 +155,7 @@ end; {$ifndef ALLPACKAGES} begin - add_LazUtils; + add_LazUtils(''); Installer.Run; end. {$endif ALLPACKAGES} diff --git a/components/synedit/fpmake.pp b/components/synedit/fpmake.pp index 8e223565c6..0eda35181d 100644 --- a/components/synedit/fpmake.pp +++ b/components/synedit/fpmake.pp @@ -3,7 +3,7 @@ fpmake.pp for SynEdit 1.0 - This file was generated on 28-12-2014 + This file was generated on 02-01-2015 } {$ifndef ALLPACKAGES} @@ -27,6 +27,8 @@ begin P.Directory:=ADirectory; + P.Flags.Add('LazarusDsgnPkg'); + P.Dependencies.Add('lcl'); P.Options.Add('-MObjFPC'); P.Options.Add('-Scghi'); @@ -39,14 +41,10 @@ begin P.Options.Add('-vewnhbq'); P.Options.Add('-vm5024,4055'); P.Options.Add('-dLCL'); - P.Options.Add('-dLCL$(LCL_PLATFORM)'); + P.Options.Add('-dLCL$(LCLWidgetType)'); P.Options.Add('-dNoCarbon'); P.Options.Add('-CR'); P.Options.Add('-dgc'); - P.UnitPath.Add('../../packager/units/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../lazutils/lib/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)'); P.UnitPath.Add('.'); T:=P.Targets.AddUnit('allsynedit.pas'); t.Dependencies.AddUnit('synbeautifier'); diff --git a/ide/fpmake.pp b/ide/fpmake.pp index 94dde99f91..b9b2abaa32 100644 --- a/ide/fpmake.pp +++ b/ide/fpmake.pp @@ -137,7 +137,7 @@ begin P.Options.Add('-vewnhi'); P.Options.Add('-l'); P.Options.Add('-dLCL'); - P.Options.Add('-dLCL$(LCL_PLATFORM)'); + P.Options.Add('-dLCL$(LCLWidgetType)'); P.Options.Add('-dAddStaticPkgs'); P.IncludePath.Add('include'); diff --git a/lcl/fpmake.pp b/lcl/fpmake.pp index eac0f8593d..c9c0caa492 100644 --- a/lcl/fpmake.pp +++ b/lcl/fpmake.pp @@ -3,7 +3,7 @@ fpmake.pp for LCLBase 1.3 - This file was generated on 29-12-2014 + This file was generated on 02-01-2015 } {$ifndef ALLPACKAGES} @@ -27,6 +27,8 @@ begin P.Directory:=ADirectory; + P.Flags.Add('LazarusDsgnPkg'); + P.Dependencies.Add('lazutils'); P.Options.Add('-MObjFPC'); P.Options.Add('-Scghi'); @@ -42,8 +44,6 @@ begin P.UnitPath.Add('forms'); P.UnitPath.Add('widgetset'); P.UnitPath.Add('nonwin32'); - P.UnitPath.Add('../packager/units/$(CPU_TARGET)-$(OS_TARGET)'); - P.UnitPath.Add('../components/lazutils/lib/$(CPU_TARGET)-$(OS_TARGET)'); P.UnitPath.Add('.'); T:=P.Targets.AddUnit('alllclunits.pp'); t.Dependencies.AddUnit('checklst'); diff --git a/packager/registration/fpmake.pp b/packager/registration/fpmake.pp index 222da1c76b..cdd28f4713 100644 --- a/packager/registration/fpmake.pp +++ b/packager/registration/fpmake.pp @@ -3,7 +3,7 @@ fpmake.pp for FCL 1.0.1 - This file was generated on 28-12-2014 + This file was generated on 02-01-2015 } {$ifndef ALLPACKAGES} @@ -27,6 +27,8 @@ begin P.Directory:=ADirectory; + P.Flags.Add('LazarusDsgnPkg'); + P.Options.Add('-MObjFPC'); P.Options.Add('-Scghi'); P.Options.Add('-O1');