pastojs: test precompile with -Jminclude

git-svn-id: trunk@39771 -
This commit is contained in:
Mattias Gaertner 2018-09-19 13:06:51 +00:00
parent 680f6c125b
commit ffc099be8a
2 changed files with 4 additions and 3 deletions

View File

@ -2235,7 +2235,7 @@ begin
for i:=0 to SrcMap.SourceCount-1 do begin
LocalFilename:=SrcMap.SourceFiles[i];
if LocalFilename='' then continue;
if SrcMapInclude then
if SrcMapInclude and DirectoryCache.FileExists(LocalFilename) then
begin
// include source in SrcMap
aFile:=FileCache.LoadFile(LocalFilename);
@ -2314,6 +2314,7 @@ var
SrcMap.Options:=SrcMap.Options+[smoSafetyHeader]
else
SrcMap.Options:=SrcMap.Options-[smoSafetyHeader];
SrcMap.Options:=SrcMap.Options+[smoAllowSrcLine0];
end;
end;

View File

@ -102,7 +102,7 @@ begin
Params.Assign(SharedParams);
if FirstRunParams<>nil then
Params.AddStrings(FirstRunParams);
Compile([MainFile,'-Jc','-Fu'+UnitPaths,'-JU'+PCUFormat.Ext,'-FU'+UnitOutputDir]);
Compile([MainFile,'-Jc','-Fu'+UnitPaths,'-JU'+PCUFormat.Ext,'-FU'+UnitOutputDir,'-Jminclude']);
AssertFileExists(UnitOutputDir+'/system.'+PCUFormat.Ext);
JSFilename:=UnitOutputDir+PathDelim+ExtractFilenameOnly(MainFile)+'.js';
AssertFileExists(JSFilename);
@ -119,7 +119,7 @@ begin
Params.Assign(SharedParams);
if SecondRunParams<>nil then
Params.AddStrings(SecondRunParams);
Compile([MainFile,'-Jc','-FU'+UnitOutputDir],ExpExitCode);
Compile([MainFile,'-Jc','-FU'+UnitOutputDir,'-Jminclude'],ExpExitCode);
if ExpExitCode=0 then
begin
NewSrc:=JSFile.Source;