diff options
| -rwxr-xr-x | bin/gbuild-to-ide | 20 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_GbuildToJson.mk | 18 | ||||
| -rw-r--r-- | solenv/gbuildtojson/gbuildtojson.cxx | 29 |
3 files changed, 32 insertions, 35 deletions
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index 7186ed41a762..cf44d5ecdcda 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -87,15 +87,23 @@ class GbuildParser: def parse(self): # Relation between json object and file extension - # Missing relations: .hxx .hpp .hrc .src .java .py .h .s .c .pl .S .ui .l .cpp - jsonSrc = {'ASMOBJECTS': '.asm', + jsonSrc = { 'CXXOBJECTS': '.cxx', - 'GENCOBJECTS': '?', - 'GENCXXOBJECTS': '.cxx', # this does not sound right + 'GENCXXOBJECTS': '.cxx', # remark is in workdir/GenCxxObject 'OBJCOBJECTS': '.m', 'OBJCXXOBJECTS': '.mm', - 'YACCOBJECTS': '.y' - } + + # gbuildtojson defines but does not fill these: + 'ASMOBJECTS': '.s', + 'GENCOBJECTS': '.c', + 'YACCOBJECTS': '.y', + + # gbuildtojson need to be extended to fill these: + 'COBJECTS': '.c', + 'FLEXOBJECTS': '.l', + 'JAVAOBJECTS': '.java', + 'PYTHONOBJECTS': '.py' + } moduleDict = {} 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 << "{"; |