Bug 552858: versioning

	This is a big patch.  You should probably remove your installation
	tree to be cleaner.

	* docs/typelib-format.txt: Add nsversion entry which holds
	version of namespace.
	* girepository/girepository.h: Add 'version' parameter to
	g_irepository_require.  This may be NULL.  Normally
	bindings should pass an explicit version though.
	* girepository/girepository.c: Lots of infrastructure to
	support versioning.  Add some more documentation.  Disallow
	some usage of NULL namespaces.
	* girepository/girmodule.c: Add version parameter.
	* girepository/gtypelib.c: Update header size.
	* giscanner/ast.py: Add version to Namespace.
	* giscanner/girparser.py: Parse version attribute from
	XML, pass to Namespace.
	* giscanner/girwriter.py: Write out version parameter.
	* giscanner/transformer.py: Clean up include registration.
	* tests/*: Add version attribute.
	* tests/invoke/invoke.c: Don't try looking up test before
	it's loaded in repository.
	* tools/generate.c: Output version parameter.
	* gir/Makefile.am: Add 2.0 version to .gir files.

svn path=/trunk/; revision=677

1 files changed, 17 insertions, 17 deletions

diff --git a/gir/Makefile.am b/gir/Makefile.am
index a31cdffe..dbe52a9a 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -14,9 +14,9 @@ else
 GLIB_LIBRARY=glib-2.0
 endif
 
-GLib.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile
+GLib-2.0.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile
 	PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \
-	    -v --namespace GLib \
+	    -v --namespace GLib --nsversion=2.0 \
 	    --noclosure \
 	    --output $@ \
 	    --strip-prefix=g \
@@ -29,8 +29,8 @@ GLib.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile
 	    $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
 	    $(GLIB_INCLUDEDIR)/glib/*.h
 	PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \
-	    --xpath-assertions=GLib-assertions.txt GLib.gir	
-BUILT_SOURCES += GLib.gir
+	    --xpath-assertions=GLib-assertions.txt GLib-2.0.gir	
+BUILT_SOURCES += GLib-2.0.gir
 
 # gobject
 GOBJECT_INCLUDEDIR=`pkg-config --variable=includedir gobject-2.0`/glib-2.0
@@ -42,20 +42,20 @@ else
 GOBJECT_LIBRARY=gobject-2.0
 endif
 
-GObject.gir: GLib.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile
+GObject-2.0.gir: GLib-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile
 	PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \
-	    -v --namespace GObject \
+	    -v --namespace GObject --nsversion=2.0 \
 	    --noclosure \
 	    --output $@ \
 	    --strip-prefix=g \
-            --include=$(top_builddir)/gir/GLib.gir \
+            --include=$(top_builddir)/gir/GLib-2.0.gir \
 	    --library=$(GOBJECT_LIBRARY) \
 	    -I$(GOBJECT_INCLUDEDIR) \
 	    -I$(GOBJECT_LIBDIR)/glib-2.0/include \
 	    -DGOBJECT_COMPILATION \
             --pkg glib-2.0 \
 	    $(GLIB_INCLUDEDIR)/gobject/*.h
-BUILT_SOURCES += GObject.gir
+BUILT_SOURCES += GObject-2.0.gir
 
 # gmodule
 GMODULE_INCLUDEDIR=`pkg-config --variable=includedir gmodule-2.0`/glib-2.0
@@ -67,19 +67,19 @@ else
 GMODULE_LIBRARY=gmodule-2.0
 endif
 
-GModule.gir: GLib.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES)
+GModule-2.0.gir: GLib-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES)
 	PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \
-	    -v --namespace GModule \
+	    -v --namespace GModule --nsversion=2.0 \
 	    --noclosure \
 	    --output $@ \
 	    --strip-prefix=g \
-            --include=$(top_builddir)/gir/GLib.gir \
+            --include=$(top_builddir)/gir/GLib-2.0.gir \
 	    --library=$(GMODULE_LIBRARY) \
 	    -I$(GMODULE_INCLUDEDIR) \
 	    -I$(GMODULE_LIBDIR)/glib-2.0/include \
             --pkg glib-2.0 \
 	    $(GLIB_INCLUDEDIR)/gmodule.h
-BUILT_SOURCES += GModule.gir
+BUILT_SOURCES += GModule-2.0.gir
 
 # gio
 GIO_INCLUDEDIR=`pkg-config --variable=includedir gio-2.0`/glib-2.0
@@ -91,13 +91,13 @@ else
 GIO_LIBRARY=gio-2.0
 endif
 
-Gio.gir: GObject.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile
+Gio-2.0.gir: GObject-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile
 	PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \
-	    -v --namespace Gio \
+	    -v --namespace Gio --nsversion=2.0 \
 	    --noclosure \
 	    --output $@ \
 	    --strip-prefix=g \
-            --include=$(top_builddir)/gir/GObject.gir \
+            --include=$(top_builddir)/gir/GObject-2.0.gir \
 	    --library=$(GIO_LIBRARY) \
 	    -I$(GIO_INCLUDEDIR) \
 	    -I$(GIO_LIBDIR)/glib-2.0/include \
@@ -105,7 +105,7 @@ Gio.gir: GObject.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile
             --pkg glib-2.0 \
             --pkg gobject-2.0 \
 	    $(GLIB_INCLUDEDIR)/gio/*.h
-BUILT_SOURCES += Gio.gir
+BUILT_SOURCES += Gio-2.0.gir
 CLEANFILES = $(BUILT_SOURCES)
 
 girdir=$(datadir)/gir
@@ -115,5 +115,5 @@ dist_gir_DATA = $(BUILT_SOURCES)
 	$(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
 
 typelibsdir = $(datadir)/girepository
-typelibs_DATA = GLib.typelib GModule.typelib GObject.typelib Gio.typelib
+typelibs_DATA = GLib-2.0.typelib GModule-2.0.typelib GObject-2.0.typelib Gio-2.0.typelib
 CLEANFILES += $(typelibs_DATA)