buildsystem,ide; (#1036) fix failure to go to added project source file from error...

detect gcc cc and cxx versions to pass -fno-diagnostics-show-caret to gcc 4.8 and above.

diff --git a/compiler/ecc/ecc.ec b/compiler/ecc/ecc.ec
index ae7dbd0..c855ed2 100644 (file)
--- a/compiler/ecc/ecc.ec
+++ b/compiler/ecc/ecc.ec
@@ -374,6 +374,16 @@ class CompilerApp : Application
                else
                   valid = false;
             }
+            else if(!strcmp(arg+1, "fno-diagnostics-show-caret"))
+            {
+               char * buf;
+               int size = cppOptionsLen + 1 + strlen(arg) * 2 + 1;
+               cppOptions = renew cppOptions char[size];
+               buf = cppOptions + cppOptionsLen;
+               *buf++ = ' ';
+               PassArg(buf, arg);
+               cppOptionsLen = cppOptionsLen + 1 + strlen(buf);
+            }
             else if(!strcmp(arg+1, "symbols"))
             {
                if(c + 1 < argc)

diff --git a/compiler/ecp/ecp.ec b/compiler/ecp/ecp.ec
index 933d9b9..0071bb8 100644 (file)
--- a/compiler/ecp/ecp.ec
+++ b/compiler/ecp/ecp.ec
@@ -1406,6 +1406,16 @@ class PrecompApp : Application
                else
                   valid = false;
             }
+            else if(!strcmp(arg+1, "fno-diagnostics-show-caret"))
+            {
+               char * buf;
+               int size = cppOptionsLen + 1 + strlen(arg) * 2 + 1;
+               cppOptions = renew cppOptions char[size];
+               buf = cppOptions + cppOptionsLen;
+               *buf++ = ' ';
+               PassArg(buf, arg);
+               cppOptionsLen = cppOptionsLen + 1 + strlen(buf);
+            }
             else if(!strcmp(arg+1, "symbols"))
             {
                if(c + 1 < argc)

diff --git a/default.cf b/default.cf
index 833ee11..d9927a6 100644 (file)
--- a/default.cf
+++ b/default.cf
@@ -8,14 +8,14 @@ ifdef WINDOWS_HOST
 endif
 
 # TOOLCHAIN
-export CC      = $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)gcc$(_SYSROOT)
+export CC      = $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)gcc$(_SYSROOT)$(if $(GCC_CC_FLAGS),$(space)$(GCC_CC_FLAGS),)
 export CPP     = $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)gcc$(_SYSROOT)
 export AS      = $(GCC_PREFIX)as
 export LD      = $(GCC_PREFIX)ld
 export AR      = $(GCC_PREFIX)ar
 export STRIP   = $(GCC_PREFIX)strip
