pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

* Do not install Lazarus-package files in a path with the package-verion in it

Browse Source 
* Add the option to pass the location of a Lazarus-installation to the installer and add the lazarus-package to the default packages list of this Lazarus installation

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1373 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
Loesje_
2010-11-14 15:19:20 +00:00
parent 1c255f37a7
commit 0e67b948fb
1 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
components/geckoport/fpmake.pp
View File

@ -1,17 +1,26 @@
{$mode objfpc}{$H+} {$mode objfpc}{$H+}
program fpmake; program fpmake;
uses fpmkunit; uses fpmkunit, sysutils;
Var Var
P : TPackage; P : TPackage;
T : TTarget; T : TTarget;
InstallLazarusPackageDir : string;
LazarusDir : string;
LazPackagerFile : Text;
begin begin
AddCustomFpmakeCommandlineOption('lazarusdir','Location of a Lazarus installation.');
With Installer do With Installer do
begin begin
P:=AddPackage('gecko'); P:=AddPackage('gecko');
If Defaults.UnixPaths then
InstallLazarusPackageDir:=Defaults.Prefix+'share'+PathDelim+'fpc-'+p.Name
else
InstallLazarusPackageDir:=Defaults.BaseInstallDir+PathDelim+'fpc-'+p.Name;
P.Version:='0.9.0-1'; P.Version:='0.9.0-1';
P.OSes:=AllUnixOSes+[Win32,Win64]; P.OSes:=AllUnixOSes+[Win32,Win64];
P.Author := 'Takanori Ito'; P.Author := 'Takanori Ito';
@ -155,20 +164,29 @@ begin
P.Sources.AddExample('SampleApps/GBrowser.lpi','examples'); P.Sources.AddExample('SampleApps/GBrowser.lpi','examples');
P.Sources.AddExample('SampleApps/GBrowser.dpr','examples'); P.Sources.AddExample('SampleApps/GBrowser.dpr','examples');
P.Sources.AddDoc('Components/GeckoComponentsFP.lpk','lazaruspackage'); P.Sources.AddDoc('Components/GeckoComponentsFP.lpk',InstallLazarusPackageDir);
P.Sources.AddDoc('Components/BrowserSupports.pas','lazaruspackage'); P.Sources.AddDoc('Components/BrowserSupports.pas',InstallLazarusPackageDir);
P.Sources.AddDoc('Components/CallbackInterfaces.pas','lazaruspackage'); P.Sources.AddDoc('Components/CallbackInterfaces.pas',InstallLazarusPackageDir);
P.Sources.AddDoc('Components/GeckoBrowser.pas','lazaruspackage'); P.Sources.AddDoc('Components/GeckoBrowser.pas',InstallLazarusPackageDir);
P.Sources.AddDoc('Components/GeckoBrowser.lrs','lazaruspackage'); P.Sources.AddDoc('Components/GeckoBrowser.lrs',InstallLazarusPackageDir);
P.Sources.AddDoc('Components/GeckoChromeWindow.pas','lazaruspackage'); P.Sources.AddDoc('Components/GeckoChromeWindow.pas',InstallLazarusPackageDir);
P.Sources.AddDoc('Components/GeckoChromeWindow.lfm','lazaruspackage'); P.Sources.AddDoc('Components/GeckoChromeWindow.lfm',InstallLazarusPackageDir);
P.Sources.AddDoc('Components/GeckoChromeWindow.lrs','lazaruspackage'); P.Sources.AddDoc('Components/GeckoChromeWindow.lrs',InstallLazarusPackageDir);
P.Sources.AddDoc('Components/GeckoComponents.pas','lazaruspackage'); P.Sources.AddDoc('Components/GeckoComponents.pas',InstallLazarusPackageDir);
P.Sources.AddDoc('Components/GeckoDirectoryService.pas','lazaruspackage'); P.Sources.AddDoc('Components/GeckoDirectoryService.pas',InstallLazarusPackageDir);
P.Sources.AddDoc('Components/GeckoInit.pas','lazaruspackage'); P.Sources.AddDoc('Components/GeckoInit.pas',InstallLazarusPackageDir);
P.Sources.AddDoc('Components/GeckoSimpleProfile.pas','lazaruspackage'); P.Sources.AddDoc('Components/GeckoSimpleProfile.pas',InstallLazarusPackageDir);
Run; Run;
LazarusDir := GetCustomFpmakeCommandlineOptionValue('lazarusdir');
if LazarusDir <> '' then
begin
System.assign(LazPackagerFile,IncludeTrailingPathDelimiter(LazarusDir)+'packager'+PathDelim+'globallinks'+PathDelim+'GeckoComponentsFP-0.lpl');
System.Rewrite(LazPackagerFile);
System.WriteLn(LazPackagerFile,InstallLazarusPackageDir+PathDelim+'GeckoComponentsFP.lpk');
System.close(LazPackagerFile);
end;
end; end;
end. end.