Merge pull request #190 from royqh1979/develop

Develop
royqh1979 · Jul 22, 2021 · 4049231 · 4049231
2 parents f045d01 + 3c8f2ad
commit 4049231
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 27 deletions.
diff --git a/NEWS.txt b/NEWS.txt
@@ -1,5 +1,7 @@
 Version 6.7.3
 
+    - change: use del instead of rm.exe in the project's makefile
+    - fix: Generated makefiles have error for dll projects
     - fix: gdb annotation infos are not correctly displayed
     - fix: the symbol completion option for ']' doesn't work
     - experiment support for clang (msys2 64bit build) 

diff --git a/Source/Compiler.pas b/Source/Compiler.pas
@@ -309,7 +309,8 @@ procedure TCompiler.WriteMakeDefines(var F: TextFile);
   Writeln(F, 'CXXFLAGS = $(CXXINCS) ' + fCppCompileParams);
   Writeln(F, 'ENCODINGS = -finput-charset=utf-8 -fexec-charset='+GetSystemCharsetName);
   Writeln(F, 'CFLAGS   = $(INCS) ' + fCompileParams);
-  Writeln(F, 'RM       = ' + CLEAN_PROGRAM + ' -f'); // TODO: use del or rm?
+//  Writeln(F, 'RM       = ' + CLEAN_PROGRAM + ' -f'); // TODO: use del or rm?
+  Writeln(F, 'RM       = ' + CLEAN_PROGRAM + ' /f'); // TODO: use del or rm?
   if fProject.Options.UsePrecompiledHeader then begin
     Writeln(F, 'PCH_H = ' + fProject.Options.PrecompiledHeader );
     Writeln(F, 'PCH = ' + fProject.Options.PrecompiledHeader +'.gch' );
@@ -590,7 +591,7 @@ procedure TCompiler.CreateDynamicMakeFile;
       //  Writeln(F, #9 +
       //    '$(CPP) -shared $(LINKOBJ) -o "$(BIN)" $(LIBS) -Wl,--output-def,$(DEF),--out-implib,$(STATIC),--add-stdcall-alias')
         Writeln(F, #9 +
-          '$(CPP) -mdll - $(LINKOBJ) -o "$(BIN)" $(LIBS) -Wl,--output-def,$(DEF),--out-implib,$(STATIC)')
+          '$(CPP) -mdll $(LINKOBJ) -o "$(BIN)" $(LIBS) -Wl,--output-def,$(DEF),--out-implib,$(STATIC)')
       else
         Writeln(F, #9 +
           '$(CC) -mdll $(LINKOBJ) -o "$(BIN)" $(LIBS) -Wl,--output-def,$(DEF),--out-implib,$(STATIC)')

diff --git a/Source/VCL/ClassBrowsing/CppParser.pas b/Source/VCL/ClassBrowsing/CppParser.pas
@@ -2786,7 +2786,6 @@ procedure TCppParser.InternalParse(const FileName: AnsiString; ManualUpdate: boo
   end;
   }
 
-
   //fPreprocessor.DumpIncludesListTo('f:\\includes.txt');
 
   // Tokenize the preprocessed buffer file

diff --git a/Source/Version.pas b/Source/Version.pas
@@ -104,7 +104,8 @@ interface
   WINDRES_PROGRAM = 'windres.exe';
   GPROF_PROGRAM = 'gprof.exe';
   PACKMAN_PROGRAM = 'packman.exe';
-  CLEAN_PROGRAM = 'rm.exe'; // cannot use del, it doesn't have a quiet mode
+  // CLEAN_PROGRAM = 'rm.exe'; // cannot use del, it doesn't have a quiet mode
+  CLEAN_PROGRAM = 'del /q'; // cannot use del, it doesn't have a quiet mode
 
   // File dialog filters
   FLT_EXECUTABLES = 'Executable files (*.exe)|*.exe';

diff --git a/Source/devCFG.pas b/Source/devCFG.pas
@@ -1444,16 +1444,25 @@ procedure TdevCompilerSet.SetExecutables;
   fgprofName := GPROF_PROGRAM;
 end;
 
+function PathCanonicalize(lpszDst: PChar; lpszSrc: PChar): LongBool; stdcall;
+  external 'shlwapi.dll' name 'PathCanonicalizeA';
+
 procedure TdevCompilerSet.SetDirectories;
 var
   DelimPos1,DelimPos2: integer;
   output,s: string;
   sl: TStringList;
   i:integer;
   procedure AddExistingDirectory(var list: TStringList; const Directory: AnsiString);
+  var
+  Dst: array[0..MAX_PATH-1] of char;
+  newDir : string;
   begin
