Bug 567813 – Everything should be versioned

2009-01-15  Johan Dahlin  <jdahlin@async.com.br>

        Bug 567813 – Everything should be versioned

        * gir/Makefile.am:
        * girepository/Makefile.am:
        * girepository/girepository.c (init_globals):
        * girepository/girparser.c (locate_gir):
        * giscanner/dumper.py:
        * giscanner/transformer.py:
        * gobject-introspection-1.0.pc.in:
        * tests/everything/Makefile.am:
        * tests/invoke/Makefile.am:
        * tests/offsets/Makefile.am:
        * tests/repository/Makefile.am:
        * tests/scanner/Makefile.am:
        * tools/Makefile.am:


svn path=/trunk/; revision=1046

14 files changed, 53 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index 91386465..5bddbc68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-01-15  Johan Dahlin  <jdahlin@async.com.br>
+
+	Bug 567813 – Everything should be versioned
+
+	* gir/Makefile.am:
+	* girepository/Makefile.am:
+	* girepository/girepository.c (init_globals):
+	* girepository/girparser.c (locate_gir):
+	* giscanner/dumper.py:
+	* giscanner/transformer.py:
+	* gobject-introspection-1.0.pc.in:
+	* tests/everything/Makefile.am:
+	* tests/invoke/Makefile.am:
+	* tests/offsets/Makefile.am:
+	* tests/repository/Makefile.am:
+	* tests/scanner/Makefile.am:
+	* tools/Makefile.am:
+
 2009-01-13  Johan Dahlin  <jdahlin@async.com.br>
 
 	Bug 555036 – put gtk-doc in GIR
diff --git a/gir/Makefile.am b/gir/Makefile.am
index 1f5bb138..1cc5a6a4 100644
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -136,7 +136,7 @@ GIRepository-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) $(GIREPOSIT
 	    --strip-prefix=g \
             --libtool="$(LIBTOOL)" \
             --include=GObject-2.0 \
-	    --library=girepository \
+	    --library=girepository-1.0 \
 	    -I$(srcdir)/girepository \
             --pkg glib-2.0 \
             --pkg gobject-2.0 \
@@ -145,13 +145,13 @@ BUILT_SOURCES += GIRepository-2.0.gir
 
 # Generic rules
 CLEANFILES = $(BUILT_SOURCES)
-girdir=$(datadir)/gir
+girdir=$(datadir)/gir-1.0
 dist_gir_DATA = $(BUILT_SOURCES)
 
 %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT)
 	$(DEBUG) $(top_builddir)/tools/g-ir-compiler$(EXEEXT) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
 
-typelibsdir = $(libdir)/girepository
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = 		\
 	GLib-2.0.typelib 	\
 	GModule-2.0.typelib	\
diff --git a/girepository/Makefile.am b/girepository/Makefile.am
index 4554d571..dc8a6cae 100644
--- a/girepository/Makefile.am
+++ b/girepository/Makefile.am
@@ -1,14 +1,14 @@
 include $(top_srcdir)/gcov.mak
 
-GCOVSOURCES = $(libgirepository_la_SOURCES)
+GCOVSOURCES = $(libgirepository_1_0_la_SOURCES)
 
 girepodir = $(includedir)/gobject-introspection-1.0/
 girepo_HEADERS = girepository.h
 
-lib_LTLIBRARIES = libgirepository.la
+lib_LTLIBRARIES = libgirepository-1.0.la
 noinst_LTLIBRARIES = libgirepository-parser.la
 
-libgirepository_la_SOURCES =			\
+libgirepository_1_0_la_SOURCES =		\
 	girepository.c				\
 	gtypelib.h				\
 	gtypelib.c				\
@@ -20,9 +20,9 @@ libgirepository_la_SOURCES =			\
 	gdump.c					\
 	ginvoke.c
 
-libgirepository_la_CPPFLAGS = $(GIREPO_CFLAGS)
-libgirepository_la_LIBADD = $(GIREPO_LIBS)
-libgirepository_la_LDFLAGS = -no-undefined
+libgirepository_1_0_la_CPPFLAGS = $(GIREPO_CFLAGS)
+libgirepository_1_0_la_LIBADD = $(GIREPO_LIBS)
+libgirepository_1_0_la_LDFLAGS = -no-undefined
 
 libgirepository_parser_la_SOURCES =		\
 	girmodule.c				\
diff --git a/girepository/girepository.c b/girepository/girepository.c
index 6b34e05b..f35854a7 100644
--- a/girepository/girepository.c
+++ b/girepository/girepository.c
@@ -132,7 +132,7 @@ init_globals (void)
 
       libdir = GOBJECT_INTROSPECTION_LIBDIR;
 
-      typelib_dir = g_build_filename (libdir, "girepository", NULL);
+      typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL);
 
       search_path = g_slist_prepend (search_path, typelib_dir);
 
