gbuildtojson prepare for new filetypes.

gbuild-to-ide now contains a dict with json name -> file extension
post_GbuildToJson.ml contains a todo list (missing files, new arguments)
gbuildtojson.cxx made resistent (no extra argument list to maintain)

Change-Id: I7f346f606ed5fba0a1eaffdd38454b484cecfcf5

2 files changed, 18 insertions, 29 deletions

diff --git a/solenv/gbuild/extensions/post_GbuildToJson.mk b/solenv/gbuild/extensions/post_GbuildToJson.mk
index d0e8611818b2..89a4c8437a5d 100644
--- a/solenv/gbuild/extensions/post_GbuildToJson.mk
+++ b/solenv/gbuild/extensions/post_GbuildToJson.mk
@@ -7,6 +7,24 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+
+# Outstanding work:
+#
+# fill files names in:
+#   --ASMOBJECTS
+#   --GENCOBJECTS
+#   --YACCOBJECTS
+#
+# add new arguments:
+#   --COBJECTS
+#   --FLEXOBJECTS
+#   --JAVAOBJECTS
+#   --PYTHONOBJECTS
+#
+# Add black listed modules a json files (--BLACKLIST)
+#
+# Reduce number of blacklisted modules
+
 ifneq ($(filter gbuildtojson,$(MAKECMDGOALS)),)
 
 ifeq ($(MAKE_VERSION),3.81)
diff --git a/solenv/gbuildtojson/gbuildtojson.cxx b/solenv/gbuildtojson/gbuildtojson.cxx
index 96d38eaafccd..7c2429e60d20 100644
--- a/solenv/gbuildtojson/gbuildtojson.cxx
+++ b/solenv/gbuildtojson/gbuildtojson.cxx
@@ -17,30 +17,6 @@
 #include <stdio.h>
 
 using namespace std;
-static const list<string> validargs = {
-    "makefile",
-    "linktarget",
-    "ilibtarget",
-    "cxxobjects",
-    "yaccobjects",
-    "objcobjects",
-    "objcxxobjects",
-    "asmobjects",
-    "gencobjects",
-    "gencxxobjects",
-    "cflags",
-    "cflagsappend",
-    "cxxflags",
-    "cxxflagsappend",
-    "objcflags",
-    "objcflagsappend",
-    "objcxxflags",
-    "objcxxflagsappend",
-    "defs",
-    "include",
-    "linked_libs",
-    "linked_static_libs"
-};
 
 int main(int argc, char** argv)
 {
@@ -61,11 +37,6 @@ int main(int argc, char** argv)
             return 2;
         }
         const string argname(arg.substr(2, eqpos-2));
-        if(find(validargs.begin(), validargs.end(), argname) == validargs.end())
-        {
-            cerr << "Option" << argname << "invalid." << endl;
-            return 3;
-        }
         vartofile[argname] = arg.substr(eqpos+1, string::npos);
     }
     cout << "{";