GNOME.org
 

[rygel] core,plugins,ui: Move BuildConfig to separate VAPI

commit 16a8138d1185e95a3edbce0a5e27970b77c947cc
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Sun Jun 20 22:56:49 2010 +0300

    core,plugins,ui: Move BuildConfig to separate VAPI

 src/plugins/gst-renderer/Makefile.am               |    2 +-
 src/plugins/gst-renderer/rygel-gst-plugin.vala     |    1 -
 src/plugins/tracker/Makefile.am                    |    2 +-
 .../tracker/rygel-tracker-plugin-factory.vala      |    1 -
 src/plugins/tracker/rygel-tracker-plugin.vala      |    1 -
 src/rygel/Makefile.am                              |    6 ++-
 src/rygel/cstuff.vapi                              |   29 -----------
 src/rygel/rygel-build-config.vapi                  |   50 ++++++++++++++++++++
 src/ui/Makefile.am                                 |    6 +-
 src/ui/rygel-preferences-dialog.vala               |    1 -
 10 files changed, 59 insertions(+), 40 deletions(-)
---
diff --git a/src/plugins/gst-renderer/Makefile.am b/src/plugins/gst-renderer/Makefile.am
index 3a6e2df..a68b504 100644
--- a/src/plugins/gst-renderer/Makefile.am
+++ b/src/plugins/gst-renderer/Makefile.am
@@ -26,7 +26,7 @@ librygel_gst_renderer_la_SOURCES = rygel-gst-connection-manager.vala \
 
 librygel_gst_renderer_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
                      	             --vapidir=$(srcdir) \
-				     --pkg rygel-1.0 --pkg cstuff \
+				     --pkg rygel-1.0 --pkg rygel-build-config \
 				     --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
 				     --pkg gee-1.0 --pkg gstreamer-0.10 -g
 
diff --git a/src/plugins/gst-renderer/rygel-gst-plugin.vala b/src/plugins/gst-renderer/rygel-gst-plugin.vala
index 0b9018b..0051af1 100644
--- a/src/plugins/gst-renderer/rygel-gst-plugin.vala
+++ b/src/plugins/gst-renderer/rygel-gst-plugin.vala
@@ -24,7 +24,6 @@
 
 using Rygel;
 using Gee;
