paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-04-05 19:27:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

make install do not overwrite pas2js.cfg in bin

Browse Source
This commit is contained in:
mattias 2019-03-03 13:22:08 +00:00
parent cde4475107
commit 35f8f4a67b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fpmake.pp
View File

@ -128,7 +128,7 @@ end;
Var
P : TPackage;
UnitDir,DemoDir,BD: String;
UnitDir,DemoDir,BD, TmpCfg: String;
begin
With Installer do
@ -195,6 +195,7 @@ begin
P.Targets.AddImplicitUnit('webidltopas',False).ResourceStrings:=True;
// Determine unit files location
BD:=IncludeTrailingPathDelimiter(P.GetBinOutputDir(Defaults.BuildCPU,Defaults.BuildOS));
TmpCfg:='compiler/utils/pas2js/dist/pas2js.cfg';
Case Installer.RunMode of
rmCompile,rmBuild:
begin
@ -212,8 +213,8 @@ begin
UnitDir:=UnitDir+'pas2js'+PathDelim;
// Config file
// Create config file
CreateConfigFile(BD+'pas2js.cfg',ExtractRelativePath(IncludeTrailingPathDelimiter(Defaults.BinInstallDir),IncludeTrailingPathDelimiter(UnitDir)));
P.InstallFiles.Add(BD+'pas2js.cfg',Defaults.BinInstallDir);
CreateConfigFile(TmpCfg,ExtractRelativePath(IncludeTrailingPathDelimiter(Defaults.BinInstallDir),IncludeTrailingPathDelimiter(UnitDir)));
P.InstallFiles.Add(TmpCfg,Defaults.BinInstallDir);
P.InstallFiles.Add('compiler/utils/pas2js/dist/rtl.js',IncludeTrailingPathDelimiter(UnitDir)+'rtl');
AddPackageFiles(P.InstallFiles,'chartjs',UnitDir);
AddPackageFiles(P.InstallFiles,'dataabstract',UnitDir);
@ -232,6 +233,8 @@ begin
AddDemoFiles(P.InstallFiles,'jquery',DemoDir);
AddDemoFiles(P.InstallFiles,'rtl',DemoDir);
end;
rmClean:
P.CleanFiles.Add(TmpCfg);
rmDistClean:
if FileExists(BD+'pas2js.cfg') then
P.CleanFiles.Add(BD+'pas2js.cfg');