diff --git a/girepository/girparser.c b/girepository/girparser.c
index 1072ecc5..381c334f 100644
--- a/girepository/girparser.c
+++ b/girepository/girparser.c
@@ -243,7 +243,7 @@ locate_gir (GIrParser  *parser,
     }
   for (dir = datadirs; *dir; dir++) 
     {
-      path = g_build_filename (*dir, "gir", girname, NULL);
+      path = g_build_filename (*dir, "gir-1.0", girname, NULL);
       if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
 	return path;
       g_free (path);
diff --git a/giscanner/dumper.py b/giscanner/dumper.py
index 45dcc25f..360ef9d5 100644
--- a/giscanner/dumper.py
+++ b/giscanner/dumper.py
@@ -49,7 +49,7 @@ main(int argc, char **argv)
   g_thread_init (NULL);
 
   context = g_option_context_new ("");
-  g_option_context_add_main_entries (context, entries, "girepository");
+  g_option_context_add_main_entries (context, entries, "girepository-1.0");
   g_option_context_add_group (context, g_irepository_get_option_group ());
   if (!g_option_context_parse (context, &argc, &argv, &error))
     {
@@ -182,10 +182,10 @@ class DumpCompiler(object):
         args.append('-L.')
 
         uninst_builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
-        # hack for building GIRepository.gir, skip -lgirepository since
-        # libgirepository.la is not in current directory and we refer to it
+        # hack for building GIRepository.gir, skip -lgirepository-1.0 since
+        # libgirepository-1.0.la is not in current directory and we refer to it
         # explicitly below anyway
-        if not uninst_builddir or self._options.libraries[0] != 'girepository':
+        if not uninst_builddir or self._options.libraries[0] != 'girepository-1.0':
             # We only use the first library; assume others are "custom"
             # libraries like from gir-repository.  Right now those don't define
             # new GTypes, so we don't need to introspect them.
@@ -194,7 +194,7 @@ class DumpCompiler(object):
         # hack for building gobject-introspection itself
         if uninst_builddir:
             path = os.path.join(uninst_builddir, 'girepository',
-                                'libgirepository.la')
+                                'libgirepository-1.0.la')
             args.append(path)
 
         args.extend(self._run_pkgconfig('--libs'))
diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index b7e8c5df..d31300e4 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -108,7 +108,7 @@ class Transformer(object):
     def _find_include(self, include):
         searchdirs = self._includepaths[:]
         for path in _xdg_data_dirs:
-            searchdirs.append(os.path.join(path, 'gir'))
+            searchdirs.append(os.path.join(path, 'gir-1.0'))
 
         girname = '%s-%s.gir' % (include.name, include.version)
         for d in searchdirs:
diff --git a/gobject-introspection-1.0.pc.in b/gobject-introspection-1.0.pc.in
index 78203158..f3f6004c 100644
--- a/gobject-introspection-1.0.pc.in
+++ b/gobject-introspection-1.0.pc.in
@@ -7,12 +7,12 @@ includedir=@includedir@
 g_ir_scanner=${bindir}/g-ir-scanner
 g_ir_compiler=${bindir}/g-ir-compiler
 g_ir_generate=${bindir}/g-ir-generate
-girdir=${prefix}/share/gir
-typelibdir=${libdir}/girepository
+girdir=${prefix}/share/gir-1.0
+typelibdir=${libdir}/girepository-1.0
 
 Cflags: -I${includedir}/gobject-introspection-1.0
 Requires: glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0
-Libs: -L${libdir} -lgirepository
+Libs: -L${libdir} -lgirepository-1.0
 
 Name: gobject-introspection
 Description: GObject Introspection
diff --git a/tests/everything/Makefile.am b/tests/everything/Makefile.am
index 5055dca5..72daa7dd 100644
--- a/tests/everything/Makefile.am
+++ b/tests/everything/Makefile.am
@@ -10,15 +10,15 @@ AM_CFLAGS = $(GOBJECT_CFLAGS)
 AM_LDFLAGS = -version-info $(LT_VERSION)
 LIBS = $(GOBJECT_LIBS)
 
-typelibsdir = $(libdir)/girepository
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(TYPELIBS)
 
-girsdir = $(datadir)/gir
+girsdir = $(datadir)/gir-1.0
 girs_DATA = $(GIRS)
 
-lib_LTLIBRARIES = libgirepository-everything.la
+lib_LTLIBRARIES = libgirepository-everything-1.0.la
 
-libgirepository_everything_la_SOURCES = $(srcdir)/everything.c $(srcdir)/everything.h
+libgirepository_everything_1_0_la_SOURCES = $(srcdir)/everything.c $(srcdir)/everything.h
 
 if OS_WIN32
 AM_LDFLAGS += -no-undefined
@@ -30,11 +30,11 @@ TXMLS = $(GIRS:.gir=.tgir)
 CLEANFILES = $(TYPELIBS) $(TXMLS) $(GIRS)
 BUILT_SOURCES = $(TYPELIBS) $(TXMLS) $(GIRS)
 
-Everything-$(TYPELIB_VERSION).gir: libgirepository-everything.la everything.c everything.h $(SCANNER_BIN) $(SCANNER_LIBS)
+Everything-$(TYPELIB_VERSION).gir: libgirepository-everything-1.0.la everything.c everything.h $(SCANNER_BIN) $(SCANNER_LIBS)
 	$(CHECK_DEBUG) $(SCANNER) \
 	--include=GObject-2.0 \
         --libtool="$(LIBTOOL)" \
-	--library=girepository-everything \
+	--library=girepository-everything-1.0 \
 	--namespace=Everything --nsversion=$(TYPELIB_VERSION) \
 	--pkg gobject-2.0 \
 	$(srcdir)/everything.h $(srcdir)/everything.c \
diff --git a/tests/invoke/Makefile.am b/tests/invoke/Makefile.am
index 2177bd79..54c28ffe 100644
--- a/tests/invoke/Makefile.am
+++ b/tests/invoke/Makefile.am
@@ -10,7 +10,7 @@ testfns_la_SOURCES =				\
 	testfns-metadata.c
 testfns_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 testfns_la_LDFLAGS = -module -avoid-version
-testfns_la_LIBADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
+testfns_la_LIBADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS)
 
 if OS_WIN32
 testfns_la_LDFLAGS += -no-undefined
