vala r1752 - in trunk: . compiler gobject

[juergbi svn gnome org]

Author: juergbi
Date: Thu Aug 14 20:16:59 2008
New Revision: 1752
URL: http://svn.gnome.org/viewvc/vala?rev=1752&view=rev

Log:
2008-08-14  Levi Bard  <taktaktaktaktaktaktaktaktaktak gmail com>

	* gobject/valaccodecompiler.vala:
	* compiler/valacompiler.vala

	Prevent output filename concatenation when -d is passed with an
	absolute path to -o, fixes bug 547344


Modified:
   trunk/ChangeLog
   trunk/compiler/valacompiler.vala
   trunk/gobject/valaccodecompiler.vala

Modified: trunk/compiler/valacompiler.vala
==============================================================================
--- trunk/compiler/valacompiler.vala	(original)
+++ trunk/compiler/valacompiler.vala	Thu Aug 14 20:16:59 2008
@@ -293,8 +293,8 @@
 			string vapi_filename = "%s.vapi".printf (library);
 
 			// put .vapi file in current directory unless -d has been explicitly specified
-			if (directory != null) {
-				vapi_filename = "%s/%s".printf (context.directory, vapi_filename);
+			if (directory != null && !Path.is_absolute (vapi_filename)) {
+				vapi_filename = "%s%c%s".printf (context.directory, Path.DIR_SEPARATOR, vapi_filename);
 			}
 
 			interface_writer.write_file (context, vapi_filename);
@@ -304,8 +304,8 @@
 			string gidl_filename = "%s.gidl".printf (library);
 
 			// put .gidl file in current directory unless -d has been explicitly specified
-			if (directory != null) {
-				gidl_filename = "%s/%s".printf (context.directory, gidl_filename);
+			if (directory != null && !Path.is_absolute( gidl_filename)) {
+				gidl_filename = "%s%c%s".printf (context.directory, Path.DIR_SEPARATOR, gidl_filename);
 			}
 
 			gidl_writer.write_file (context, gidl_filename);

Modified: trunk/gobject/valaccodecompiler.vala
==============================================================================
--- trunk/gobject/valaccodecompiler.vala	(original)
+++ trunk/gobject/valaccodecompiler.vala	Thu Aug 14 20:16:59 2008
@@ -88,8 +88,8 @@
 			cmdline += " -c";
 		} else if (context.output != null) {
 			string output = context.output;
-			if (context.directory != null && context.directory != "") {
-				output = "%s/%s".printf (context.directory, context.output);
+			if (context.directory != null && context.directory != "" && !Path.is_absolute (context.output)) {
+				output = "%s%c%s".printf (context.directory, Path.DIR_SEPARATOR, context.output);
 			}
 			cmdline += " -o " + Shell.quote (output);
 		}