makefile generation: cleaned up and improved implementation of per-folder platform...

diff --git a/ide/src/project/Project.ec b/ide/src/project/Project.ec
index b6598a1..49050ae 100644 (file)
--- a/ide/src/project/Project.ec
+++ b/ide/src/project/Project.ec
@@ -2297,10 +2297,18 @@ private:
          f.Printf("\n");
 
          f.Printf("# SYMBOL RULES\n\n");
-         topNode.GenMakefilePrintSymbolRules(f, this, compiler, config);
+         {
+            Map<Platform, bool> excludedPlatforms { };
+            topNode.GenMakefilePrintSymbolRules(f, this, compiler, config, excludedPlatforms);
+            delete excludedPlatforms;
+         }
 
          f.Printf("# C OBJECT RULES\n\n");
-         topNode.GenMakefilePrintCObjectRules(f, this, compiler, config);
+         {
+            Map<Platform, bool> excludedPlatforms { };
+            topNode.GenMakefilePrintCObjectRules(f, this, compiler, config, excludedPlatforms);
+            delete excludedPlatforms;
+         }
 
          /*if(numCObjects)
          {
@@ -2313,7 +2321,11 @@ private:
          f.Printf("# OBJECT RULES\n\n");
          // todo call this still but only generate rules whith specific options
          // see we-have-file-specific-options in ProjectNode.ec
-         topNode.GenMakefilePrintObjectRules(f, this, namesInfo, compiler, config);
+         {
+            Map<Platform, bool> excludedPlatforms { };
+            topNode.GenMakefilePrintObjectRules(f, this, namesInfo, compiler, config, excludedPlatforms);
+            delete excludedPlatforms;
+         }
 
          if(numCObjects)
             GenMakefilePrintMainObjectRule(f, compiler, config);

diff --git a/ide/src/project/ProjectNode.ec b/ide/src/project/ProjectNode.ec
index d6527f4..e260880 100644 (file)
--- a/ide/src/project/ProjectNode.ec
+++ b/ide/src/project/ProjectNode.ec
@@ -1446,8 +1446,11 @@ private:
       return count;
    }
 
-   void GenMakefilePrintSymbolRules(File f, Project project, CompilerConfig compiler, ProjectConfig prjConfig)
+   void GenMakefilePrintSymbolRules(File f, Project project, CompilerConfig compiler,
+         ProjectConfig prjConfig, Map<Platform, bool> parentExcludedPlatforms)
    {
+      int ifCount = 0;
+      Array<Platform> platforms = GetPlatformsArrayFromExcluisionInfo(prjConfig);
       //ProjectNode child;
       //char objDir[MAX_LOCATION];
       //ReplaceSpaces(objDir, config.objDir.dir);
@@ -1458,7 +1461,7 @@ private:
          char extension[MAX_EXTENSION];
          char modulePath[MAX_LOCATION];
          char moduleName[MAX_FILENAME];
-         
+
          GetExtension(name, extension);
          if(!strcmpi(extension, "ec"))
          {
@@ -1541,6 +1544,7 @@ private:
                if(!result)
                {
 #endif
+               OpenRulesPlatformExclusionIfs(f, &ifCount, platforms[0], parentExcludedPlatforms, null);
                   f.Printf("$(OBJ)%s.sym: %s%s.%s\n",
                      moduleName, modulePath, moduleName, extension);
 #if 0
@@ -1575,6 +1579,7 @@ private:
 
             f.Printf(" -c %s%s.%s -o $(OBJ)%s.sym\n\n",
                modulePath, moduleName, extension, moduleName);
+            CloseRulesPlatformExclusionIfs(f, ifCount);
          }
       }
       if(files)
@@ -1593,48 +1598,126 @@ private:
          }
          if(needed)
          {
-            int ifCount = 0;
-            Array<Platform> platforms { };
+            Map<Platform, bool> excludedPlatforms { };
+            for(mn : parentExcludedPlatforms) if(mn) excludedPlatforms[&mn] = true;
+            for(platform : platforms)
             {
-               Map<Platform, SetBool> exclusionInfo { };
-               CollectExclusionInfo(exclusionInfo, prjConfig);
-               if(exclusionInfo[unknown] == true && exclusionInfo.count > 1)
-                  for(mn : exclusionInfo; mn == false)
-                     platforms.Add(&mn);
-               else
-                  platforms.Add(unknown);
-               delete exclusionInfo;
+               OpenRulesPlatformExclusionIfs(f, &ifCount, platform, parentExcludedPlatforms, excludedPlatforms);
+               for(child : files)
+               {
+                  if(child.type != resources && (child.type == folder || !child.GetIsExcluded(prjConfig)))
+                     child.GenMakefilePrintSymbolRules(f, project, compiler, prjConfig, excludedPlatforms);
+               }
             }
-            for(platform : platforms)
+            CloseRulesPlatformExclusionIfs(f, ifCount);
+            delete excludedPlatforms;
+         }
+      }
+      delete platforms;
+   }
+
+   void GenMakefilePrintPrepecsRules(File f, Project project, CompilerConfig compiler,
+         ProjectConfig prjConfig, Map<Platform, bool> parentExcludedPlatforms)
+   {
+      int ifCount = 0;
+      ProjectConfig config = GetMatchingNodeConfig(prjConfig);
+      Array<Platform> platforms = GetPlatformsArrayFromExcluisionInfo(prjConfig);
+      //ProjectNode child;
+      //char objDir[MAX_LOCATION];
+      //ReplaceSpaces(objDir, config.objDir.dir);
+
+      //eSystem_Log("Printing Symbol Rules\n");
+      if(type == file)
+      {
+         char extension[MAX_EXTENSION];
+         char modulePath[MAX_LOCATION];
+         char moduleName[MAX_FILENAME];
+
+         GetExtension(name, extension);
+         if(!strcmpi(extension, "ec"))
+         {
+            DualPipe dep;
+            char command[2048];
+
+            ReplaceSpaces(moduleName, name);
+            StripExtension(moduleName);
+
+            ReplaceSpaces(modulePath, path);
+            if(modulePath[0]) strcat(modulePath, SEPS);
+
+            OpenRulesPlatformExclusionIfs(f, &ifCount, platforms[0], parentExcludedPlatforms, null);
+            f.Printf("$(OBJ)%s$(EC): %s%s.%s\n",
+               moduleName, modulePath, moduleName, extension);
+            //$(CPP) -x c -E ../extras/gui/controls/DirectoriesBox.ec -o $(OBJ)DirectoriesBox$(EC)
+            /*f.Printf("\t$(CPP) %s%s.%s %s$(S)\n\n",
+               modulePath, moduleName, extension, moduleName);*/
+
+            f.Printf("\t$(CPP)");
+            // Give priority to file flags
+            GenFileFlags(f, project, prjConfig);
+
+            /*f.Printf(" $(CECFLAGS)");
+            if(GetECFLAGS(prjConfig))
             {
-               if(platform != unknown)
+               if(GetMemoryGuard(prjConfig))
+                  f.Printf(" -memguard");
+               if(GetStrictNameSpaces(prjConfig))
+                  f.Printf(" -strictns");
                {
-                  if(ifCount)                  // we really need a if defined(a) || defined(b) here
-                     f.Printf("else\n");       // instead of repeating the rules for each platform
-                  ifCount++;                   //
-                  f.Printf("ifdef %s\n\n", PlatformToMakefileVariable(platform)); //
+                  char * s = GetDefaultNameSpace(prjConfig);
+                  if(s && s[0])
+                     f.Printf(" -defaultns %s", s);
                }
-               for(child : files)
+            }
+            else
+               f.Printf(" $(ECFLAGS)");*/
+            f.Printf(" $(CFLAGS)");
+
+            f.Printf(" -x c -E %s%s.%s -o $(OBJ)%s$(EC)\n\n",
+               modulePath, moduleName, extension, moduleName);
+            CloseRulesPlatformExclusionIfs(f, ifCount);
+         }
+      }
+      if(files)
+      {
+         bool needed = false;
+         if(ContainsFilesWithExtension("ec"))
+         {
+            for(child : files)
+            {
+               if(child.type != resources && (child.type == folder || !child.GetIsExcluded(prjConfig)))
                {
-                  if(child.type != resources && (child.type == folder || !child.GetIsExcluded(prjConfig)))
-                     child.GenMakefilePrintSymbolRules(f, project, compiler, prjConfig);
+                  needed = true;
+                  break;
                }
             }
-            if(ifCount)
+         }
+         if(needed)
+         {
+            Map<Platform, bool> excludedPlatforms { };
+            for(mn : parentExcludedPlatforms) if(mn) excludedPlatforms[&mn] = true;
+            for(platform : platforms)
             {
-               int c;
-               for(c = 0; c < ifCount; c++)
-                  f.Printf("endif\n");
-               f.Printf("\n");
+               OpenRulesPlatformExclusionIfs(f, &ifCount, platform, parentExcludedPlatforms, excludedPlatforms);
+               for(child : files)
+               {
+                  if(child.type != resources && (child.type == folder || !child.GetIsExcluded(prjConfig)))
+                     child.GenMakefilePrintPrepecsRules(f, project, compiler, prjConfig, excludedPlatforms);
+               }
             }
-            delete platforms;
+            CloseRulesPlatformExclusionIfs(f, ifCount);
+            delete excludedPlatforms;
          }
       }
