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

fix, new DUB project considered modified + rename units related to CE prj format 

+ move compiler selection for DUB projects to DUB options + cleanup options
This commit is contained in:
Basile Burg 2016-10-16 18:06:43 +02:00
parent cc08f18696
commit 82693baa1d
No known key found for this signature in database
GPG Key ID: 1868039F415CB8CF
19 changed files with 101 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lazproj/coedit.lpi
View File

@ -349,14 +349,14 @@
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
</Unit20> </Unit20>
<Unit21> <Unit21>
<Filename Value="..\src\ce_projconf.pas"/> <Filename Value="..\src\ce_ceprojeditor.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ComponentName Value="CEProjectConfigurationWidget"/> <ComponentName Value="CEProjectConfigurationWidget"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
</Unit21> </Unit21>
<Unit22> <Unit22>
<Filename Value="..\src\ce_nativeproject.pas"/> <Filename Value="..\src\ce_ceproject.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit22> </Unit22>
<Unit23> <Unit23>

44
src/ce_nativeproject.pas → src/ce_ceproject.pas
View File

@ -1,4 +1,4 @@
unit ce_nativeproject; unit ce_ceproject;
{$I ce_defines.inc} {$I ce_defines.inc}
@ -132,8 +132,8 @@ type
// native project have no ext constraint, this function tells if filename is project // native project have no ext constraint, this function tells if filename is project
function isValidNativeProject(const filename: string): boolean; function isValidNativeProject(const filename: string): boolean;
function getNativeProjectCompiler: TCECompiler; function getCEProjectCompiler: TCECompiler;
procedure setNativeProjectCompiler(value: TCECompiler); procedure setCEProjectCompiler(value: TCECompiler);
implementation implementation
@ -141,8 +141,8 @@ uses
controls, dialogs, ce_libman, ce_dcd; controls, dialogs, ce_libman, ce_dcd;
var var
NativeProjectCompilerFilename: string = 'dmd'; CEProjectCompilerFilename: string = 'dmd';
NativeProjectCompiler: TCECompiler; CEProjectCompiler: TCECompiler;
constructor TCENativeProject.create(aOwner: TComponent); constructor TCENativeProject.create(aOwner: TComponent);
begin begin
@ -203,7 +203,7 @@ end;
function TCENativeProject.getFormat: TCEProjectFormat; function TCENativeProject.getFormat: TCEProjectFormat;
begin begin
exit(pfNative); exit(pfCE);
end; end;
function TCENativeProject.getProject: TObject; function TCENativeProject.getProject: TObject;
@ -471,12 +471,12 @@ begin
begin begin
conf.getOpts(list, fBaseConfig); conf.getOpts(list, fBaseConfig);
conf.otherOptions.getCompilerSpecificOpts(list, fBaseConfig.otherOptions, conf.otherOptions.getCompilerSpecificOpts(list, fBaseConfig.otherOptions,
NativeProjectCompiler); CEProjectCompiler);
end end
else else
begin begin
conf.getOpts(list); conf.getOpts(list);
conf.otherOptions.getCompilerSpecificOpts(list, nil, NativeProjectCompiler); conf.otherOptions.getCompilerSpecificOpts(list, nil, CEProjectCompiler);
end; end;
finally finally
exc.Free; exc.Free;
@ -783,14 +783,14 @@ begin
// this doesn't work under linux, so the previous ChDir. // this doesn't work under linux, so the previous ChDir.
if prjpath.dirExists then if prjpath.dirExists then
fCompilProc.CurrentDirectory := prjpath; fCompilProc.CurrentDirectory := prjpath;
fCompilProc.Executable := NativeProjectCompilerFilename; fCompilProc.Executable := CEProjectCompilerFilename;
fCompilProc.Options := fCompilProc.Options + [poStderrToOutPut, poUsePipes]; fCompilProc.Options := fCompilProc.Options + [poStderrToOutPut, poUsePipes];
fCompilProc.ShowWindow := swoHIDE; fCompilProc.ShowWindow := swoHIDE;
fCompilProc.OnReadData:= @compProcOutput; fCompilProc.OnReadData:= @compProcOutput;
fCompilProc.OnTerminate:= @compProcTerminated; fCompilProc.OnTerminate:= @compProcTerminated;
getOpts(fCompilProc.Parameters); getOpts(fCompilProc.Parameters);
//getUpToDateObjects(fCompilProc.Parameters); //getUpToDateObjects(fCompilProc.Parameters);
if NativeProjectCompiler = gdc then if CEProjectCompiler = gdc then
fCompilProc.Parameters.Add('-gdc=gdc'); fCompilProc.Parameters.Add('-gdc=gdc');
fCompilProc.Execute; fCompilProc.Execute;
end; end;
@ -1016,7 +1016,7 @@ var
begin begin
str := TStringList.Create; str := TStringList.Create;
try try
str.Add(NativeProjectCompilerFilename.extractFileName); str.Add(CEProjectCompilerFilename.extractFileName);
getOpts(str); getOpts(str);
result := str.Text; result := str.Text;
finally finally
@ -1076,28 +1076,28 @@ begin
end; end;
end; end;
function getNativeProjectCompiler: TCECompiler; function getCEProjectCompiler: TCECompiler;
begin begin
exit(NativeProjectCompiler); exit(CEProjectCompiler);
end; end;
procedure setNativeProjectCompiler(value: TCECompiler); procedure setCEProjectCompiler(value: TCECompiler);
begin begin
case value of case value of
dmd: NativeProjectCompilerFilename := exeFullName('dmd' + exeExt); dmd: CEProjectCompilerFilename := exeFullName('dmd' + exeExt);
gdc: NativeProjectCompilerFilename := exeFullName('gdmd' + exeExt); gdc: CEProjectCompilerFilename := exeFullName('gdmd' + exeExt);
ldc: NativeProjectCompilerFilename := exeFullName('ldmd2' + exeExt); ldc: CEProjectCompilerFilename := exeFullName('ldmd2' + exeExt);
end; end;
if (not NativeProjectCompilerFilename.fileExists) if (not CEProjectCompilerFilename.fileExists)
or NativeProjectCompilerFilename.isEmpty then or CEProjectCompilerFilename.isEmpty then
begin begin
value := dmd; value := dmd;
NativeProjectCompilerFilename:= 'dmd' + exeExt; CEProjectCompilerFilename:= 'dmd' + exeExt;
end; end;
NativeProjectCompiler := value; CEProjectCompiler := value;
end; end;
initialization initialization
setNativeProjectCompiler(dmd); setCEProjectCompiler(dmd);
RegisterClasses([TCENativeProject]); RegisterClasses([TCENativeProject]);
end. end.