-export ECP := $(call sys_path,$(EC_BINS)ecp$(HOST_E))
-export ECC := $(call sys_path,$(EC_BINS)ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)
+export ECP := $(call sys_path,$(EC_BINS)ecp$(HOST_E))$(if $(GCC_FLAGS),$(space)$(GCC_FLAGS),)
+export ECC := $(call sys_path,$(EC_BINS)ecc$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)$(if $(GCC_FLAGS),$(space)$(GCC_FLAGS),)
 export ECS := $(call sys_path,$(EC_BINS)ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)$(if $(OUTPUT_POT), -outputpot,)$(if $(DISABLED_POOLING), -disabled-pooling,)
 export EAR := $(call sys_path,$(_CF_DIR)obj/$(HOST_PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/bin/ear$(HOST_E))
 ifdef WINDOWS_TARGET

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index 33bc9ba..13cba8b 100644 (file)
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -2118,9 +2118,11 @@ private:
       }
       else
       {
+         GccVersionInfo ccVersion = GetGccVersionInfo(compiler, compiler.ccCommand);
+         GccVersionInfo cxxVersion = GetGccVersionInfo(compiler, compiler.cxxCommand);
          char cfDir[MAX_LOCATION];
          GetIDECompilerConfigsDir(cfDir, true, true);
-         sprintf(command, "%s%s %sCF_DIR=\"%s\"%s%s%s%s%s%s COMPILER=%s %s-j%d %s%s%s -C \"%s\"%s -f \"%s\"",
+         sprintf(command, "%s%s %sCF_DIR=\"%s\"%s%s%s%s%s%s COMPILER=%s %s%s%s-j%d %s%s%s -C \"%s\"%s -f \"%s\"",
 #if defined(__WIN32__)
                "",
 #else
@@ -2135,7 +2137,10 @@ private:
                bitDepth == 32 ? "32" : bitDepth == 64 ? "64" : "",
                ide.workspace.useValgrind ? " DISABLED_POOLING=1" : "",
                /*(bitDepth == 64 && compiler.targetPlatform == win32) ? " GCC_PREFIX=x86_64-w64-mingw32-" : (bitDepth == 32 && compiler.targetPlatform == win32) ? " GCC_PREFIX=i686-w64-mingw32-" :*/ "",
-               compilerName, eC_Debug ? "--always-make " : "", numJobs,
+               compilerName, eC_Debug ? "--always-make " : "",
+               ccVersion == post4_8 ? "GCC_CC_FLAGS=-fno-diagnostics-show-caret " : "",
+               cxxVersion == post4_8 ? "GCC_CXX_FLAGS=-fno-diagnostics-show-caret " : "",
+               numJobs,
                (compiler.ccacheEnabled && !eC_Debug) ? "CCACHE=y " : "",
                (compiler.distccEnabled && !eC_Debug) ? "DISTCC=y " : "",
                (String)makeTargets, topNode.path, (justPrint || eC_Debug) ? " -n" : "", makeFilePath);
@@ -2455,12 +2460,12 @@ private:
 
             //f.Printf("SHELL := %s\n", "sh"/*compiler.shellCommand*/); // is this really needed?
             f.Printf("CPP := $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)%s$(_SYSROOT)\n", compiler.cppCommand);
-            f.Printf("CC := $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)%s$(_SYSROOT)\n", compiler.ccCommand);
-            f.Printf("CXX := $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)%s$(_SYSROOT)\n", compiler.cxxCommand);
+            f.Printf("CC := $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)%s$(_SYSROOT)$(if $(GCC_CC_FLAGS),$(space)$(GCC_CC_FLAGS),)\n", compiler.ccCommand);
+            f.Printf("CXX := $(CCACHE_COMPILE)$(DISTCC_COMPILE)$(GCC_PREFIX)%s$(_SYSROOT)$(if $(GCC_CXX_FLAGS),$(space)$(GCC_CXX_FLAGS),)\n", compiler.cxxCommand);
             if(eC)
             {
-               f.Printf("ECP := $(if $(ECP_DEBUG),ide -debug-start \"$(ECERE_SDK_SRC)/compiler/ecp/ecp.epj\" -debug-work-dir \"${CURDIR}\" -@,%s)\n", compiler.ecpCommand);
-               f.Printf("ECC := $(if $(ECC_DEBUG),ide -debug-start \"$(ECERE_SDK_SRC)/compiler/ecc/ecc.epj\" -debug-work-dir \"${CURDIR}\" -@,%s)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)\n", compiler.eccCommand);
+               f.Printf("ECP := $(if $(ECP_DEBUG),ide -debug-start \"$(ECERE_SDK_SRC)/compiler/ecp/ecp.epj\" -debug-work-dir \"${CURDIR}\" -@,%s)$(if $(GCC_CC_FLAGS),$(space)$(GCC_CC_FLAGS),)\n", compiler.ecpCommand);
+               f.Printf("ECC := $(if $(ECC_DEBUG),ide -debug-start \"$(ECERE_SDK_SRC)/compiler/ecc/ecc.epj\" -debug-work-dir \"${CURDIR}\" -@,%s)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)$(if $(GCC_CC_FLAGS),$(space)$(GCC_CC_FLAGS),)\n", compiler.eccCommand);
                f.Printf("ECS := $(if $(ECS_DEBUG),ide -debug-start \"$(ECERE_SDK_SRC)/compiler/ecs/ecs.epj\" -debug-work-dir \"${CURDIR}\" -@,%s)$(if $(CROSS_TARGET), -t $(TARGET_PLATFORM),)$(if $(OUTPUT_POT), -outputpot,)$(if $(DISABLED_POOLING), -disabled-pooling,)\n", compiler.ecsCommand);
             }
             else
@@ -4581,3 +4586,60 @@ Project LoadProject(char * filePath, char * activeConfigName)
    }
    return project;
 }