+      delete platforms;
    }
 
-   void GenMakefilePrintCObjectRules(File f, Project project, CompilerConfig compiler, ProjectConfig prjConfig)
+   void GenMakefilePrintCObjectRules(File f, Project project, CompilerConfig compiler,
+      ProjectConfig prjConfig, Map<Platform, bool> parentExcludedPlatforms)
    {
+      int ifCount = 0;
       ProjectConfig config = GetMatchingNodeConfig(prjConfig);
+      Array<Platform> platforms = GetPlatformsArrayFromExcluisionInfo(prjConfig);
       //ProjectNode child;
       //char objDir[MAX_LOCATION];
       //ReplaceSpaces(objDir, config.objDir.dir);
@@ -1731,6 +1814,7 @@ private:
                      moduleName, modulePath, moduleName, extension);
                   */
 #endif
+            OpenRulesPlatformExclusionIfs(f, &ifCount, platforms[0], parentExcludedPlatforms, null);
                   f.Printf("$(OBJ)%s.c: %s%s.%s $(OBJ)%s.sym | $(SYMBOLS)\n",
                      moduleName, modulePath, moduleName, extension, moduleName);
 #if 0
@@ -1764,6 +1848,7 @@ private:
 
             f.Printf(" -c %s%s.%s -o $(OBJ)%s.c -symbols $(OBJ)\n\n",
                modulePath, moduleName, extension, moduleName);