2
src/ce_projconf.lfm → src/ce_ceprojeditor.lfm
View File

@ -3,7 +3,7 @@ inherited CEProjectConfigurationWidget: TCEProjectConfigurationWidget
Height = 273 Height = 273
Top = 349 Top = 349
Width = 445 Width = 445
Caption = 'Native project configuration' Caption = ' CE project editor'
ClientHeight = 273 ClientHeight = 273
ClientWidth = 445 ClientWidth = 445
inherited Back: TPanel inherited Back: TPanel

8
src/ce_projconf.pas → src/ce_ceprojeditor.pas
View File

@ -1,4 +1,4 @@
unit ce_projconf; unit ce_ceprojeditor;
{$I ce_defines.inc} {$I ce_defines.inc}
@ -7,7 +7,7 @@ interface
uses uses
Classes, SysUtils, FileUtil, RTTIGrids, RTTICtrls, Forms, Controls, Graphics, Classes, SysUtils, FileUtil, RTTIGrids, RTTICtrls, Forms, Controls, Graphics,
Dialogs, ExtCtrls, ComCtrls, StdCtrls, Menus, Buttons, rttiutils, typinfo, Dialogs, ExtCtrls, ComCtrls, StdCtrls, Menus, Buttons, rttiutils, typinfo,
PropEdits, ObjectInspector, ce_dmdwrap, ce_nativeproject, ce_widget, PropEdits, ObjectInspector, ce_dmdwrap, ce_ceproject, ce_widget,
ce_interfaces, ce_observer, ce_sharedres, ce_common, ce_dsgncontrols; ce_interfaces, ce_observer, ce_sharedres, ce_common, ce_dsgncontrols;
type type
@ -96,7 +96,7 @@ procedure TCEProjectConfigurationWidget.projNew(project: ICECommonProject);
begin begin
fProj := nil; fProj := nil;
enabled := false; enabled := false;
if project.getFormat <> pfNative then if project.getFormat <> pfCE then
exit; exit;
enabled := true; enabled := true;
// //
@ -130,7 +130,7 @@ procedure TCEProjectConfigurationWidget.projFocused(project: ICECommonProject);
begin begin
fProj := nil; fProj := nil;
enabled := false; enabled := false;
if project.getFormat <> pfNative then if project.getFormat <> pfCE then
exit; exit;
enabled := true; enabled := true;
// //

23
src/ce_dubproject.pas
View File

@ -27,8 +27,12 @@ type
fCombined: boolean; fCombined: boolean;
fDepCheck: TDubDependencyCheck; fDepCheck: TDubDependencyCheck;
fOther: string; fOther: string;
fCompiler: TCECompiler;
procedure setLinkMode(value: TDubLinkMode); procedure setLinkMode(value: TDubLinkMode);
procedure setCompiler(value: TCECompiler);
function getCompiler: TCECompiler;
published published
property compiler: TCECOmpiler read getCompiler write setCompiler;
property parallel: boolean read fParallel write fParallel; property parallel: boolean read fParallel write fParallel;
property forceRebuild: boolean read fForceRebuild write fForceRebuild; property forceRebuild: boolean read fForceRebuild write fForceRebuild;
property linkMode: TDubLinkMode read fLinkMode write setLinkMode; property linkMode: TDubLinkMode read fLinkMode write setLinkMode;
@ -184,6 +188,17 @@ begin
fLinkMode:=value; fLinkMode:=value;
end; end;
procedure TCEDubBuildOptionsBase.setCompiler(value: TCECompiler);
begin
fCompiler := value;
setDubCompiler(fCompiler);
end;
function TCEDubBuildOptionsBase.getCompiler: TCECompiler;
begin
result := fCompiler;
end;
procedure TCEDubBuildOptionsBase.assign(source: TPersistent); procedure TCEDubBuildOptionsBase.assign(source: TPersistent);
var var
opts: TCEDubBuildOptionsBase; opts: TCEDubBuildOptionsBase;
@ -197,6 +212,7 @@ begin
linkMode:=opts.linkMode; linkMode:=opts.linkMode;
other:=opts.other; other:=opts.other;
dependenciesCheck:=opts.dependenciesCheck; dependenciesCheck:=opts.dependenciesCheck;
compiler:=opts.compiler;
end end
else inherited; else inherited;
end; end;
@ -289,8 +305,11 @@ begin
fConfigs.Duplicates:=TDuplicates.dupIgnore; fConfigs.Duplicates:=TDuplicates.dupIgnore;
fBuildTypes.Duplicates:=TDuplicates.dupIgnore; fBuildTypes.Duplicates:=TDuplicates.dupIgnore;
// //
json.Add('name', '');
endModification;
subjProjNew(fProjectSubject, self); subjProjNew(fProjectSubject, self);
subjProjChanged(fProjectSubject, self); doModified;
fModified:=false;
end; end;
destructor TCEDubProject.destroy; destructor TCEDubProject.destroy;
@ -327,7 +346,7 @@ end;
function TCEDubProject.getFormat: TCEProjectFormat; function TCEDubProject.getFormat: TCEProjectFormat;
begin begin
exit(pfDub); exit(pfDUB);
end; end;
function TCEDubProject.getProject: TObject; function TCEDubProject.getProject: TObject;