-using CStuff;
 
 public void module_init (PluginLoader loader) {
     string MEDIA_RENDERER_DESC_PATH = BuildConfig.DATA_DIR +
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index b1144b5..1a67fc5 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -39,7 +39,7 @@ librygel_media_tracker_la_SOURCES = \
 
 librygel_media_tracker_la_VALAFLAGS = \
 	--vapidir=$(top_srcdir)/src/rygel \
-	--pkg rygel-1.0 --pkg cstuff --pkg gconf-2.0 \
+	--pkg rygel-1.0 --pkg rygel-build-config --pkg gconf-2.0 \
 	--pkg gupnp-1.0 --pkg gupnp-av-1.0 \
 	--pkg dbus-glib-1 --pkg gee-1.0 --pkg gstreamer-0.10 -g
 
diff --git a/src/plugins/tracker/rygel-tracker-plugin-factory.vala b/src/plugins/tracker/rygel-tracker-plugin-factory.vala
index 3a36be9..f91a5a7 100644
--- a/src/plugins/tracker/rygel-tracker-plugin-factory.vala
+++ b/src/plugins/tracker/rygel-tracker-plugin-factory.vala
@@ -24,7 +24,6 @@
 
 using Rygel;
 using Gee;
-using CStuff;
 
 private TrackerPluginFactory plugin_factory;
 
diff --git a/src/plugins/tracker/rygel-tracker-plugin.vala b/src/plugins/tracker/rygel-tracker-plugin.vala
index 380bb2f..a95ddec 100644
--- a/src/plugins/tracker/rygel-tracker-plugin.vala
+++ b/src/plugins/tracker/rygel-tracker-plugin.vala
@@ -21,7 +21,6 @@
  */
 
 using Gee;
-using CStuff;
 
 public class Rygel.TrackerPlugin : Rygel.Plugin {
     // class-wide constants
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index f2fc3cd..4da1cc0 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -101,8 +101,9 @@ VAPI_SOURCE_FILES = rygel-configuration.vala \
 
 rygel_VALAFLAGS = \
 	-H rygel.h -C --library=rygel-1.0 --vapidir=$(srcdir) --thread \
-	--pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
-	--pkg gstreamer-0.10 --pkg gio-2.0 --pkg gee-1.0 -g
+	--pkg cstuff --pkg rygel-build-config --pkg gupnp-1.0 \
+	--pkg gupnp-av-1.0 --pkg dbus-glib-1 --pkg gstreamer-0.10 \
+	--pkg gio-2.0 --pkg gee-1.0 -g
 
 rygel_LDADD = librygel-configuration.a \
 	      $(LIBGUPNP_LIBS) \
@@ -134,6 +135,7 @@ librygel_configuration_a_SOURCES = rygel-configuration.c \
 
 MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
 EXTRA_DIST = cstuff.vapi \
+             rygel-build-config.vapi \
              $(VAPI_FILES) \
              $(DEPS_FILES) \
              $(BUILT_SOURCES) cstuff.h
diff --git a/src/rygel/cstuff.vapi b/src/rygel/cstuff.vapi
index 04eba54..788300c 100644
--- a/src/rygel/cstuff.vapi
+++ b/src/rygel/cstuff.vapi
@@ -25,35 +25,6 @@
  */
 namespace CStuff {
     /**
-     * Holds constants defined by build system.
-     */
-    class BuildConfig {
-        [CCode (cname = "DATA_DIR")]
-        public static const string DATA_DIR;
-
-        [CCode (cname = "SYS_CONFIG_DIR")]
-        public static const string SYS_CONFIG_DIR;
-
-        [CCode (cname = "DESKTOP_DIR")]
-        public static const string DESKTOP_DIR;
-
-        [CCode (cname = "PLUGIN_DIR")]
-        public static const string PLUGIN_DIR;
-
-        [CCode (cname = "ICON_DIR")]
-        public static const string ICON_DIR;
-
-        [CCode (cname = "PACKAGE_NAME")]
-        public static const string PACKAGE_NAME;
-
-        [CCode (cname = "PACKAGE_VERSION")]
-        public static const string PACKAGE_VERSION;
-
-        [CCode (cname = "PACKAGE_STRING")]
-        public static const string PACKAGE_STRING;
-    }
-
-    /**
      * Provides utility functions implemented in C.
      */
     public class Utils {
diff --git a/src/rygel/rygel-build-config.vapi b/src/rygel/rygel-build-config.vapi
new file mode 100644
index 0000000..08f3437
--- /dev/null
+++ b/src/rygel/rygel-build-config.vapi
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2008 Zeeshan Ali (Khattak) <zeeshanak gnome org>.
+ *
+ * Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
+ *
+ * This file is part of Rygel.
+ *
+ * Rygel 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.
+ *
+ * Rygel 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 program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+/**
+  * Holds constants defined by build system.
+  */
+public class Rygel.BuildConfig {
+    [CCode (cname = "DATA_DIR")]
+    public static const string DATA_DIR;
+
+    [CCode (cname = "SYS_CONFIG_DIR")]
+    public static const string SYS_CONFIG_DIR;
+
+    [CCode (cname = "DESKTOP_DIR")]
+    public static const string DESKTOP_DIR;
+
+    [CCode (cname = "PLUGIN_DIR")]
+    public static const string PLUGIN_DIR;
+
+    [CCode (cname = "ICON_DIR")]
+    public static const string ICON_DIR;
+
+    [CCode (cname = "PACKAGE_NAME")]
+    public static const string PACKAGE_NAME;
+
+    [CCode (cname = "PACKAGE_VERSION")]
+    public static const string PACKAGE_VERSION;
+
+    [CCode (cname = "PACKAGE_STRING")]
+    public static const string PACKAGE_STRING;
+}
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 589ce0e..946639b 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -33,9 +33,9 @@ rygel_preferences_SOURCES = \
 rygel.stamp: $(rygel_preferences_VALASOURCES)
 rygel_preferences_VALAFLAGS = \
 	--vapidir=$(rygeldir) --thread \
-	--pkg rygel-1.0 --pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
-	--pkg dbus-glib-1 --pkg gconf-2.0 --pkg gstreamer-0.10 \
-	--pkg gio-2.0 --pkg gee-1.0 --pkg gtk+-2.0 -g
+	--pkg rygel-1.0 --pkg rygel-build-config --pkg gupnp-1.0 \
+	--pkg gupnp-av-1.0 --pkg dbus-glib-1 --pkg gconf-2.0 \
+	--pkg gstreamer-0.10 --pkg gio-2.0 --pkg gee-1.0 --pkg gtk+-2.0 -g
 
 rygel_preferences_LDADD = \
 		$(abs_top_builddir)/src/rygel/librygel-configuration.a \
diff --git a/src/ui/rygel-preferences-dialog.vala b/src/ui/rygel-preferences-dialog.vala
index d145522..026f0cc 100644
--- a/src/ui/rygel-preferences-dialog.vala
+++ b/src/ui/rygel-preferences-dialog.vala
@@ -22,7 +22,6 @@
  */
 using Gtk;
 using Gee;
-using CStuff;
 
 public class Rygel.PreferencesDialog : GLib.Object {
     const string UI_FILE = BuildConfig.DATA_DIR + "/rygel-preferences.ui";
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]