+            CloseRulesPlatformExclusionIfs(f, ifCount);
          }
       }
       if(files)
@@ -1782,50 +1867,32 @@ private:
          }
          if(needed)
          {
-            int ifCount = 0;
-            Array<Platform> platforms { };
-            {
-               Map<Platform, SetBool> exclusionInfo { };
-               CollectExclusionInfo(exclusionInfo, prjConfig);
-               if(exclusionInfo[unknown] == true && exclusionInfo.count > 1)
-                  for(mn : exclusionInfo; mn == false)
-                     platforms.Add(&mn);
-               else
-                  platforms.Add(unknown);
-               delete exclusionInfo;
-            }
+            Map<Platform, bool> excludedPlatforms { };
+            for(mn : parentExcludedPlatforms) if(mn) excludedPlatforms[&mn] = true;
             for(platform : platforms)
             {
-               if(platform != unknown)
-               {
-                  if(ifCount)                  // we really need a if defined(a) || defined(b) here
-                     f.Printf("else\n");       // instead of repeating the rules for each platform
-                  ifCount++;                   //
-                  f.Printf("ifdef %s\n\n", PlatformToMakefileVariable(platform)); //
-               }
+               OpenRulesPlatformExclusionIfs(f, &ifCount, platform, parentExcludedPlatforms, excludedPlatforms);
                for(child : files)
                {
                   if(child.type != resources && (child.type == folder || !child.GetIsExcluded(prjConfig)))
-                     child.GenMakefilePrintCObjectRules(f, project, compiler, prjConfig);
+                     child.GenMakefilePrintCObjectRules(f, project, compiler, prjConfig, excludedPlatforms);
                }
             }
-            if(ifCount)
-            {
-               int c;
-               for(c = 0; c < ifCount; c++)
-                  f.Printf("endif\n");
-               f.Printf("\n");
-            }
-            delete platforms;
+            CloseRulesPlatformExclusionIfs(f, ifCount);
+            delete excludedPlatforms;
          }
       }
+      delete platforms;
    }
 
    void GenMakefilePrintObjectRules(File f, Project project,
       Map<String, NameCollisionInfo> namesInfo,
-      CompilerConfig compiler, ProjectConfig prjConfig)
+      CompilerConfig compiler, ProjectConfig prjConfig,
+      Map<Platform, bool> parentExcludedPlatforms)
    {
+      int ifCount = 0;
       ProjectConfig config = GetMatchingNodeConfig(prjConfig);
+      Array<Platform> platforms = GetPlatformsArrayFromExcluisionInfo(prjConfig);
       //ProjectNode child;
       //char objDir[MAX_LOCATION];
       //ReplaceSpaces(objDir, config.objDir.dir);
@@ -1836,7 +1903,7 @@ private:
          char extension[MAX_EXTENSION];
          char modulePath[MAX_LOCATION];
          char moduleName[MAX_FILENAME];
-         
+
          GetExtension(name, extension);
          /*if(!strcmpi(extension, "c") || !strcmpi(extension, "cpp") ||
                !strcmpi(extension, "ec") || !strcmpi(extension, "cc") ||
@@ -1935,6 +2002,8 @@ private:
                   if(!result)
                   {
 #endif
+            OpenRulesPlatformExclusionIfs(f, &ifCount, platforms[0], parentExcludedPlatforms, null);
+
                      /*if(!strcmpi(extension, "ec"))
                         f.Printf("$(OBJ)%s.o: $(OBJ)%s.c\n", moduleName, moduleName);
                      else*/
@@ -1957,6 +2026,7 @@ private:
                f.Printf(" -c %s%s.%s -o $(OBJ)%s%s%s.o\n\n",
                      modulePath, moduleName, !strcmpi(extension, "ec") ? "c" : extension, moduleName,
                      collision ? "." : "", collision ? extension : "");
+            CloseRulesPlatformExclusionIfs(f, ifCount);
          }
       }
       if(files)