2
src/ce_dubprojeditor.lfm
View File

@ -3,7 +3,7 @@ inherited CEDubProjectEditorWidget: TCEDubProjectEditorWidget
Height = 424 Height = 424
Top = 245 Top = 245
Width = 402 Width = 402
Caption = 'Dub project editor' Caption = 'DUB project editor'
ClientHeight = 424 ClientHeight = 424
ClientWidth = 402 ClientWidth = 402
inherited Back: TPanel inherited Back: TPanel

4
src/ce_dubprojeditor.pas
View File

@ -251,7 +251,7 @@ procedure TCEDubProjectEditorWidget.projNew(project: ICECommonProject);
begin begin
fProj := nil; fProj := nil;
enabled := false; enabled := false;
if project.getFormat <> pfDub then if project.getFormat <> pfDUB then
exit; exit;
enabled := true; enabled := true;
fProj := TCEDubProject(project.getProject); fProj := TCEDubProject(project.getProject);
@ -285,7 +285,7 @@ procedure TCEDubProjectEditorWidget.projFocused(project: ICECommonProject);
begin begin
fProj := nil; fProj := nil;
enabled := false; enabled := false;
if project.getFormat <> pfDub then if project.getFormat <> pfDUB then
begin begin
updateEditor; updateEditor;
exit; exit;

2
src/ce_editor.pas
View File

@ -493,7 +493,7 @@ begin
fDoc.loadFromFile(fname); fDoc.loadFromFile(fname);
if assigned(fProj) and (fProj.filename = fDoc.fileName) then if assigned(fProj) and (fProj.filename = fDoc.fileName) then
begin begin
if fProj.getFormat = pfNative then if fProj.getFormat = pfCE then
fDoc.Highlighter := LfmSyn fDoc.Highlighter := LfmSyn
else else
fDoc.Highlighter := JsSyn; fDoc.Highlighter := JsSyn;

2
src/ce_interfaces.pas
View File

@ -11,7 +11,7 @@ uses
type type
// describes the project kind. Used as a hint to cast ICECommonProject.getProject() // describes the project kind. Used as a hint to cast ICECommonProject.getProject()
TCEProjectFormat = (pfNative, pfDub); TCEProjectFormat = (pfCE, pfDUB);
// describes the binary kind produces when compiling a project // describes the binary kind produces when compiling a project
TProjectBinaryKind = (executable, staticlib, sharedlib, obj); TProjectBinaryKind = (executable, staticlib, sharedlib, obj);

2
src/ce_lcldragdrop.pas
View File

@ -6,7 +6,7 @@ interface
uses uses
Classes, SysUtils, Controls, ComCtrls, Classes, SysUtils, Controls, ComCtrls,
ce_common, ce_nativeproject, ce_dubproject, ce_interfaces, ce_common, ce_ceproject, ce_dubproject, ce_interfaces,
ce_dialogs, ce_projutils; ce_dialogs, ce_projutils;
type type

2
src/ce_libmaneditor.pas
View File

@ -8,7 +8,7 @@ uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
Menus, ComCtrls, Buttons, LazFileUtils, strutils, fphttpclient, StdCtrls, Menus, ComCtrls, Buttons, LazFileUtils, strutils, fphttpclient, StdCtrls,
xfpjson, xjsonparser, xfpjson, xjsonparser,
ce_widget, ce_interfaces, ce_nativeproject, ce_dmdwrap, ce_common, ce_dialogs, ce_widget, ce_interfaces, ce_ceproject, ce_dmdwrap, ce_common, ce_dialogs,
ce_sharedres, process, ce_dubproject, ce_observer, ce_dlang, ce_libman, ce_sharedres, process, ce_dubproject, ce_observer, ce_dlang, ce_libman,
ce_projutils, ce_dsgncontrols; ce_projutils, ce_dsgncontrols;

88
src/ce_main.pas
View File

