paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-08-18 01:39:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpmake build: fixed paths in pas2js.cfg

Browse Source
This commit is contained in:
mattias 2024-03-19 10:43:26 +01:00
parent cb0a0d36d3
commit 8f9f6dde1d
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fpmake.pp
View File

@ -63,15 +63,15 @@ Var
Procedure AddPath(const aPrefix,aDir,Suffix : String); Procedure AddPath(const aPrefix,aDir,Suffix : String);
var var
aSubDirs : String; aSubDir : String;
begin begin
aSubDirs:=aDir; aSubDir:=aDir;
if Suffix<>'' then if Suffix<>'' then
aSubDirs:=aSubDirs+'*'+PathDelim+Suffix; aSubDir:=aSubDir+Suffix;
if not FilenameIsAbsolute(aDir) then if not FilenameIsAbsolute(aDir) then
aSubDirs:='$CfgDir'+PathDelim+aSubDirs; aSubDir:='$CfgDir'+PathDelim+aSubDir;
Addln(aPrefix+aSubDirs); Addln(aPrefix+aSubDir);
end; end;
begin begin
@ -92,6 +92,7 @@ begin
end; end;
if (BaseDir<>'') then if (BaseDir<>'') then
BaseDir:=IncludeTrailingPathDelimiter(BaseDir); BaseDir:=IncludeTrailingPathDelimiter(BaseDir);
Addln('#'); Addln('#');
Addln('# Minimal config file for pas2js compiler'); Addln('# Minimal config file for pas2js compiler');
Addln('#'); Addln('#');
@ -179,7 +180,7 @@ Var
P : TPackage; P : TPackage;
UnitDir,DemoDir,BD, TmpCfg, TmpCfg2: String; UnitDir,DemoDir,BD, TmpCfg, TmpCfg2: String;
T: TTarget; T: TTarget;
FPCSrcDir, Pas2jsOFilename: String; FPCSrcDir, Pas2jsOFilename, RTLJSFilename: String;
begin begin
FPCSrcDir:=GetEnvironmentVariable('FPCDIR'); FPCSrcDir:=GetEnvironmentVariable('FPCDIR');
@ -277,9 +278,10 @@ begin
Case Installer.RunMode of Case Installer.RunMode of
rmCompile,rmBuild: rmCompile,rmBuild:
begin begin
RTLJSFilename:=SetDirSeparators(FPCSrcDir+'utils/pas2js/dist/');
RTLJSFilename:=ExtractRelativePath(ExpandFileName(BD),RTLJSFilename);
if not FileExists(BD+'pas2js.cfg') then if not FileExists(BD+'pas2js.cfg') then
CreateConfigFile(BD+'pas2js.cfg',SetDirSeparators('../../packages'), CreateConfigFile(BD+'pas2js.cfg',SetDirSeparators('../../packages'),RTLJSFilename);
SetDirSeparators(FPCSrcDir+'utils/pas2js/dist/'));
if not FileExists(BD+'pas2js-namespaced.cfg') then if not FileExists(BD+'pas2js-namespaced.cfg') then
CreateNameSpacedConfigFile(BD+'pas2js-namespaced.cfg'); CreateNameSpacedConfigFile(BD+'pas2js-namespaced.cfg');
end; end;
@ -293,7 +295,9 @@ begin
UnitDir:=UnitDir+'pas2js'+PathDelim; UnitDir:=UnitDir+'pas2js'+PathDelim;
// Config file // Config file
// Create config file // Create config file
CreateConfigFile(TmpCfg,ExtractRelativePath(IncludeTrailingPathDelimiter(Defaults.BinInstallDir),IncludeTrailingPathDelimiter(UnitDir))); CreateConfigFile(TmpCfg,
ExtractRelativePath(IncludeTrailingPathDelimiter(Defaults.BinInstallDir),
IncludeTrailingPathDelimiter(UnitDir)));
CreateNamespacedConfigFile(TmpCfg2); CreateNamespacedConfigFile(TmpCfg2);
P.InstallFiles.Add(TmpCfg,Defaults.BinInstallDir); P.InstallFiles.Add(TmpCfg,Defaults.BinInstallDir);
P.InstallFiles.Add(TmpCfg2,Defaults.BinInstallDir); P.InstallFiles.Add(TmpCfg2,Defaults.BinInstallDir);