diff options
| author | mattias <mattias@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2019-04-08 14:58:15 +0000 |
|---|---|---|
| committer | mattias <mattias@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2019-04-08 14:58:15 +0000 |
| commit | af9faf63ea2d379c8c67ce217890ae4bb6268860 (patch) | |
| tree | 9876c695143e06312eb97fc93eb5e903dc291883 | |
| parent | 6d2688ccd798fae47516005ba2bb64262a50bcef (diff) | |
| download | fpc-af9faf63ea2d379c8c67ce217890ae4bb6268860.tar.gz | |
pastojs: fixed writing workingdirectory
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@41850 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | packages/pastojs/src/pas2jsfilecache.pp | 2 | ||||
| -rw-r--r-- | packages/pastojs/src/pas2jsfs.pp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/pastojs/src/pas2jsfilecache.pp b/packages/pastojs/src/pas2jsfilecache.pp index 950c61f7a9..2da0df21ec 100644 --- a/packages/pastojs/src/pas2jsfilecache.pp +++ b/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/packages/pastojs/src/pas2jsfs.pp b/packages/pastojs/src/pas2jsfs.pp index 357f3b717d..37789b0498 100644 --- a/packages/pastojs/src/pas2jsfs.pp +++ b/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 |