@ -10,8 +10,8 @@ uses
Graphics, strutils, Dialogs, Menus, ActnList, ExtCtrls, process, Graphics, strutils, Dialogs, Menus, ActnList, ExtCtrls, process,
{$IFDEF WINDOWS}Windows, {$ENDIF} XMLPropStorage, SynExportHTML, fphttpclient, {$IFDEF WINDOWS}Windows, {$ENDIF} XMLPropStorage, SynExportHTML, fphttpclient,
xfpjson, xjsonparser, xjsonscanner, xfpjson, xjsonparser, xjsonscanner,
ce_common, ce_dmdwrap, ce_nativeproject, ce_synmemo, ce_writableComponent, ce_common, ce_dmdwrap, ce_ceproject, ce_synmemo, ce_writableComponent,
ce_widget, ce_messages, ce_interfaces, ce_editor, ce_projinspect, ce_projconf, ce_widget, ce_messages, ce_interfaces, ce_editor, ce_projinspect, ce_ceprojeditor,
ce_search, ce_miniexplorer, ce_libman, ce_libmaneditor, ce_todolist, ce_observer, ce_search, ce_miniexplorer, ce_libman, ce_libmaneditor, ce_todolist, ce_observer,
ce_toolseditor, ce_procinput, ce_optionseditor, ce_symlist, ce_mru, ce_processes, ce_toolseditor, ce_procinput, ce_optionseditor, ce_symlist, ce_mru, ce_processes,
ce_infos, ce_dubproject, ce_dialogs, ce_dubprojeditor,{$IFDEF UNIX} ce_gdb,{$ENDIF} ce_infos, ce_dubproject, ce_dialogs, ce_dubprojeditor,{$IFDEF UNIX} ce_gdb,{$ENDIF}
@ -328,7 +328,6 @@ type
private private
fRunnablesOptions: TCEEditableRunnableOptions; fRunnablesOptions: TCEEditableRunnableOptions;
fRunnableCompiler: TCECompiler;
fSymStringExpander: ICESymStringExpander; fSymStringExpander: ICESymStringExpander;
fProjectGroup: ICEProjectGroup; fProjectGroup: ICEProjectGroup;
fCovModUt: boolean; fCovModUt: boolean;
@ -537,8 +536,6 @@ type
fMaxRecentDocs: integer; fMaxRecentDocs: integer;
fMaxRecentGroups: integer; fMaxRecentGroups: integer;
fDcdPort: word; fDcdPort: word;
fRunnableDest: TCEPathname;
fAlwaysUseDest: boolean;
fDscanUnittests: boolean; fDscanUnittests: boolean;
fAutoSaveProjectFiles: boolean; fAutoSaveProjectFiles: boolean;
fFlatLook: boolean; fFlatLook: boolean;
@ -547,13 +544,8 @@ type
fShowBuildDuration: boolean; fShowBuildDuration: boolean;
function getAdditionalPATH: string; function getAdditionalPATH: string;
procedure setAdditionalPATH(const value: string); procedure setAdditionalPATH(const value: string);
function getDubCompiler: TCECompiler;
procedure setDubCompiler(value: TCECompiler);
function getRunnableCompiler: TCECompiler;
procedure setRunnableCompiler(value: TCECompiler);
function getNativeProjecCompiler: TCECompiler; function getNativeProjecCompiler: TCECompiler;
procedure setNativeProjecCompiler(value: TCECompiler); procedure setNativeProjecCompiler(value: TCECompiler);
procedure setRunnableDestination(const value: TCEPathname);
procedure setSplitterScsrollSpeed(value: byte); procedure setSplitterScsrollSpeed(value: byte);
published published
property additionalPATH: string read getAdditionalPATH write setAdditionalPath; property additionalPATH: string read getAdditionalPATH write setAdditionalPath;
@ -564,21 +556,14 @@ type
property maxRecentProjects: integer read fMaxRecentProjs write fMaxRecentProjs; property maxRecentProjects: integer read fMaxRecentProjs write fMaxRecentProjs;
property maxRecentDocuments: integer read fMaxRecentDocs write fMaxRecentDocs; property maxRecentDocuments: integer read fMaxRecentDocs write fMaxRecentDocs;
property maxRecentProjectsGroups: integer read fMaxRecentGroups write fMaxRecentGroups; property maxRecentProjectsGroups: integer read fMaxRecentGroups write fMaxRecentGroups;
property dubCompiler: TCECompiler read getDubCompiler write setDubCompiler;
property nativeProjectCompiler: TCECompiler read getNativeProjecCompiler write setNativeProjecCompiler; property nativeProjectCompiler: TCECompiler read getNativeProjecCompiler write setNativeProjecCompiler;
property dscanUnittests: boolean read fDscanUnittests write fDscanUnittests default true; property dscanUnittests: boolean read fDscanUnittests write fDscanUnittests default true;
property autoSaveProjectFiles: boolean read fAutoSaveProjectFiles write fAutoSaveProjectFiles default false; property autoSaveProjectFiles: boolean read fAutoSaveProjectFiles write fAutoSaveProjectFiles default false;
property flatLook: boolean read fFlatLook write fFlatLook; property flatLook: boolean read fFlatLook write fFlatLook;
property splitterScrollSpeed: byte read fSplitterScrollSpeed write setSplitterScsrollSpeed; property splitterScrollSpeed: byte read fSplitterScrollSpeed write setSplitterScsrollSpeed;
property showBuildDuration: boolean read fShowBuildDuration write fShowBuildDuration default false; property showBuildDuration: boolean read fShowBuildDuration write fShowBuildDuration default false;
// published for ICEEditableOptions but stored by DCD wrapper since it reloads before CEMainForm // published for ICEEditableOptions but stored by DCD wrapper since it reloads before CEMainForm
property dcdPort: word read fDcdPort write fDcdPort stored false; property dcdPort: word read fDcdPort write fDcdPort stored false;
// TODO-cmaintenance: remove this property from version 3 update 1
property nativeProjecCompiler: TCECompiler read getNativeProjecCompiler write setNativeProjecCompiler stored false; deprecated;
property runnableDestination: TCEPathname read fRunnableDest write setRunnableDestination stored false; deprecated;
property runnableDestinationAlways: boolean read fAlwaysUseDest write fAlwaysUseDest stored false; deprecated;
end; end;
TCEApplicationOptions = class(TCEApplicationOptionsBase, ICEEditableOptions) TCEApplicationOptions = class(TCEApplicationOptionsBase, ICEEditableOptions)
@ -775,48 +760,14 @@ begin
fFlatLook:=true; fFlatLook:=true;
end; end;
function TCEApplicationOptionsBase.getDubCompiler: TCECompiler;
begin
exit(ce_dubproject.getDubCompiler);
end;
function TCEApplicationOptionsBase.getNativeProjecCompiler: TCECompiler; function TCEApplicationOptionsBase.getNativeProjecCompiler: TCECompiler;
begin begin
exit(ce_nativeproject.getNativeProjectCompiler); exit(ce_ceproject.getCEProjectCompiler);
end;
procedure TCEApplicationOptionsBase.setDubCompiler(value: TCECompiler);
begin
ce_dubproject.setDubCompiler(value);
end; end;
procedure TCEApplicationOptionsBase.setNativeProjecCompiler(value: TCECompiler); procedure TCEApplicationOptionsBase.setNativeProjecCompiler(value: TCECompiler);
begin begin
ce_nativeproject.setNativeProjectCompiler(value); ce_ceproject.setCEProjectCompiler(value);
end;
function TCEApplicationOptionsBase.getRunnableCompiler: TCECompiler;
begin
exit(CEMainForm.fRunnableCompiler);
end;
procedure TCEApplicationOptionsBase.setRunnableCompiler(value: TCECompiler);
begin
case value of
ldc: if not exeInSysPath('ldmd2' + exeExt) then
value := dmd;
gdc: if not exeInSysPath('gdmd' + exeExt) then
value := dmd;
end;
CEMainForm.fRunnableCompiler:=value;
end;
procedure TCEApplicationOptionsBase.setRunnableDestination(const value: TCEPathname);
begin
fRunnableDest := value;
if (length(fRunnableDest) > 0)
and (fRunnableDest[length(fRunnableDest)] <> DirectorySeparator) then
fRunnableDest += DirectorySeparator;
end; end;
procedure TCEApplicationOptionsBase.setSplitterScsrollSpeed(value: byte); procedure TCEApplicationOptionsBase.setSplitterScsrollSpeed(value: byte);
@ -884,7 +835,6 @@ begin
fFlatLook:=fBackup.fFlatLook; fFlatLook:=fBackup.fFlatLook;
fAutoCheckUpdates:= fBackup.fAutoCheckUpdates; fAutoCheckUpdates:= fBackup.fAutoCheckUpdates;
CEMainForm.fDscanUnittests := fDscanUnittests; CEMainForm.fDscanUnittests := fDscanUnittests;
dubCompiler:= fBackup.dubCompiler;
nativeProjectCompiler:= fBackup.nativeProjectCompiler; nativeProjectCompiler:= fBackup.nativeProjectCompiler;
end end
else inherited; else inherited;
@ -919,7 +869,6 @@ begin
fBackup.fFlatLook:= fFlatLook; fBackup.fFlatLook:= fFlatLook;
fBackup.fAutoCheckUpdates:= fAutoCheckUpdates; fBackup.fAutoCheckUpdates:= fAutoCheckUpdates;
fBackup.fShowBuildDuration:= fShowBuildDuration; fBackup.fShowBuildDuration:= fShowBuildDuration;
fBackup.dubCompiler:= dubCompiler;
fBackup.nativeProjectCompiler:= nativeProjectCompiler; fBackup.nativeProjectCompiler:= nativeProjectCompiler;
end end
else inherited; else inherited;
@ -1010,7 +959,7 @@ begin
if assigned(hdl) then if assigned(hdl) then
mem := hdl.findDocument(dst.fProject.filename); mem := hdl.findDocument(dst.fProject.filename);
if mem.isNotNil then if mem.isNotNil then
if dst.fProject.getFormat = pfNative then if dst.fProject.getFormat = pfCE then
mem.Highlighter := LfmSyn mem.Highlighter := LfmSyn
else else
mem.Highlighter := JsSyn; mem.Highlighter := JsSyn;
@ -1996,8 +1945,8 @@ procedure TCEMainForm.projNew(project: ICECommonProject);
begin begin
fProject := project; fProject := project;
case fProject.getFormat of case fProject.getFormat of
pfNative: fNativeProject := TCENativeProject(fProject.getProject); pfCE: fNativeProject := TCENativeProject(fProject.getProject);
pfDub: fDubProject := TCEDubProject(fProject.getProject); pfDUB: fDubProject := TCEDubProject(fProject.getProject);
end; end;
if not fProject.inGroup then if not fProject.inGroup then
fFreeProj := project; fFreeProj := project;
@ -2024,8 +1973,8 @@ procedure TCEMainForm.projFocused(project: ICECommonProject);
begin begin
fProject := project; fProject := project;
case fProject.getFormat of case fProject.getFormat of
pfNative: fNativeProject := TCENativeProject(fProject.getProject); pfCE: fNativeProject := TCENativeProject(fProject.getProject);
pfDub: fDubProject := TCEDubProject(fProject.getProject); pfDUB: fDubProject := TCEDubProject(fProject.getProject);
end; end;
if not fProject.inGroup then if not fProject.inGroup then
fFreeProj := project fFreeProj := project
@ -2326,7 +2275,7 @@ begin
if fProject = nil then exit; if fProject = nil then exit;
if fProject.filename = fDoc.fileName then exit; if fProject.filename = fDoc.fileName then exit;
// //
if fProject.getFormat = pfNative then if fProject.getFormat = pfCE then
begin begin
if fDoc.fileName.fileExists and not fDoc.isTemporary then if fDoc.fileName.fileExists and not fDoc.isTemporary then
fNativeProject.addSource(fDoc.fileName) fNativeProject.addSource(fDoc.fileName)
@ -3014,7 +2963,7 @@ begin
fCompStart := Time; fCompStart := Time;
fProject.compile; fProject.compile;
end; end;
if fProject.outputFilename.fileExists or (fProject.getFormat = pfDub) then if fProject.outputFilename.fileExists or (fProject.getFormat = pfDUB) then
fProject.run; fProject.run;
end; end;
@ -3265,9 +3214,6 @@ end;
procedure TCEMainForm.newDubProj; procedure TCEMainForm.newDubProj;
begin begin
fDubProject := TCEDubProject.create(nil); fDubProject := TCEDubProject.create(nil);
fDubProject.json.Add('name', '');
fDubProject.beginModification;
fDubProject.endModification;
fProject := fDubProject as ICECommonProject; fProject := fDubProject as ICECommonProject;
showProjTitle; showProjTitle;
end; end;
@ -3331,7 +3277,7 @@ procedure TCEMainForm.actProjSaveAsExecute(Sender: TObject);
begin begin
if checkProjectLock then if checkProjectLock then
exit; exit;
if (fProject.getFormat = pfDub) and TCEDubProject(fProject.getProject).isSDL then if (fProject.getFormat = pfDUB) and TCEDubProject(fProject.getProject).isSDL then
begin begin
fMsgs.message(DubSdlWarning, fProject, amcProj, amkWarn); fMsgs.message(DubSdlWarning, fProject, amcProj, amkWarn);
exit; exit;
@ -3347,7 +3293,7 @@ end;
procedure TCEMainForm.actProjSaveExecute(Sender: TObject); procedure TCEMainForm.actProjSaveExecute(Sender: TObject);
begin begin
if fProject = nil then exit; if fProject = nil then exit;
if (fProject.getFormat = pfDub) and TCEDubProject(fProject.getProject).isSDL then if (fProject.getFormat = pfDUB) and TCEDubProject(fProject.getProject).isSDL then
begin begin
fMsgs.message(DubSdlWarning, fProject, amcProj, amkWarn); fMsgs.message(DubSdlWarning, fProject, amcProj, amkWarn);
exit; exit;
@ -3377,8 +3323,8 @@ var
win: TControl = nil; win: TControl = nil;
begin begin
if assigned(fProject) then case fProject.getFormat of if assigned(fProject) then case fProject.getFormat of
pfDub: win := DockMaster.GetAnchorSite(fDubProjWidg); pfDUB: win := DockMaster.GetAnchorSite(fDubProjWidg);
pfNative: win := DockMaster.GetAnchorSite(fPrjCfWidg); pfCE: win := DockMaster.GetAnchorSite(fPrjCfWidg);
end end
else win := DockMaster.GetAnchorSite(fPrjCfWidg); else win := DockMaster.GetAnchorSite(fPrjCfWidg);
if win.isNotNil then if win.isNotNil then
@ -3392,7 +3338,7 @@ procedure TCEMainForm.actProjSourceExecute(Sender: TObject);
begin begin
if fProject = nil then exit; if fProject = nil then exit;
if not fProject.filename.fileExists then exit; if not fProject.filename.fileExists then exit;
if (fProject.getFormat = pfDub) and TCEDubProject(fProject.getProject).isSDL then if (fProject.getFormat = pfDUB) and TCEDubProject(fProject.getProject).isSDL then
begin begin
fMsgs.message(DubSdlWarning, fProject, amcProj, amkWarn); fMsgs.message(DubSdlWarning, fProject, amcProj, amkWarn);
exit; exit;
@ -3400,7 +3346,7 @@ begin
// //
openFile(fProject.filename); openFile(fProject.filename);
fDoc.isProjectDescription := true; fDoc.isProjectDescription := true;
if fProject.getFormat = pfNative then if fProject.getFormat = pfCE then
fDoc.Highlighter := LfmSyn fDoc.Highlighter := LfmSyn
else else
fDoc.Highlighter := JsSyn; fDoc.Highlighter := JsSyn;

