Post-release version bump --version support always include config.h to

2006-10-25  Jürg Billeter  <j@bitron.ch>

	* configure.ac: Post-release version bump
	* compiler/valacompiler.vala: --version support
	* compiler/Makefile.am: always include config.h to keep compatibility
	* vapi/config.vala: add binding for config.h
	* vapi/Makefile.am: update

svn path=/trunk/; revision=149

diff --git a/vala/ChangeLog b/vala/ChangeLog
index 48486508ae68b60bad3327e15e73bb0b07989602..1c618e212bc21badf8f50e9b17b01dec128eac04 100644 (file)
--- a/vala/ChangeLog
+++ b/vala/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-25  Jürg Billeter  <j@bitron.ch>
+
+       * configure.ac: Post-release version bump
+       * compiler/valacompiler.vala: --version support
+       * compiler/Makefile.am: always include config.h to keep compatibility
+       * vapi/config.vala: add binding for config.h
+       * vapi/Makefile.am: update
+
 2006-10-25  Jürg Billeter  <j@bitron.ch>
 
        * vala/valasourcefile.vala: support dependencies on constants

diff --git a/vala/compiler/Makefile.am b/vala/compiler/Makefile.am
index 9da684b95671e92f9526bf28ab5672efb37cce0e..904ee232038c7b8054182e264f4066da722b27fd 100644 (file)
--- a/vala/compiler/Makefile.am
+++ b/vala/compiler/Makefile.am
@@ -18,9 +18,11 @@ valac_SOURCES = \
        $(NULL)
 
 valac.vala.stamp: $(filter %.vala,$(valac_SOURCES))
-       $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala $^
+       $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --pkg config $^
        touch $@
 
+valac_CPPFLAGS = -include config.h
+
 valac_LDADD = \
        $(GLIB_LIBS) \
        ../vala/libvala.la \

diff --git a/vala/compiler/valacompiler.vala b/vala/compiler/valacompiler.vala
index 87a68699834037fcef0b7eded9c88cc9c425e02a..de8bf5619999a554df3749cee43c4bf3d203eb09 100644 (file)
--- a/vala/compiler/valacompiler.vala
+++ b/vala/compiler/valacompiler.vala
@@ -224,6 +224,11 @@ class Vala.Compiler {
                        return 1;
                }
                
+               if (version) {
+                       stdout.printf ("Vala %s\n", Config.PACKAGE_VERSION);
+                       return 0;
+               }
+               
                if (sources == null) {
                        stderr.printf ("No source file specified.\n");
                        return 1;

diff --git a/vala/configure.ac b/vala/configure.ac
index 21db6710be8e19cb3a26cd8d35d6013eb389ab5c..4e6e3727d3450fa2dcaf5c426861d70dd843fe87 100644 (file)
--- a/vala/configure.ac
+++ b/vala/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([vala], [0.0.4], [j@bitron.ch], [vala])
+AC_INIT([vala], [0.0.5], [j@bitron.ch], [vala])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([dist-bzip2])

diff --git a/vala/vapi/Makefile.am b/vala/vapi/Makefile.am
index 70d0aaa6918a0b9de2e4486232a10bf33629959e..171da52600dfcd91cc435034b3c700943e7d6991 100644 (file)
--- a/vala/vapi/Makefile.am
+++ b/vala/vapi/Makefile.am
@@ -17,3 +17,7 @@ dist_vapi_DATA = \
        pango.vala \
        vala-1.0.vala \
        $(NULL)
+
+dist_noinst_DATA = \
+       config.vala \
+       $(NULL)

diff --git a/vala/vapi/config.vala b/vala/vapi/config.vala
new file mode 100644 (file)
index 0000000..b517368
--- /dev/null
+++ b/vala/vapi/config.vala
@@ -0,0 +1,26 @@
+/* config.vala
+ *
+ * Copyright (C) 2006  Jürg Billeter
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+ *
+ * Author:
+ *     Jürg Billeter <j@bitron.ch>
+ */
+
+[CCode (cprefix = "", cheader_filename = "config.h")]
+namespace Config {
+        public const string PACKAGE_VERSION;
+}