@@ -1972,43 +2042,22 @@ private:
          }
          if(needed)
          {
-            int ifCount = 0;
-            Array<Platform> platforms { };
-            {
-               Map<Platform, SetBool> exclusionInfo { };
-               CollectExclusionInfo(exclusionInfo, prjConfig);
-               if(exclusionInfo[unknown] == true && exclusionInfo.count > 1)
-                  for(mn : exclusionInfo; mn == false)
-                     platforms.Add(&mn);
-               else
-                  platforms.Add(unknown);
-               delete exclusionInfo;
-            }
+            Map<Platform, bool> excludedPlatforms { };
+            for(mn : parentExcludedPlatforms) if(mn) excludedPlatforms[&mn] = true;
             for(platform : platforms)
             {
-               if(platform != unknown)
-               {
-                  if(ifCount)                  // we really need a if defined(a) || defined(b) here
-                     f.Printf("else\n");       // instead of repeating the rules for each platform
-                  ifCount++;                   //
-                  f.Printf("ifdef %s\n\n", PlatformToMakefileVariable(platform)); //
-               }
+               OpenRulesPlatformExclusionIfs(f, &ifCount, platform, parentExcludedPlatforms, excludedPlatforms);
                for(child : files)
                {
                   if(child.type != resources && (child.type == folder || !child.GetIsExcluded(prjConfig)))
-                     child.GenMakefilePrintObjectRules(f, project, namesInfo, compiler, prjConfig);
+                     child.GenMakefilePrintObjectRules(f, project, namesInfo, compiler, prjConfig, excludedPlatforms);
                }
             }
-            if(ifCount)
-            {
-               int c;
-               for(c = 0; c < ifCount; c++)
-                  f.Printf("endif\n");
-               f.Printf("\n");
-            }
-            delete platforms;
+            CloseRulesPlatformExclusionIfs(f, ifCount);
+            delete excludedPlatforms;
          }
       }
+      delete platforms;
    }
 
    void GenMakefileAddResources(File f, String resourcesPath, ProjectConfig prjConfig)
@@ -2092,6 +2141,20 @@ private:
          }
       }
    }
+
+   Array<Platform> GetPlatformsArrayFromExcluisionInfo(ProjectConfig prjConfig)
+   {
+      Array<Platform> platforms { };
+      Map<Platform, SetBool> exclusionInfo { };
+      CollectExclusionInfo(exclusionInfo, prjConfig);
+      if(exclusionInfo[unknown] == true && exclusionInfo.count > 1)
+         for(mn : exclusionInfo; mn == false)
+            platforms.Add(&mn);
+      else
+         platforms.Add(unknown);
+      delete exclusionInfo;
+      return platforms;
+   }
 }
 
 class NameCollisionInfo
@@ -2118,3 +2181,28 @@ class NameCollisionInfo
      return colliding;
    }
 }
+
+static inline void OpenRulesPlatformExclusionIfs(File f, int * ifCount, Platform platform,
+      Map<Platform, bool> parentExcludedPlatforms, Map<Platform, bool> excludedPlatforms)
+{
+   if(platform != unknown && !parentExcludedPlatforms[platform])
+   {
+      if(*ifCount)                 // we really need a if defined(a) || defined(b) here
+         f.Printf("else\n");       // instead of repeating the rules for each platform
+      (*ifCount)++;                  //
+      f.Printf("ifdef %s\n\n", PlatformToMakefileVariable(platform)); //
+      if(excludedPlatforms)
+         excludedPlatforms[platform] = true;
+   }
+}
+
+static inline void CloseRulesPlatformExclusionIfs(File f, int ifCount)
+{
+   if(ifCount)
+   {
+      int c;
+      for(c = 0; c < ifCount; c++)
+         f.Printf("endif\n");
+      f.Printf("\n");
+   }
+}