2
src/ce_miniexplorer.pas
View File

@ -8,7 +8,7 @@ uses
Classes, SysUtils, FileUtil, ListFilterEdit, Forms, Controls, Graphics, Classes, SysUtils, FileUtil, ListFilterEdit, Forms, Controls, Graphics,
ExtCtrls, Menus, ComCtrls, Buttons, lcltype, strutils, ce_widget, ce_sharedres, ExtCtrls, Menus, ComCtrls, Buttons, lcltype, strutils, ce_widget, ce_sharedres,
ce_common, ce_interfaces, ce_observer, ce_writableComponent, ce_dubproject, ce_common, ce_interfaces, ce_observer, ce_writableComponent, ce_dubproject,
ce_nativeproject, EditBtn, ce_dialogs, ce_synmemo, ce_projutils, ce_dsgncontrols; ce_ceproject, EditBtn, ce_dialogs, ce_synmemo, ce_projutils, ce_dsgncontrols;
type type

4
src/ce_mru.pas
View File

@ -5,8 +5,8 @@ unit ce_mru;
interface interface
uses uses
Classes, SysUtils, ce_interfaces, ce_observer, Classes, SysUtils,
ce_nativeproject, ce_synmemo, ce_common; ce_interfaces, ce_observer, ce_synmemo, ce_common;
type type

18
src/ce_projgroup.pas
View File

@ -7,7 +7,7 @@ uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, ExtCtrls, Menus, Classes, SysUtils, FileUtil, Forms, Controls, Graphics, ExtCtrls, Menus,
Buttons, dialogs, ComCtrls, StdCtrls, Buttons, dialogs, ComCtrls, StdCtrls,
ce_widget, ce_common, ce_interfaces, ce_writableComponent, ce_observer, ce_widget, ce_common, ce_interfaces, ce_writableComponent, ce_observer,
ce_nativeproject, ce_dubproject, ce_projutils, ce_sharedres, ce_dsgncontrols, ce_ceproject, ce_dubproject, ce_projutils, ce_sharedres, ce_dsgncontrols,
ce_dialogs; ce_dialogs;
type type
@ -198,7 +198,7 @@ procedure TProjectGroup.projChanged(project: ICECommonProject);
var var
itm: TProjectGroupItem; itm: TProjectGroupItem;
begin begin
if assigned(project) and project.inGroup and (project.getFormat = pfDub) then if assigned(project) and project.inGroup and (project.getFormat = pfDUB) then
begin begin
itm := Self.addItem(project.filename); itm := Self.addItem(project.filename);
if assigned(itm) then if assigned(itm) then
@ -280,7 +280,7 @@ function TProjectGroup.getProject(ix: Integer): ICECommonProject;
begin begin
item[ix].lazyLoad; item[ix].lazyLoad;
result := item[ix].project; result := item[ix].project;
if result.getFormat = pfDub then if result.getFormat = pfDUB then
result.setActiveConfigurationIndex(item[ix].configurationIndex); result.setActiveConfigurationIndex(item[ix].configurationIndex);
end; end;
@ -439,7 +439,7 @@ begin
begin begin
fProj := loadProject(absoluteFilename, true); fProj := loadProject(absoluteFilename, true);
fProj.inGroup(true); fProj.inGroup(true);
if fProj.getFormat = pfDub then if fProj.getFormat = pfDUB then
fProj.setActiveConfigurationIndex(fConfigIndex); fProj.setActiveConfigurationIndex(fConfigIndex);
end; end;
end; end;
@ -454,7 +454,7 @@ end;
function TProjectGroupItem.storeConfigIndex: boolean; function TProjectGroupItem.storeConfigIndex: boolean;
begin begin
exit(fProj.getFormat = pfDub); exit(fProj.getFormat = pfDUB);
end; end;
function TProjectGroupItem.absoluteFilename: string; function TProjectGroupItem.absoluteFilename: string;
@ -713,8 +713,8 @@ begin
Data:= prj; Data:= prj;
fmt := prj.project.getFormat; fmt := prj.project.getFormat;
case fmt of case fmt of
pfNative: Caption := prj.fFilename.extractFileName; pfCE: Caption := prj.fFilename.extractFileName;
pfDub: Caption := TCEDubProject(prj.project.getProject).packageName; pfDUB: Caption := TCEDubProject(prj.project.getProject).packageName;
end; end;
SubItems.Add(typeStr[fmt]); SubItems.Add(typeStr[fmt]);
SubItems.Add(asyncStr[prj.fAsyncMode]); SubItems.Add(asyncStr[prj.fAsyncMode]);
@ -733,8 +733,8 @@ begin
begin begin
if fFreeProj.filename.fileExists then if fFreeProj.filename.fileExists then
case fFreeProj.getFormat of case fFreeProj.getFormat of
pfNative: StaticText1.Caption:= 'Free standing: ' + fFreeProj.filename.extractFileName; pfCE: StaticText1.Caption:= 'Free standing: ' + fFreeProj.filename.extractFileName;
pfDub: StaticText1.Caption:= 'Free standing: ' + TCEDubProject(fFreeProj.getProject).packageName; pfDUB: StaticText1.Caption:= 'Free standing: ' + TCEDubProject(fFreeProj.getProject).packageName;
end end
else else
StaticText1.Caption:= 'Free standing: (not yet saved)'; StaticText1.Caption:= 'Free standing: (not yet saved)';

