Commit b3940e54 authored by Jürg Billeter's avatar Jürg Billeter Committed by Jürg Billeter

Use --basedir in build system and rename all VAPI files to .vapi, requires

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

	Use --basedir in build system and rename all VAPI files to .vapi,
	requires r646 to build

svn path=/trunk/; revision=647
parent 1296b89e
2007-10-09 Jürg Billeter <j@bitron.ch>
Use --basedir in build system and rename all VAPI files to .vapi,
requires r646 to build
2007-10-09 Jürg Billeter <j@bitron.ch>
* vala/valacodecontext.vala, vala/valasourcefile.vala,
......
......@@ -215,12 +215,12 @@ ccodeinclude_HEADERS = \
valaccodeelementaccess.h \
$(NULL)
ccode.vala ccode.vala.stamp: $(filter %.vala,$(libvalaccode_la_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --library ccode $^
ccode.vapi ccode.vala.stamp: $(filter %.vala,$(libvalaccode_la_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --basedir $(top_srcdir) --library ccode $^
touch $@
libvalaccode_la_LIBADD = \
$(GLIB_LIBS) \
$(NULL)
EXTRA_DIST = ccode.vala ccode.vala.stamp
EXTRA_DIST = ccode.vapi ccode.vala.stamp
......@@ -19,7 +19,7 @@ valac_SOURCES = \
$(NULL)
valac.vala.stamp: $(filter %.vala,$(valac_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject --pkg gobject --pkg config $^
$(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) $^
touch $@
valac_CPPFLAGS = \
......
......@@ -86,7 +86,6 @@ class Vala.Compiler : Object {
private string get_package_path (string! pkg) {
string basename = "%s.vapi".printf (pkg);
string basename_old = "%s.vala".printf (pkg);
if (vapi_directories != null) {
foreach (string vapidir in vapi_directories) {
......@@ -94,10 +93,6 @@ 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;
}
}
}
......@@ -106,31 +101,16 @@ 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;
}
......@@ -291,7 +271,6 @@ 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;
......
......@@ -72,12 +72,12 @@ geeinclude_HEADERS = \
set.h \
$(NULL)
gee.vala gee.vala.stamp: $(filter %.vala,$(libgee_la_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --library gee $^
gee.vapi gee.vala.stamp: $(filter %.vala,$(libgee_la_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --basedir $(top_srcdir) --library gee $^
touch $@
libgee_la_LIBADD = \
$(GLIB_LIBS) \
$(NULL)
EXTRA_DIST = gee.vala gee.vala.stamp
EXTRA_DIST = gee.vapi gee.vala.stamp
......@@ -22,4 +22,4 @@ libgidl_la_LIBADD = \
$(GLIB_LIBS) \
$(NULL)
EXTRA_DIST = gidl.vala
EXTRA_DIST = gidl.vapi
......@@ -104,8 +104,8 @@ gobjectinclude_HEADERS = \
valatyperegisterfunction.h \
$(NULL)
gobject.vala gobject.vala.stamp: $(filter %.vala,$(libvala_la_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --library gobject $^
gobject.vapi gobject.vala.stamp: $(filter %.vala,$(libvala_la_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --basedir $(top_srcdir) --library gobject $^
touch $@
libvala_la_LIBADD = \
......@@ -113,4 +113,4 @@ libvala_la_LIBADD = \
../vala/libvalacore.la \
$(NULL)
EXTRA_DIST = gobject.vala gobject.vala.stamp
EXTRA_DIST = gobject.vapi gobject.vala.stamp
......@@ -437,8 +437,8 @@ valainclude_HEADERS = \
valawhilestatement.h \
$(NULL)
vala.vala vala.vala.stamp: $(filter %.vala,$(libvalacore_la_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --library vala $^
vala.vapi vala.vala.stamp: $(filter %.vala,$(libvalacore_la_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --basedir $(top_srcdir) --library vala $^
touch $@
libvalacore_la_LIBADD = \
......@@ -447,4 +447,4 @@ libvalacore_la_LIBADD = \
../ccode/libvalaccode.la \
$(NULL)
EXTRA_DIST = vala.vala vala.vala.stamp
EXTRA_DIST = vala.vapi vala.vala.stamp
......@@ -2,60 +2,60 @@ NULL =
vapidir = $(pkgdatadir)/vapi
vala-1.0.vala: ../ccode/ccode.vala ../vala/vala.vala ../gobject/gobject.vala
vala-1.0.vapi: ../ccode/ccode.vapi ../vala/vala.vapi ../gobject/gobject.vapi
cat $^ > $@
gee-1.0.vala: ../gee/gee.vala
gee-1.0.vapi: ../gee/gee.vapi
cat $^ > $@
dist_vapi_DATA = \
atk.vala \
cairo.vala \
curses.vala \
dbus-glib-1.vala \
enchant.vala \
gconf-2.0.vala \
glib-2.0.vala \
atk.vapi \
cairo.vapi \
curses.vapi \
dbus-glib-1.vapi \
enchant.vapi \
gconf-2.0.vapi \
glib-2.0.vapi \
gdk-2.0.deps \
gdk-2.0.vala \
gio-2.0.vala \
gnome-desktop-2.0.vala \
gnome-vfs-2.0.vala \
gstreamer-0.10.vala \
gdk-2.0.vapi \
gio-2.0.vapi \
gnome-desktop-2.0.vapi \
gnome-vfs-2.0.vapi \
gstreamer-0.10.vapi \
gtk+-2.0.deps \
gtk+-2.0.vala \
gtk+-2.0.vapi \
gtkmozembed.deps \
gtkmozembed.vala \
gtkmozembed.vapi \
gtksourceview-2.0.deps \
gtksourceview-2.0.vala \
gtksourceview-2.0.vapi \
hal.deps \
hal.vala \
hal.vapi \
hildon-1.deps \
hildon-1.vala \
hildon-1.vapi \
libglade-2.0.deps \
libglade-2.0.vala \
libgnome-2.0.vala \
libglade-2.0.vapi \
libgnome-2.0.vapi \
libgnomeui-2.0.deps \
libgnomeui-2.0.vala \
libgnomeui-2.0.vapi \
libnotify.deps \
libnotify.vala \
libnotify.vapi \
libpanelapplet-2.0.deps \
libpanelapplet-2.0.vala \
libwnck-1.0.vala \
libsoup-2.2.vala \
libxml-2.0.vala \
libpanelapplet-2.0.vapi \
libwnck-1.0.vapi \
libsoup-2.2.vapi \
libxml-2.0.vapi \
pango.deps \
pango.vala \
pango.vapi \
poppler-glib.deps \
poppler-glib.vala \
sqlite3.vala \
vala-1.0.vala \
poppler-glib.vapi \
sqlite3.vapi \
vala-1.0.vapi \
vte.deps \
vte.vala \
zlib.vala \
vte.vapi \
zlib.vapi \
$(NULL)
dist_noinst_DATA = \
config.vala \
gee-1.0.vala \
config.vapi \
gee-1.0.vapi \
$(NULL)
/* atk.vala generated by lt-vapigen, do not modify. */
/* atk.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Atk", lower_case_cprefix = "atk_")]
namespace Atk {
......
/* gconf-2.0.vala generated by lt-vapigen, do not modify. */
/* gconf-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "GConf", lower_case_cprefix = "gconf_")]
namespace GConf {
......
/* gdk-2.0.vala generated by lt-vapigen, do not modify. */
/* gdk-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
namespace Gdk {
......
/* gio-2.0.vala generated by lt-vapigen, do not modify. */
/* gio-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "G", lower_case_cprefix = "g_")]
namespace GLib {
......
/* gnome-desktop-2.0.vala generated by lt-vapigen, do not modify. */
/* gnome-desktop-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
namespace Gnome {
......
/* gnome-vfs-2.0.vala generated by lt-vapigen, do not modify. */
/* gnome-vfs-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "GnomeVFS", lower_case_cprefix = "gnome_vfs_")]
namespace GnomeVFS {
......
/* gstreamer-0.10.vala generated by lt-vapigen, do not modify. */
/* gstreamer-0.10.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
namespace Gst {
......
/* gtk+-2.0.vala generated by lt-vapigen, do not modify. */
/* gtk+-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_")]
namespace Gtk {
......
/* gtksourceview-2.0.vala generated by lt-vapigen, do not modify. */
/* gtksourceview-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gtk", lower_case_cprefix = "gtk_")]
namespace Gtk {
......
/* hildon-1.vala generated by lt-vapigen, do not modify. */
/* hildon-1.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Hildon", lower_case_cprefix = "hildon_")]
namespace Hildon {
......
/* libglade-2.0.vala generated by lt-vapigen, do not modify. */
/* libglade-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Glade", lower_case_cprefix = "glade_")]
namespace Glade {
......
/* libgnome-2.0.vala generated by lt-vapigen, do not modify. */
/* libgnome-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
namespace Gnome {
......
/* libgnomeui-2.0.vala generated by lt-vapigen, do not modify. */
/* libgnomeui-2.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
namespace Gnome {
......
/* libnotify.vala generated by lt-vapigen, do not modify. */
/* libnotify.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Notify", lower_case_cprefix = "notify_")]
namespace Notify {
......
/* libsoup-2.2.vala generated by lt-vapigen, do not modify. */
/* libsoup-2.2.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Soup", lower_case_cprefix = "soup_")]
namespace Soup {
......
/* libwnck-1.0.vala generated by lt-vapigen, do not modify. */
/* libwnck-1.0.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Wnck", lower_case_cprefix = "wnck_")]
namespace Wnck {
......
/* pango.vala generated by lt-vapigen, do not modify. */
/* pango.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Pango", lower_case_cprefix = "pango_")]
namespace Pango {
......
/* poppler-glib.vala generated by lt-vapigen, do not modify. */
/* poppler-glib.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Poppler", lower_case_cprefix = "poppler_")]
namespace Poppler {
......
/* vte.vala generated by lt-vapigen, do not modify. */
/* vte.vapi generated by lt-vapigen, do not modify. */
[CCode (cprefix = "Vte", lower_case_cprefix = "vte_")]
namespace Vte {
......
......@@ -34,11 +34,11 @@ vapicheck_SOURCES = \
$(NULL)
vapigen.vala.stamp: $(filter %.vala,$(vapigen_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config $^
$(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) $^
touch $@
vapicheck.vala.stamp: $(filter %.vala,$(vapicheck_SOURCES))
$(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config $^
$(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) $^
touch $@
vapigen_LDADD = \
......@@ -55,4 +55,4 @@ vapicheck_LDADD = \
../gobject-introspection/libgidl.la \
$(NULL)
EXTRA_DIST = vapigen.vala.stamp
EXTRA_DIST = vapigen.vala.stamp vapicheck.vala.stamp
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment