move code generator to new gobject directory update

2007-05-03  Jürg Billeter  <j@bitron.ch>

	* gobject/valacodegenerator.vala: move code generator to new gobject
	  directory
	* configure.ac, Makefile.am, vala/Makefile.am, gobject/Makefile.am,
	  compiler/Makefile.am, vapi/Makefile.am: update

svn path=/trunk/; revision=305

diff --git a/ChangeLog b/ChangeLog
index 2092ed023b7ecf2337d28007b6334adf6d970927..02ddfdf6d5473c555f27114eaf331c7c8d634556 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-03  Jürg Billeter  <j@bitron.ch>
+
+       * gobject/valacodegenerator.vala: move code generator to new gobject
+         directory
+       * configure.ac, Makefile.am, vala/Makefile.am, gobject/Makefile.am,
+         compiler/Makefile.am, vapi/Makefile.am: update
+
 2007-05-03  Jürg Billeter  <j@bitron.ch>
 
        * vapi/glib-2.0.vala: GSList fixes and GIConv, patch by Michael Lawrence

diff --git a/Makefile.am b/Makefile.am
index bf68bd39accff2d91253d15b7055badd890b2817..c5f2660388bacf5862b307888a3d58fd213de9fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,7 @@ endif
 SUBDIRS = \
        ccode \
        vala \
+       gobject \
        compiler \
        vapi \
        tests \
@@ -20,6 +21,7 @@ SUBDIRS = \
 DIST_SUBDIRS = \
        ccode \
        vala \
+       gobject \
        compiler \
        vapi \
        tests \

diff --git a/compiler/Makefile.am b/compiler/Makefile.am
index 9cbd624b4d52660006b00d5390ee136019479b0c..8b3e00cdfd8c76427cbf183dcb0fe88b56bc2343 100644 (file)
--- a/compiler/Makefile.am
+++ b/compiler/Makefile.am
@@ -18,7 +18,7 @@ valac_SOURCES = \
        $(NULL)
 
 valac.vala.stamp: $(filter %.vala,$(valac_SOURCES))
-       $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --pkg config $^
+       $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject --pkg gobject --pkg config $^
        touch $@
 
 valac_CPPFLAGS = \
@@ -27,7 +27,7 @@ valac_CPPFLAGS = \
 
 valac_LDADD = \
        $(GLIB_LIBS) \
-       ../vala/libvala.la \
+       ../gobject/libvala.la \
        $(NULL)
 
 EXTRA_DIST = valac.vala.stamp

diff --git a/configure.ac b/configure.ac
index 4a5d4fe842908fabbaa66941dc5fef2933f2dcde..c5ccf4b541746f9b1288334988cc74a7c1e3a37e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ AC_CONFIG_FILES([Makefile
            vala-1.0.pc
            ccode/Makefile
            vala/Makefile
+           gobject/Makefile
            compiler/Makefile
            vapi/Makefile
            tests/Makefile

diff --git a/gobject/Makefile.am b/gobject/Makefile.am
new file mode 100644 (file)
index 0000000..3978b17
--- /dev/null
+++ b/gobject/Makefile.am
@@ -0,0 +1,35 @@
+NULL =
+
+INCLUDES = \
+       $(GLIB_CFLAGS) \
+       $(NULL)
+
+BUILT_SOURCES = gobject.vala.stamp
+
+lib_LTLIBRARIES = \
+       libvala.la
+       $(NULL)
+
+libvala_la_SOURCES = \
+       gobject.vala.stamp \
+       valacodegenerator.c \
+       valacodegenerator.h \
+       valacodegenerator.vala \
+       $(NULL)
+
+gobjectincludedir = $(includedir)/vala-1.0/gobject
+
+gobjectinclude_HEADERS = \
+       valacodegenerator.h \
+       $(NULL)
+
+gobject.vala gobject.vala.stamp: $(filter %.vala,$(libvala_la_SOURCES))
+       $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --library gobject $^
+       touch $@
+
+libvala_la_LIBADD = \
+       $(GLIB_LIBS) \
+       ../vala/libvalacore.la \
+       $(NULL)
+
+EXTRA_DIST = gobject.vala gobject.vala.stamp

diff --git a/vala/valacodegenerator.vala b/gobject/valacodegenerator.vala
similarity index 99%
rename from vala/valacodegenerator.vala
rename to gobject/valacodegenerator.vala
index 8a88071427c4f1d0c313c0024c79d7184a63364e..f1f0b144d752c08d5ec675ea1459c154c4a2530c 100644 (file)
--- a/vala/valacodegenerator.vala
+++ b/gobject/valacodegenerator.vala
@@ -3162,7 +3162,7 @@ public class Vala.CodeGenerator : CodeVisitor {
                }
                
                if (array_expr is ArrayCreationExpression) {
-                       var size = ((ArrayCreationExpression) array_expr).get_sizes ();
+                       List<weak Expression> size = ((ArrayCreationExpression) array_expr).get_sizes ();
                        var length_expr = (Expression) size.nth_data (dim - 1);
                        return (CCodeExpression) length_expr.ccodenode;
                } else if (array_expr.symbol_reference != null) {

diff --git a/vala/Makefile.am b/vala/Makefile.am
index f9a1fb15cc1da7ff5c2e3acaefa418d49ed777b9..73f724be0ae7b532da10953ccbf77222063b570d 100644 (file)
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -7,11 +7,11 @@ INCLUDES = \
 BUILT_SOURCES = parser.h vala.vala.stamp
 AM_YFLAGS = -d
 
-lib_LTLIBRARIES = \
-       libvala.la
+noinst_LTLIBRARIES = \
+       libvalacore.la
        $(NULL)
 
-libvala_la_SOURCES = \
+libvalacore_la_SOURCES = \
        parser.y \
        scanner.l \
        vala.h \
@@ -76,9 +76,6 @@ libvala_la_SOURCES = \
        valacodecontext.c \
        valacodecontext.h \
        valacodecontext.vala \
-       valacodegenerator.c \
-       valacodegenerator.h \
-       valacodegenerator.vala \
        valacodenode.c \
        valacodenode.h \
        valacodenode.vala \
@@ -352,7 +349,6 @@ valainclude_HEADERS = \
        valaclass.h \
        valaclassregisterfunction.h \
        valacodecontext.h \
-       valacodegenerator.h \
        valacodenode.h \
        valacodevisitor.h \
        valaconditionalexpression.h \
@@ -438,11 +434,11 @@ valainclude_HEADERS = \
        valawhilestatement.h \
        $(NULL)
 
-vala.vala vala.vala.stamp: $(filter %.vala,$(libvala_la_SOURCES))
+vala.vala vala.vala.stamp: $(filter %.vala,$(libvalacore_la_SOURCES))
        $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../ccode --pkg ccode --library vala $^
        touch $@
 
-libvala_la_LIBADD = \
+libvalacore_la_LIBADD = \
        $(GLIB_LIBS) \
        ../ccode/libvalaccode.la \
        $(NULL)

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index a38d048af7d0bdca5bd8461b4b5ef7baed1d6de2..c8a654b10061c18a838aa6236a3abadd0de52f7b 100644 (file)
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 vapidir = $(pkgdatadir)/vapi
 
-vala-1.0.vala: ../ccode/ccode.vala ../vala/vala.vala
+vala-1.0.vala: ../ccode/ccode.vala ../vala/vala.vala ../gobject/gobject.vala
        cat $^ > $@
 
 dist_vapi_DATA = \