From 0ece0126271534505918aa6d55eab2f902bb6bc1 Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 8 Apr 2019 20:50:26 +0000 Subject: [PATCH] pastojs: fixed writing workingdirectory --- compiler/packages/pastojs/src/pas2jsfilecache.pp | 2 +- compiler/packages/pastojs/src/pas2jsfs.pp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler/packages/pastojs/src/pas2jsfilecache.pp b/compiler/packages/pastojs/src/pas2jsfilecache.pp index 950c61f..2da0df2 100644 --- a/compiler/packages/pastojs/src/pas2jsfilecache.pp +++ b/compiler/packages/pastojs/src/pas2jsfilecache.pp @@ -1494,7 +1494,7 @@ procedure TPas2jsFilesCache.WriteFoldersAndSearchPaths; var i: Integer; begin - WriteFolder('working directory',GetCurrentDirPJ); + WriteFolder('working directory',BaseDirectory); for i:=0 to ForeignUnitPaths.Count-1 do WriteFolder('foreign unit path',ForeignUnitPaths[i]); for i:=0 to UnitPaths.Count-1 do diff --git a/compiler/packages/pastojs/src/pas2jsfs.pp b/compiler/packages/pastojs/src/pas2jsfs.pp index 357f3b7..37789b0 100644 --- a/compiler/packages/pastojs/src/pas2jsfs.pp +++ b/compiler/packages/pastojs/src/pas2jsfs.pp @@ -31,14 +31,15 @@ uses Classes, SysUtils, PScanner, fpjson; const // Messages + nUsingPath = 104; sUsingPath = 'Using %s: "%s"'; + nFolderNotFound = 105; sFolderNotFound = '%s not found: %s'; + nIncludeSearch = 201; sIncludeSearch = 'Include file search: %s'; nUnitSearch = 202; sUnitSearch = 'Unitsearch: %s'; nSearchingFileFound = 203; sSearchingFileFound = 'Searching file: %s... found'; nSearchingFileNotFound = 204; sSearchingFileNotFound = 'Searching file: %s... not found'; nDuplicateFileFound = 205; sDuplicateFileFound = 'Duplicate file found: "%s" and "%s"'; nCustomJSFileNotFound = 206; sCustomJSFileNotFound = 'custom JS file not found: "%s"'; - nUsingPath = 104; sUsingPath = 'Using %s: "%s"'; - nFolderNotFound = 105; sFolderNotFound = '%s not found: %s'; Type // Forward definitions