vala r1324 - in trunk: . ccode compiler gee gen-project gobject tests vala vapigen

[juergbi svn gnome org]

Author: juergbi
Date: Sat Apr 26 16:54:01 2008
New Revision: 1324
URL: http://svn.gnome.org/viewvc/vala?rev=1324&view=rev

Log:
2008-04-26  Juerg Billeter  <j bitron ch>

	* compiler/valacompiler.vala:

	Build executable by default

	* ccode/Makefile.am:
	* compiler/Makefile.am:
	* gee/Makefile.am:
	* gen-project/Makefile.am:
	* gobject/Makefile.am:
	* tests/testrunner.sh:
	* vala/Makefile.am:
	* vapigen/Makefile.am:

	Update build system to use -C


Modified:
   trunk/ChangeLog
   trunk/ccode/Makefile.am
   trunk/compiler/Makefile.am
   trunk/compiler/valacompiler.vala
   trunk/gee/Makefile.am
   trunk/gen-project/Makefile.am
   trunk/gobject/Makefile.am
   trunk/tests/testrunner.sh
   trunk/vala/Makefile.am
   trunk/vapigen/Makefile.am

Modified: trunk/ccode/Makefile.am
==============================================================================
--- trunk/ccode/Makefile.am	(original)
+++ trunk/ccode/Makefile.am	Sat Apr 26 16:54:01 2008
@@ -76,7 +76,7 @@
 	$(NULL)
 
 ccode.vapi ccode.vala.stamp: $(libvalaccode_la_VALASOURCES)
-	$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --basedir $(top_srcdir) --library ccode $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --basedir $(top_srcdir) --library ccode $^
 	touch $@
 
 libvalaccode_la_LIBADD = \

Modified: trunk/compiler/Makefile.am
==============================================================================
--- trunk/compiler/Makefile.am	(original)
+++ trunk/compiler/Makefile.am	Sat Apr 26 16:54:01 2008
@@ -24,7 +24,7 @@
 	$(NULL)
 
 valac.vala.stamp: $(valac_VALASOURCES)
-	$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject --pkg gobject --pkg config --basedir $(top_srcdir) $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject --pkg gobject --pkg config --basedir $(top_srcdir) $^
 	touch $@
 
 valac_LDADD = \

Modified: trunk/compiler/valacompiler.vala
==============================================================================
--- trunk/compiler/valacompiler.vala	(original)
+++ trunk/compiler/valacompiler.vala	Sat Apr 26 16:54:01 2008
@@ -138,9 +138,14 @@
 	private int run () {
 		context = new CodeContext ();
 
-		/* support old command line interface */
+		// default to build executable
 		if (!ccode_only && !compile_only && output == null) {
-			ccode_only = true;
+			// strip extension if there is one
+			// else we use the default output file of the C compiler
+			if (sources[0].rchr (-1, '.') != null) {
+				long dot = sources[0].pointer_to_offset (sources[0].rchr (-1, '.'));
+				output = Path.get_basename (sources[0].substring (0, dot));
+			}
 		}
 
 		context.library = library;

Modified: trunk/gee/Makefile.am
==============================================================================
--- trunk/gee/Makefile.am	(original)
+++ trunk/gee/Makefile.am	Sat Apr 26 16:54:01 2008
@@ -40,7 +40,7 @@
 	$(NULL)
 
 gee.vapi gee.vala.stamp: $(libgee_la_VALASOURCES)
-	$(VALAC) --vapidir $(srcdir)/../vapi --basedir $(top_srcdir) --library gee $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --basedir $(top_srcdir) --library gee $^
 	touch $@
 
 libgee_la_LIBADD = \

Modified: trunk/gen-project/Makefile.am
==============================================================================
--- trunk/gen-project/Makefile.am	(original)
+++ trunk/gen-project/Makefile.am	Sat Apr 26 16:54:01 2008
@@ -29,7 +29,7 @@
 	$(NULL)
 
 vala-gen-project.vala.stamp: $(vala_gen_project_VALASOURCES)
-	$(VALAC) --vapidir $(srcdir)/../vapi --pkg config --pkg gtk+-2.0 --basedir $(top_srcdir) $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --pkg config --pkg gtk+-2.0 --basedir $(top_srcdir) $^
 	touch $@
 
 vala_gen_project_LDADD = \

Modified: trunk/gobject/Makefile.am
==============================================================================
--- trunk/gobject/Makefile.am	(original)
+++ trunk/gobject/Makefile.am	Sat Apr 26 16:54:01 2008
@@ -50,7 +50,7 @@
 	$(NULL)
 
 gobject.vapi gobject.vala.stamp: $(libvala_la_VALASOURCES)
-	$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --basedir $(top_srcdir) --library gobject $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --basedir $(top_srcdir) --library gobject $^
 	touch $@
 
 libvala_la_LDFLAGS = -no-undefined

Modified: trunk/tests/testrunner.sh
==============================================================================
--- trunk/tests/testrunner.sh	(original)
+++ trunk/tests/testrunner.sh	Sat Apr 26 16:54:01 2008
@@ -1,7 +1,7 @@
 #!/bin/bash
 # testrunner.sh
 #
-# Copyright (C) 2006-2007  JÃrg Billeter
+# Copyright (C) 2006-2008  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
@@ -43,7 +43,7 @@
 do
 	testsrc=${testcasesource/.vala/}
 	testbuild=`basename "$testsrc"`
-	if ! $VALAC --vapidir "$vapidir" --pkg gee-1.0 --basedir $topsrcdir -d $topbuilddir $testsrc.vala > $testbuild.err 2>&1
+	if ! $VALAC -C --vapidir "$vapidir" --pkg gee-1.0 --basedir $topsrcdir -d $topbuilddir $testsrc.vala > $testbuild.err 2>&1
 	then
 		CODE=1
 		continue

Modified: trunk/vala/Makefile.am
==============================================================================
--- trunk/vala/Makefile.am	(original)
+++ trunk/vala/Makefile.am	Sat Apr 26 16:54:01 2008
@@ -159,7 +159,7 @@
 	$(NULL)
 
 vala.vapi vala.vala.stamp: $(libvalacore_la_VALASOURCES)
-	$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --pkg config --basedir $(top_srcdir) --library vala $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --pkg config --basedir $(top_srcdir) --library vala $^
 	touch $@
 
 libvalacore_la_LIBADD = \

Modified: trunk/vapigen/Makefile.am
==============================================================================
--- trunk/vapigen/Makefile.am	(original)
+++ trunk/vapigen/Makefile.am	Sat Apr 26 16:54:01 2008
@@ -41,11 +41,11 @@
 	$(NULL)
 
 vapigen.vala.stamp: $(vapigen_VALASOURCES)
-	$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config --basedir $(top_srcdir) $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config --basedir $(top_srcdir) $^
 	touch $@
 
 vapicheck.vala.stamp: $(vapicheck_VALASOURCES)
-	$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config --basedir $(top_srcdir) $^
+	$(VALAC) -C --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config --basedir $(top_srcdir) $^
 	touch $@
 
 vapigen_LDADD = \