16
src/ce_projinspect.pas
View File

@ -6,7 +6,7 @@ interface
uses uses
Classes, SysUtils, TreeFilterEdit, Forms, Controls, Graphics, actnlist, Classes, SysUtils, TreeFilterEdit, Forms, Controls, Graphics, actnlist,
Dialogs, ExtCtrls, ComCtrls, Menus, Buttons, lcltype, ce_nativeproject, ce_interfaces, Dialogs, ExtCtrls, ComCtrls, Menus, Buttons, lcltype, ce_ceproject, ce_interfaces,
ce_common, ce_widget, ce_observer, ce_dialogs, ce_sharedres, ce_dsgncontrols; ce_common, ce_widget, ce_observer, ce_dialogs, ce_sharedres, ce_dsgncontrols;
type type
@ -201,7 +201,7 @@ procedure TCEProjectInspectWidget.updateButtons;
var var
ce: boolean; ce: boolean;
begin begin
ce := fProject.getFormat = pfNative; ce := fProject.getFormat = pfCE;
btnRemFile.Enabled:= ce; btnRemFile.Enabled:= ce;
btnRemFold.Enabled:= ce; btnRemFold.Enabled:= ce;
btnAddFile.Enabled:= ce; btnAddFile.Enabled:= ce;
@ -296,7 +296,7 @@ var
fname: string; fname: string;
proj: TCENativeProject; proj: TCENativeProject;
begin begin
if not assigned(fProject) or (fProject.getFormat = pfDub) then if not assigned(fProject) or (fProject.getFormat = pfDUB) then
exit; exit;
proj := TCENativeProject(fProject.getProject); proj := TCENativeProject(fProject.getProject);
@ -327,7 +327,7 @@ var
proj: TCENativeProject; proj: TCENativeProject;
i: integer; i: integer;
begin begin
if not assigned(fProject) or (fProject.getFormat = pfDub) then if not assigned(fProject) or (fProject.getFormat = pfDUB) then
exit; exit;
dir := ''; dir := '';
@ -363,7 +363,7 @@ var
proj: TCENativeProject; proj: TCENativeProject;
i: Integer; i: Integer;
begin begin
if not assigned(fProject) or (fProject.getFormat = pfDub) if not assigned(fProject) or (fProject.getFormat = pfDUB)
or Tree.Selected.isNil or (Tree.Selected.Parent <> fFileNode) then or Tree.Selected.isNil or (Tree.Selected.Parent <> fFileNode) then
exit; exit;
@ -390,7 +390,7 @@ var
proj: TCENativeProject; proj: TCENativeProject;
i, j: integer; i, j: integer;
begin begin
if not assigned(fProject) or (fProject.getFormat = pfDub) if not assigned(fProject) or (fProject.getFormat = pfDUB)
or Tree.Selected.isNil or (Tree.Selected.Parent = fFileNode) then or Tree.Selected.isNil or (Tree.Selected.Parent = fFileNode) then
exit; exit;
@ -423,7 +423,7 @@ begin
getMultiDocHandler.openDocument(value); getMultiDocHandler.openDocument(value);
end; end;
begin begin
if not assigned(fProject) or (fProject.getFormat = pfDub) then if not assigned(fProject) or (fProject.getFormat = pfDUB) then
exit; exit;
proj := TCENativeProject(fProject.getProject); proj := TCENativeProject(fProject.getProject);
@ -452,7 +452,7 @@ end;
procedure TCEProjectInspectWidget.updateImperative; procedure TCEProjectInspectWidget.updateImperative;
var var
src, conf: string; conf: string;
itm: TTreeNode; itm: TTreeNode;
i,j: integer; i,j: integer;
begin begin