+
+static GccVersionInfo GetGccVersionInfo(CompilerConfig compiler, String compilerCommand)
+{
+   GccVersionInfo result = unknown;
+   if(compiler.ccCommand)
+   {
+      char command[MAX_F_STRING*4];
+      DualPipe f;
+      sprintf(command, "%s%s --version", compiler.gccPrefix ? compiler.gccPrefix : "", compilerCommand);
+      if((f = DualPipeOpen(PipeOpenMode { output = true, error = true, input = true }, command)))
+      {
+         bool firstLine = true;
+         while(!f.eof)
+         {
+            char line[1024];
+            char * tokens[128];
+            if(f.GetLine(line,sizeof(line)))
+            {
+               if(firstLine)
+               {
+                  uint count = Tokenize(line, sizeof(tokens)/sizeof(tokens[0]), tokens,false);
+                  if(count)
+                     result = GccVersionInfo::GetVersionInfo(tokens[count-1]);
+                  firstLine = false;
+               }
+            }
+         }
+         delete f;
+      }
+   }
+   return result;
+}
+
+static enum GccVersionInfo
+{
+   unknown, pre4_8, post4_8;
+
+   GccVersionInfo ::GetVersionInfo(char * version)
+   {
+      GccVersionInfo result = unknown;
+      int ver;
+      char * s = CopyString(version);
+      char * tokens[16];
+      uint count = TokenizeWith(s, sizeof(tokens)/sizeof(tokens[0]), tokens, ".", false);
+      ver = count > 1 ? atoi(tokens[1]) : 0;
+      ver += count ? atoi(tokens[0]) * 1000 : 0;
+      if(ver > 0)
+      {
+         if(ver < 4008)
+            result = pre4_8;
+         else
+            result = post4_8;
+      }
+      delete s;
+      return result;
+   }
+};

diff --git a/ide/src/project/ProjectView.ec b/ide/src/project/ProjectView.ec
index 4036527..7cba1c8 100644 (file)
--- a/ide/src/project/ProjectView.ec
+++ b/ide/src/project/ProjectView.ec
@@ -1834,11 +1834,28 @@ class ProjectView : Window
                               break;
                         }
                      }
-                     if(!codeEditor && !strchr(moduleName, '/') && !strchr(moduleName, '\\'))
+                     if(!codeEditor && (strchr(moduleName, '/') || strchr(moduleName, '\\')))
                      {
                         for(prj : ide.workspace.projects)
                         {
                            ProjectNode node;
+                           if((node = prj.topNode.FindWithPath(moduleName, false)))
+                           {
+                              strcpy(filePath, prj.topNode.path);
+                              PathCatSlash(filePath, node.path);
+                              PathCatSlash(filePath, node.name);
+                              codeEditor = (CodeEditor)ide.OpenFile(filePath, normal, true, null, no, normal, noParsing);
+                              if(codeEditor)
+                                 break;
+                           }
+                        }
+                     }
+                     if(!codeEditor)
+                     {
+                        GetLastDirectory(moduleName, moduleName);
+                        for(prj : ide.workspace.projects)
+                        {
+                           ProjectNode node;
                            if((node = prj.topNode.Find(moduleName, false)))
                            {
                               strcpy(filePath, prj.topNode.path);