* made maybequoted_for_script() public

* added script_fpcres identifier
  * always quote file names for fpcres using double quotes, as it doesn't
    support single quotes (mantis #26866)

git-svn-id: trunk@28881 -
This commit is contained in:
Jonas Maebe 2014-10-19 16:34:43 +00:00
parent 600d91c5b0
commit 00ea5e1636
3 changed files with 4 additions and 2 deletions

View File

@ -124,6 +124,7 @@ interface
function GetShortName(const n:TCmdStr):TCmdStr;
function maybequoted(const s:string):string;
function maybequoted(const s:ansistring):ansistring;
function maybequoted_for_script(const s:ansistring; quote_script: tscripttype):ansistring;
procedure InitFileUtils;
procedure DoneFileUtils;

View File

@ -377,7 +377,7 @@ procedure TWinLikeResourceFile.Collect(const fn: ansistring);
begin
if fResScript=nil then
fResScript:=TScript.Create(fScriptName);
fResScript.Add(MaybeQuoted(fn));
fResScript.Add(maybequoted_for_script(fn,script_fpcres));
inc(fCollectCount);
end;

View File

@ -273,7 +273,8 @@
tscripttype = (script_none
,script_dos,script_unix,script_amiga,
script_mpw
script_mpw,
script_fpcres
);
tabi = (abi_default