use .vapi as file extension for bindings, fixes bug 483840

2007-10-08  Juerg Billeter  <j@bitron.ch>

	* vala/valaparser.vala, compiler/valacompiler.vala: use .vapi as file
	  extension for bindings, fixes bug 483840

svn path=/trunk/; revision=642

diff --git a/ChangeLog b/ChangeLog
index 49edb980a9e376f07170d4ce8bc2a24171da3f03..3b5fe1e95862050eb0834aa38d9d29ea3d5ec980 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-08  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valaparser.vala, compiler/valacompiler.vala: use .vapi as file
+         extension for bindings, fixes bug 483840
+
 2007-10-08  Jürg Billeter  <j@bitron.ch>
 
        * gobject/valaccodegenerator.vala: fix ref array parameters

diff --git a/compiler/valacompiler.vala b/compiler/valacompiler.vala
index f8aae38455dae4129260f7efe0c02e0b50541935..8b82f0b6352ff48f31485d08bf1662e3399b527f 100644 (file)
--- a/compiler/valacompiler.vala
+++ b/compiler/valacompiler.vala
@@ -82,7 +82,8 @@ class Vala.Compiler : Object {
        }
        
        private string get_package_path (string! pkg) {
-               string basename = "%s.vala".printf (pkg);
+               string basename = "%s.vapi".printf (pkg);
+               string basename_old = "%s.vala".printf (pkg);
 
                if (vapi_directories != null) {
                        foreach (string vapidir in vapi_directories) {
@@ -90,6 +91,10 @@ class Vala.Compiler : Object {
                                if (FileUtils.test (filename, FileTest.EXISTS)) {
                                        return filename;
                                }
+                               var filename_old = Path.build_filename (vapidir, basename_old);
+                               if (FileUtils.test (filename_old, FileTest.EXISTS)) {
+                                       return filename_old;
+                               }
                        }
                }
 
@@ -98,16 +103,31 @@ class Vala.Compiler : Object {
                        return filename;
                }
 
+               string filename_old = Path.build_filename (Config.PACKAGE_DATADIR, "vapi", basename_old);
+               if (FileUtils.test (filename_old, FileTest.EXISTS)) {
+                       return filename_old;
+               }
+
                filename = Path.build_filename ("/usr/local/share/vala/vapi", basename);
                if (FileUtils.test (filename, FileTest.EXISTS)) {
                        return filename;
                }
 
+               filename_old = Path.build_filename ("/usr/local/share/vala/vapi", basename_old);
+               if (FileUtils.test (filename_old, FileTest.EXISTS)) {
+                       return filename_old;
+               }
+
                filename = Path.build_filename ("/usr/share/vala/vapi", basename);
                if (FileUtils.test (filename, FileTest.EXISTS)) {
                        return filename;
                }
 
+               filename_old = Path.build_filename ("/usr/share/vala/vapi", basename_old);
+               if (FileUtils.test (filename_old, FileTest.EXISTS)) {
+                       return filename_old;
+               }
+
                return null;
        }
        
@@ -194,10 +214,12 @@ class Vala.Compiler : Object {
                        if (FileUtils.test (source, FileTest.EXISTS)) {
                                if (source.has_suffix (".vala")) {
                                        context.add_source_file (new SourceFile (context, source));
+                               } else if (source.has_suffix (".vapi")) {
+                                       context.add_source_file (new SourceFile (context, source, true));
                                } else if (source.has_suffix (".c")) {
                                        context.add_c_source_file (source);
                                } else {
-                                       Report.error (null, "%s is not a supported source file type. Only .vala and .c files are supported.".printf (source));
+                                       Report.error (null, "%s is not a supported source file type. Only .vala, .vapi, and .c files are supported.".printf (source));
                                }
                        } else {
                                Report.error (null, "%s not found".printf (source));
@@ -259,6 +281,7 @@ class Vala.Compiler : Object {
                if (library != null) {
                        var interface_writer = new InterfaceWriter ();
                        interface_writer.write_file (context, "%s.vala".printf (library));
+                       interface_writer.write_file (context, "%s.vapi".printf (library));
                        
                        library = null;
                }

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index b502aacdd709f5e0a50e098dcb9aa62c526c5b0f..cc4039abe96ef3f65f170dad197ad591671e1a51 100644 (file)
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -40,7 +40,7 @@ public class Vala.Parser : CodeVisitor {
        }
 
        public override void visit_source_file (SourceFile! source_file) {
-               if (source_file.filename.has_suffix (".vala")) {
+               if (source_file.filename.has_suffix (".vala") || source_file.filename.has_suffix (".vapi")) {
                        parse_file (source_file);
                        source_file.comment = _file_comment;
                }