@@ -24,11 +24,11 @@ testfns-metadata.c: testfns-1.0.gir $(top_builddir)/tools/g-ir-compiler Makefile
 
 invoke_SOURCES = invoke.c
 invoke_CFLAGS = $(GIREPO_CFLAGS)  -I$(top_srcdir)/girepository
-invoke_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
+invoke_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS)
 
 genericmarshaller_SOURCES = genericmarshaller.c
 genericmarshaller_CFLAGS = $(GIREPO_CFLAGS)  -I$(top_srcdir)/girepository
-genericmarshaller_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
+genericmarshaller_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS)
 
 TESTS = invoke genericmarshaller invoke-namespace-find.sh
 
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am
index d04b8015..8673aff9 100644
--- a/tests/offsets/Makefile.am
+++ b/tests/offsets/Makefile.am
@@ -39,7 +39,7 @@ check_PROGRAMS += gitestoffsets
 
 nodist_gitestoffsets_SOURCES = gitestoffsets.c
 gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
-gitestoffsets_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
+gitestoffsets_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS)
 
 gitestoffsets.c: gen-gitestoffsets offsets.h
 	$(PYTHON) $(srcdir)/gen-gitestoffsets $(srcdir)/offsets.h > $@ || ( rm -f $@ && false )
diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am
index 51e97673..1dd5c4c7 100644
--- a/tests/repository/Makefile.am
+++ b/tests/repository/Makefile.am
@@ -6,11 +6,11 @@ noinst_PROGRAMS = gitestrepo gitestthrows
 
 gitestrepo_SOURCES = $(srcdir)/gitestrepo.c
 gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
-gitestrepo_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
+gitestrepo_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS)
 
 gitestthrows_SOURCES = $(srcdir)/gitestthrows.c
 gitestthrows_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
-gitestthrows_LDADD = $(top_builddir)/girepository/libgirepository.la $(GIREPO_LIBS)
+gitestthrows_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la $(GIREPO_LIBS)
 
 TESTS = gitestrepo gitestthrows
 TESTS_ENVIRONMENT=env top_builddir="$(top_builddir)" $(DEBUG)
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index a3e52db7..36fb772b 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -106,7 +106,7 @@ GIRS += GtkFrob-1.0.gir
 noinst_PROGRAMS = barapp
 
 barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h
-barapp_LDADD = $(top_builddir)/girepository/libgirepository.la
+barapp_LDADD = $(top_builddir)/girepository/libgirepository-1.0.la
 barapp_LDFLAGS = -export-dynamic
 BarApp-1.0.gir: barapp $(SCANNER_BIN) $(SCANNER_LIBS) Makefile
 	$(SCANNER) \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 7997ee9f..706b5e30 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -12,13 +12,13 @@ g_ir_compiler_SOURCES = compiler.c
 g_ir_compiler_CFLAGS = $(GIREPO_CFLAGS)
 g_ir_compiler_LDADD = \
 	$(top_builddir)/girepository/libgirepository-parser.la \
-	$(top_builddir)/girepository/libgirepository.la \
+	$(top_builddir)/girepository/libgirepository-1.0.la \
 	$(GIREPO_LIBS)
 
 g_ir_generate_SOURCES = generate.c
 g_ir_generate_CFLAGS = $(GIREPO_CFLAGS)
 g_ir_generate_LDADD = \
-	$(top_builddir)/girepository/libgirepository.la \
+	$(top_builddir)/girepository/libgirepository-1.0.la \
 	$(GIREPO_LIBS)
 
 GCOVSOURCES =					\