gobject-introspection r390 - in trunk: . gir tools

[walters svn gnome org]

Author: walters
Date: Sun Aug 17 15:06:49 2008
New Revision: 390
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=390&view=rev

Log:
Move .gir files to -good.gir, tweak build order.

	* gir/glib-2.0.gir, gir/gobject-2.0.gir:
	Rename to -good, always generate during build.
	* gir/Makefile.am: Ensure .gir files dep on
	all scanner sources.
	* Makefile.am: Switch build order to ensure
	the scanner is ready before we do gir/.
	* tools/g-ir-scanner: Look for .git too.


Added:
   trunk/gir/glib-2.0-good.gir
      - copied, changed from r389, /trunk/gir/glib-2.0.gir
   trunk/gir/gobject-2.0-good.gir
      - copied, changed from r389, /trunk/gir/gobject-2.0.gir
Removed:
   trunk/gir/glib-2.0.gir
   trunk/gir/gobject-2.0.gir
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/gir/Makefile.am
   trunk/tools/g-ir-scanner

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Aug 17 15:06:49 2008
@@ -18,7 +18,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gir girepository giscanner tools tests
+SUBDIRS = girepository giscanner tools gir tests
 DIST_SUBDIRS = m4 $(SUBDIRS)
 
 man_MANS = docs/g-ir-scanner.1

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Sun Aug 17 15:06:49 2008
@@ -1,11 +1,13 @@
 BUILT_SOURCES = 
 
 G_IR_SCANNER = $(top_srcdir)/tools/g-ir-scanner
+G_IR_SCANNER_FILES = $(top_srcdir)/giscanner/*.py \
+	$(top_builddir)/giscanner/libgiscanner.la
 
 # glib
 GLIB_INCLUDEDIR=`pkg-config --variable=includedir glib-2.0`/glib-2.0
 GLIB_LIBDIR=`pkg-config --variable=libdir glib-2.0`
-glib-2.0.gir: $(G_IR_SCANNER)
+glib-2.0.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES)
 	$(G_IR_SCANNER) -v --namespace GLib \
 	    --output $@ \
 	    --strip-prefix=g \
@@ -18,7 +20,7 @@
 
 # gobject
 GOBJECT_LIBDIR=`pkg-config --variable=libdir gobject-2.0`
-gobject-2.0.gir: $(G_IR_SCANNER)
+gobject-2.0.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES)
 	$(G_IR_SCANNER) -v --namespace GObject \
 	    --output $@ \
 	    --strip-prefix=g \
@@ -32,3 +34,5 @@
 
 girdir=$(datadir)/gir
 dist_gir_DATA = $(BUILT_SOURCES)
+
+EXTRA_DIST = glib-2.0-good.gir gobject-2.0-good.gir

Copied: trunk/gir/glib-2.0-good.gir (from r389, /trunk/gir/glib-2.0.gir)
==============================================================================

Copied: trunk/gir/gobject-2.0-good.gir (from r389, /trunk/gir/gobject-2.0.gir)
==============================================================================

Modified: trunk/tools/g-ir-scanner
==============================================================================
--- trunk/tools/g-ir-scanner	(original)
+++ trunk/tools/g-ir-scanner	Sun Aug 17 15:06:49 2008
@@ -27,7 +27,8 @@
 # This only works on unix systems
 currentdir = os.path.dirname(os.path.abspath(sys.argv[0]))
 basedir = os.path.abspath(os.path.join(currentdir, '..'))
-if os.path.exists(os.path.join(basedir, '.svn')):
+if (os.path.exists(os.path.join(basedir, '.svn')) or
+    os.path.exists(os.path.join(basedir, '.git'))):
     path = basedir
 else:
     path = os.path.join(basedir, 'lib', 'python%d.%d' % sys.version_info[:2],