2
src/ce_projutils.pas
View File

@ -5,7 +5,7 @@ interface
uses uses
Classes, SysUtils, Classes, SysUtils,
ce_nativeproject, ce_dubproject, ce_interfaces, ce_common, ce_observer, ce_synmemo; ce_ceproject, ce_dubproject, ce_interfaces, ce_common, ce_observer, ce_synmemo;
type type
TCEProjectFileFormat = (pffNone, pffCe, pffDub); TCEProjectFileFormat = (pffNone, pffCe, pffDub);

10
src/ce_symstring.pas
View File

@ -5,7 +5,7 @@ unit ce_symstring;
interface interface
uses uses
ce_observer, ce_interfaces, ce_nativeproject, ce_synmemo, ce_common, ce_observer, ce_interfaces, ce_ceproject, ce_synmemo, ce_common,
ce_stringrange; ce_stringrange;
type type
@ -93,8 +93,8 @@ procedure TCESymbolExpander.projNew(project: ICECommonProject);
begin begin
fProjInterface := project; fProjInterface := project;
case project.getFormat of case project.getFormat of
pfNative: fProj := TCENativeProject(project.getProject); pfCE: fProj := TCENativeProject(project.getProject);
pfDub: fProj := nil; pfDUB: fProj := nil;
end; end;
fNeedUpdate := true; fNeedUpdate := true;
end; end;
@ -112,8 +112,8 @@ procedure TCESymbolExpander.projFocused(project: ICECommonProject);
begin begin
fProjInterface := project; fProjInterface := project;
case project.getFormat of case project.getFormat of
pfNative: fProj := TCENativeProject(project.getProject); pfCE: fProj := TCENativeProject(project.getProject);
pfDub: fProj := nil; pfDUB: fProj := nil;
end; end;
fNeedUpdate := true; fNeedUpdate := true;
end; end;

2
src/ce_todolist.pas
View File

@ -8,7 +8,7 @@ uses
Classes, SysUtils, FileUtil, ListFilterEdit, Forms, Controls, Classes, SysUtils, FileUtil, ListFilterEdit, Forms, Controls,
strutils, Graphics, Dialogs, ExtCtrls, Menus, Buttons, ComCtrls, strutils, Graphics, Dialogs, ExtCtrls, Menus, Buttons, ComCtrls,
ce_widget, process, ce_common, ce_interfaces, ce_synmemo, ce_processes, ce_widget, process, ce_common, ce_interfaces, ce_synmemo, ce_processes,
ce_nativeproject, ce_writableComponent, ce_observer, ce_sharedres, ce_writableComponent, ce_observer, ce_sharedres,
ce_dsgncontrols; ce_dsgncontrols;
type type