generate-casts-c.py, xml-to-h.py: Don't search for xml files in pwd

Some python scripts attempt to read xml files (located in the sources)
assuming they are present in the current directory.  This works when building
in the source dir, but breaks building in a separate build dir.

Fix this by adding an xmldir argument to these scripts.

Author: vries

Makefile

@@ -18,6 +18,7 @@
 ifneq ($(srcdir),)
 VPATH = $(srcdir)
 endif
+xmldir = $(srcdir)./gcc-c-api/
 
 .PHONY: all clean debug dump_gimple plugin show-ssa tarball \
 	test-suite testcpychecker testcpybuilder testdejagnu \
@@ -194,7 +195,7 @@ $(PLUGIN_GENERATED_SOURCE_FILES): autogenerated-%.c: generate-%-c.py $(GENERATOR
 	$(PYTHON) $< > $@
 
 autogenerated-casts.c:  autogenerated-gimple-types.txt autogenerated-tree-types.txt autogenerated-rtl-types.txt generate-casts-c.py
-	$(PYTHON) $(srcdir)generate-casts-c.py autogenerated-casts.c autogenerated-casts.h
+	$(PYTHON) $(srcdir)generate-casts-c.py autogenerated-casts.c autogenerated-casts.h $(xmldir)
 
 autogenerated-gimple.c: autogenerated-gimple-types.txt autogenerated-tree-types.txt autogenerated-rtl-types.txt maketreetypes.py
 autogenerated-tree.c: autogenerated-tree-types.txt maketreetypes.py

gcc-c-api/Makefile

@@ -18,6 +18,7 @@
 ifneq ($(srcdir),)
 VPATH = $(srcdir)
 endif
+xmldir = $(srcdir)./
 
 .PHONY: all clean check-api
 
@@ -97,7 +98,7 @@ $(OBJECT_FILES): %.o: %.c $(GENERATED_HEADERS) ../autogenerated-EXTRA_CFLAGS.txt
 	$(COMPILE.c) $(shell cat ../autogenerated-EXTRA_CFLAGS.txt) $(OUTPUT_OPTION) $<
 
 autogenerated-casts.c: $(SOURCE_XML) xmltypes.py generate-casts-c.py
-	$(PYTHON) generate-casts-c.py $@
+	$(PYTHON) $(srcdir)./generate-casts-c.py $@ $(xmldir)
 
 clean:
 	$(RM) *.so *.o $(GENERATED_HEADERS)
@@ -110,7 +111,7 @@ install: $(LIBGCC_C_API_SO)
 PYTHON=python
 
 $(GENERATED_HEADERS): $(SOURCE_XML) xml-to-h.py xmltypes.py
-	$(PYTHON) xml-to-h.py
+	$(PYTHON) $(srcdir)./xml-to-h.py $(xmldir)
 
 check-api:
 	xmllint --noout --relaxng api.rng *.xml

gcc-c-api/generate-casts-c.py

@@ -55,9 +55,9 @@ def write_footer(out):
 */
 ''')
 
-def main(c_filename):
+def main(c_filename, xmldir):
     registry = ApiRegistry()
-    for xmlfile in sorted(glob.glob('*.xml')):
+    for xmlfile in sorted(glob.glob(xmldir + '*.xml')):
         api = Api(registry, xmlfile)
 
     with open(c_filename, 'w') as c_out:
@@ -86,4 +86,5 @@ def main(c_filename):
 
         write_footer(c_out)
 
-main(c_filename=sys.argv[1])
+main(c_filename=sys.argv[1],
+     xmldir=sys.argv[2])

gcc-c-api/xml-to-h.py

@@ -293,7 +293,8 @@ def write_semiprivate_types(registry, out):
     write_footer(out)
 
 registry = ApiRegistry()
-for xmlfile in sorted(glob.glob('*.xml')):
+xmldir=sys.argv[1]
+for xmlfile in sorted(glob.glob(xmldir + '*.xml')):
     api = Api(registry, xmlfile)
 for api in registry.apis:
     with open(api.get_header_filename(), 'w') as f:

generate-casts-c.py

@@ -103,9 +103,9 @@ def write_h(registry, h_out):
                     % (subclass.get_c_name(), subclass.get_c_name()))
     write_footer(h_out)
 
-def main(c_filename, h_filename):
+def main(c_filename, h_filename, xmldir):
     registry = ApiRegistry()
-    for xmlfile in sorted(glob.glob('gcc-c-api/*.xml')):
+    for xmlfile in sorted(glob.glob(xmldir + '*.xml')):
         api = Api(registry, xmlfile)
 
     with open(c_filename, 'w') as c_out:
@@ -116,4 +116,5 @@ def main(c_filename, h_filename):
 
 
 main(c_filename=sys.argv[1],
-     h_filename=sys.argv[2])
+     h_filename=sys.argv[2],
+     xmldir=sys.argv[3])