mapi_abi.py: remove no longer used --mode option

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>

diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk
index 44452181ec46314d6b0b41c047c24fd694ac08a4..552bab69625b826c9a661b5da17d0cc8f2f38d04 100644 (file)
--- a/src/mapi/Android.mk
+++ b/src/mapi/Android.mk
@@ -75,4 +75,4 @@ $(mapi_abi_headers): PRIVATE_APIXML := $(LOCAL_PATH)/glapi/gen/gl_and_es_API.xml
 $(mapi_abi_headers): $(mapi_abi_deps)
        @mkdir -p $(dir $@)
        @echo "target $(PRIVATE_PRINTER): $(PRIVATE_MODULE) <= $(PRIVATE_APIXML)"
-       $(hide) $(PRIVATE_SCRIPT) --printer $(PRIVATE_PRINTER) --mode lib $(PRIVATE_APIXML) > $@
+       $(hide) $(PRIVATE_SCRIPT) --printer $(PRIVATE_PRINTER) $(PRIVATE_APIXML) > $@

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index 61b8470437cdbe930b451fbae9a8362216f176cf..e5477364ce53717d2ba6e9dd35feeb6f7431d7b5 100644 (file)
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -93,7 +93,7 @@ endif
 
 shared-glapi/glapi_mapi_tmp.h : glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
        $(MKDIR_GEN)
-       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --mode lib --printer shared-glapi \
+       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --printer shared-glapi \
                $(srcdir)/glapi/gen/gl_and_es_API.xml > $@
 
 if HAVE_OPENGL
@@ -192,7 +192,7 @@ endif
 
 es1api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
        $(MKDIR_GEN)
-       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --mode lib --printer es1api \
+       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --printer es1api \
                $(srcdir)/glapi/gen/gl_and_es_API.xml > $@
 
 if HAVE_OPENGL_ES2
@@ -237,7 +237,7 @@ endif
 
 es2api/glapi_mapi_tmp.h: glapi/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
        $(MKDIR_GEN)
-       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --mode lib --printer es2api \
+       $(PYTHON_GEN) $(srcdir)/mapi_abi.py --printer es2api \
                $(srcdir)/glapi/gen/gl_and_es_API.xml > $@
 
 include $(top_srcdir)/install-lib-links.mk

diff --git a/src/mapi/glapi/gen/Makefile.am b/src/mapi/glapi/gen/Makefile.am
index a7e82d65afc31aff2d4fc8cdf3ccfbdd7af0cd21..ecd1c71175eb0afbe92eb25d1b37cc2b5f06e496 100644 (file)
--- a/src/mapi/glapi/gen/Makefile.am
+++ b/src/mapi/glapi/gen/Makefile.am
@@ -259,7 +259,7 @@ $(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h
 
 $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h: $(MESA_MAPI_DIR)/mapi_abi.py $(COMMON)
        $(PYTHON_GEN) $(MESA_MAPI_DIR)/mapi_abi.py \
-               --printer glapi --mode lib $(srcdir)/gl_and_es_API.xml > $@
+               --printer glapi $(srcdir)/gl_and_es_API.xml > $@
 
 $(MESA_GLAPI_DIR)/glprocs.h: gl_procs.py $(COMMON)
        $(PYTHON_GEN) $(srcdir)/gl_procs.py -c -f $(srcdir)/gl_and_es_API.xml > $@

diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py
index d6c505caa8168696915e6bad53d921792ab2204c..82a2511ec39ef7a7c5ec865823f2d2c2b7413449 100644 (file)
--- a/src/mapi/mapi_abi.py
+++ b/src/mapi/mapi_abi.py
@@ -771,17 +771,13 @@ typedef int GLclampx;
 
 def parse_args():
     printers = ['glapi', 'es1api', 'es2api', 'shared-glapi']
-    modes = ['lib', 'app']
 
     parser = OptionParser(usage='usage: %prog [options] <filename>')
     parser.add_option('-p', '--printer', dest='printer',
             help='printer to use: %s' % (", ".join(printers)))
-    parser.add_option('-m', '--mode', dest='mode',
-            help='target user: %s' % (", ".join(modes)))
 
     options, args = parser.parse_args()
-    if not args or options.printer not in printers or \
-            options.mode not in modes:
+    if not args or options.printer not in printers:
         parser.print_help()
         sys.exit(1)
 
@@ -804,8 +800,7 @@ def main():
     abi_sanity_check(entries)
 
     printer = printers[options.printer](entries)
-    if options.mode == 'lib':
-        printer.output_for_lib()
+    printer.output_for_lib()
 
 if __name__ == '__main__':
     main()

diff --git a/src/mapi/shared-glapi/SConscript b/src/mapi/shared-glapi/SConscript
index e5d45db5949c4a58c867b628706a237fe36afc1d..5d74bd6813fcea506bb8de1b2d926cfeb44b3465 100644 (file)
--- a/src/mapi/shared-glapi/SConscript
+++ b/src/mapi/shared-glapi/SConscript
@@ -32,7 +32,7 @@ def mapi_objects(env, printer, mode):
         script = '../mapi_abi.py',
         source = [GLAPI + 'gen/gl_and_es_API.xml'] + env.Glob(GLAPI + 'gen/*.xml'),
         command = python_cmd + ' $SCRIPT ' + \
-                '--printer %s --mode lib $SOURCE > $TARGET' % (printer),
+                '--printer %s $SOURCE > $TARGET' % (printer),
     )
 
     cpppath = [