-    if DirectoryExists(Directory) then
-      list.Add(Directory);
+    newDir := StringReplace(Directory,'/','\',[rfReplaceAll]);
+    PathCanonicalize(@Dst[0], PChar(newDir));
+    newDir := Dst;
+    if DirectoryExists(newDir) and (list.IndexOf(newDir)<0) then
+      list.Add(newDir);
   end;
 begin
 

diff --git a/Source/devcpp.dof b/Source/devcpp.dof
@@ -134,10 +134,18 @@ OriginalFilename=devcpp.exe
 ProductName=Dev-C++
 ProductVersion=6
 Comments=Under the GNU General Public License
+[HistoryLists\hlDebugSourcePath]
+Count=1
+Item0=C:\Program Files (x86)\Dev-Cpp\Source\VCL\SynEdit\Source\;C:\Program Files (x86)\Dev-Cpp\Source\VCL\ClassBrowsing\
 [HistoryLists\hlUnitAliases]
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 [HistoryLists\hlSearchPath]
-Count=2
-Item0=..\VirtualTreeView\Source
-Item1=..\..\Common
+Count=1
+Item0=VCL\ClassBrowsing;VCL\devFileMonitor;VCL\devShortcuts;VCL\CompOptionsList;VCL\SynEdit\Source
+[HistoryLists\hlUnitOutputDirectory]
+Count=1
+Item0=Units
+[HistoryLists\hlOutputDirectorry]
+Count=1
+Item0=..
diff --git a/Source/main.dfm b/Source/main.dfm
@@ -1,6 +1,6 @@
 object MainForm: TMainForm
   Left = 597
-  Top = 317
+  Top = 312
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   AutoScroll = False
@@ -71,7 +71,7 @@ object MainForm: TMainForm
         Left = 0
         Top = 0
         Width = 976
-        Height = 196
+        Height = 190
         Align = alClient
         BevelOuter = bvNone
         BorderStyle = bsNone
@@ -167,7 +167,7 @@ object MainForm: TMainForm
         TabOrder = 0
         DesignSize = (
           192
-          196)
+          190)
         object btnAbortCompilation: TSpeedButton
           Left = 5
           Top = 5
@@ -213,7 +213,7 @@ object MainForm: TMainForm
         Left = 192
         Top = 0
         Width = 784
-        Height = 196
+        Height = 190
         Align = alClient
         BevelOuter = bvNone
         TabOrder = 1
@@ -245,13 +245,13 @@ object MainForm: TMainForm
         Left = 450
         Top = 0
         Width = 8
-        Height = 196
+        Height = 190
       end
       object DebugViews: TPageControl
         Left = 458
         Top = 0
         Width = 518
-        Height = 196
+        Height = 190
         ActivePage = DebugConsoleSheet
         Align = alClient
         PopupMenu = LocalPopup
@@ -264,15 +264,15 @@ object MainForm: TMainForm
             Left = 0
             Top = 0
             Width = 510
-            Height = 165
+            Height = 159
             Align = alClient
             BevelOuter = bvNone
             TabOrder = 0
             object DebugOutput: TDevConsole
               Left = 0
               Top = 0
               Width = 510
-              Height = 165
+              Height = 159
               Align = alClient
               BevelInner = bvNone
               BevelOuter = bvNone
@@ -388,7 +388,7 @@ object MainForm: TMainForm
         Left = 0
         Top = 0
         Width = 450
-        Height = 196
+        Height = 190
         Align = alLeft
         BevelOuter = bvNone
         Constraints.MinWidth = 28
@@ -397,13 +397,13 @@ object MainForm: TMainForm
           Left = 0
           Top = 0
           Width = 450
-          Height = 196
+          Height = 190
           Align = alClient
           BevelOuter = bvNone
           TabOrder = 0
           DesignSize = (
             450
-            196)
+            190)
           object lblEvaluate: TLabel
             Left = 5
             Top = 6
@@ -438,7 +438,7 @@ object MainForm: TMainForm
             Left = 0
             Top = 62
             Width = 450
-            Height = 134
+            Height = 128
             Align = alBottom
             Anchors = [akLeft, akTop, akRight, akBottom]
             BevelOuter = bvNone
@@ -465,7 +465,7 @@ object MainForm: TMainForm
         Left = 0
         Top = 0
         Width = 976
-        Height = 196
+        Height = 190
         Align = alClient
         Indent = 22
         TabOrder = 0
@@ -743,7 +743,7 @@ object MainForm: TMainForm
         36)
       object cmbCompilers: TComboBox
         Left = 0
-        Top = 5
+        Top = 0
         Width = 337
         Height = 24
         AutoComplete = False
@@ -946,7 +946,7 @@ object MainForm: TMainForm
     Top = 80
     Width = 209
     Height = 320
-    ActivePage = FilesSheet
+    ActivePage = LeftProjectSheet
     Align = alLeft
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -1011,8 +1011,8 @@ object MainForm: TMainForm
         object ClassBrowser: TClassBrowser
           Left = 0
           Top = 0
-          Width = 174
-          Height = 376
+          Width = 147
+          Height = 274
           Align = alClient
           Images = dmMain.ClassImages
           Indent = 19
@@ -1208,7 +1208,7 @@ object MainForm: TMainForm
         object fileBrowser: TDevFileBrowser
           Left = 0
           Top = 0
-          Width = 179
+          Width = 147
           Height = 274
           Align = alClient
           Images = dmMain.FileBrowserImages_NewLook
-Original file line number
+Diff line change
@@ Expand Up @@
       end;
       }
       //fPreprocessor.DumpIncludesListTo('f:\\includes.txt');
       // Tokenize the preprocessed buffer file
@@ Expand Down @@