forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

support for disabled string syntax in more project fields 

- import string paths, import module paths, extra sources.
- use ce_common funct to test if disabled
This commit is contained in:
Basile Burg 2015-09-05 22:42:19 +02:00
parent ac17c180e1
commit 0e10fade8d
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/ce_dmdwrap.pas
View File

@ -623,15 +623,8 @@ begin
if fAllInst then aList.Add('-allinst'); if fAllInst then aList.Add('-allinst');
if fAddMain then aList.Add('-main'); if fAddMain then aList.Add('-main');
if fRelease then aList.Add('-release'); if fRelease then aList.Add('-release');
for str in fVerIds do begin for str in fVerIds do
if length(str) > 0 then if not isStringDisabled(str) then aList.Add('-version=' + str);
if str[1] = ';' then
continue;
if length(str) > 1 then
if str[1..2] = '//' then
continue;
aList.Add('-version=' + str);
end;
// //
if fRelease then if fRelease then
begin begin
@ -905,6 +898,8 @@ begin
exts.AddStrings(['.d', '.di', '.dd']); exts.AddStrings(['.d', '.di', '.dd']);
for str in fExtraSrcs do for str in fExtraSrcs do
begin begin
if isStringDisabled(str) then
continue;
str := symbolExpander.get(str); str := symbolExpander.get(str);
if not listAsteriskPath(str, aList, exts) then if not listAsteriskPath(str, aList, exts) then
aList.Add(str); aList.Add(str);
@ -912,9 +907,9 @@ begin
finally finally
exts.Free; exts.Free;
end; end;
for str in fImpMod do for str in fImpMod do if not isStringDisabled(str) then
aList.Add('-I'+ symbolExpander.get(str)); aList.Add('-I'+ symbolExpander.get(str));
for str in fImpStr do for str in fImpStr do if not isStringDisabled(str) then
aList.Add('-J'+ symbolExpander.get(str)); aList.Add('-J'+ symbolExpander.get(str));
if fFname <> '' then if fFname <> '' then
aList.Add('-of' + symbolExpander.get(fFname)); aList.Add('-of' + symbolExpander.get(fFname));
@ -1030,11 +1025,7 @@ begin
begin begin
for str1 in fCustom do if str1 <> '' then for str1 in fCustom do if str1 <> '' then
begin begin
if length(str1) > 0 then if isStringDisabled(str1) then
if str1[1] = ';' then
continue;
if length(str1) > 1 then
if str1[1..2] = '//' then
continue; continue;
if str1[1] <> '-' then if str1[1] <> '-' then
str2 := '-' + str1 str2 := '-' + str1