Started dir with little test programs

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae82bc471119868ee441f02dabd6ee71197af767..468379e0ec7124fb9a52dd4c54fb8b9694874a62 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,7 @@ set(zavai_version "0.1")
 add_subdirectory(gtkfisheyelist)
 add_subdirectory(polygen)
 add_subdirectory(player)
 add_subdirectory(gtkfisheyelist)
 add_subdirectory(polygen)
 add_subdirectory(player)

+add_subdirectory(test)

 add_subdirectory(zavai)
 add_subdirectory(src)
 #add_subdirectory(hooks)
 add_subdirectory(zavai)
 add_subdirectory(src)
 #add_subdirectory(hooks)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
new file mode 100644 (file)
index 0000000..da43012
--- /dev/null
+++ b/test/CMakeLists.txt
@@ -0,0 +1,31 @@
+project(tests)
+include(../vala.cmake)
+
+set(packages gtk+-2.0 dbus-glib-1>=0.80 libwnck-1.0>=2.26.0 lua5.1 libomhacks x11 gdk-x11-2.0 libgps gstreamer-0.10)
+add_packages(ZAVAI ${packages})
+
+set(VALA_PACKAGES ${packages} posix linux-input dbus-extra gtkfisheyelist libzavai)
+set(VFLAGS --vapidir=${zavai_SOURCE_DIR} --vapidir=${gtkfisheyelist_BINARY_DIR})
+add_definitions(-Wall)
+# -Werror 
+
+pkg_check_modules(DKP devkit-power-gobject>=010)
+if (DKP_VERSION)
+  message("-- Using devkit-power-gobject version ${DKP_VERSION}")
+  set(VFLAGS ${VFLAGS} --define=USE_DKP)
+  set(VALA_PACKAGES ${VALA_PACKAGES} devkit-power-gobject)
+  add_definitions(-DUSE_DKP ${DKP_CFLAGS})
+  link_libraries(${DKP_LDFLAGS})
+else()
+  message("-- Not using devkit-power-gobject")
+endif ()
+
+set(VFLAGS ${VFLAGS} --vapidir=${zavai_BINARY_DIR} --vapidir=${libzavai_SOURCE_DIR} --vapidir=${libzavai_BINARY_DIR})
+
+add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR} -I${libzavai_BINARY_DIR})
+set(VALA_PACKAGES ${VALA_PACKAGES} libzavai)
+link_libraries(libzavai)
+
+file(GLOB gsm-receive test-gsm-receive.vala)
+add_vala_program(test-gsm-receive ${gsm-receive})
+add_executable(test-gsm-receive ${test-gsm-receive_CSOURCES})

diff --git a/test/test-gsm-receive.vala b/test/test-gsm-receive.vala
new file mode 100644 (file)
index 0000000..7ad3542
--- /dev/null
+++ b/test/test-gsm-receive.vala
@@ -0,0 +1,48 @@
+/*
+ * test-gsm-receive - Play with receiving GSM data
+ *
+ * Copyright (C) 2010  Enrico Zini <enrico@enricozini.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+using GLib;
+
+//string VERSION = "0.1";
+
+static int main (string[] args) {
+       Gtk.init (ref args);
+    Gst.init (ref args);
+
+       // Set up zavai
+
+    // Core infrastructure
+       zavai.config = new zavai.Config();
+       zavai.config.argv0 = args[0];
+       zavai.registry = new zavai.Registry();
+
+    // Additional infrastructure
+       zavai.gsm.init();
+       zavai.log.init();
+
+    // PLAY here
+
+       Gtk.main();
+
+       // zavai.info("Shutting down")
+       zavai.registry.shutdown();
+
+       return 0;
+}

diff --git a/zavai/gsm.vala b/zavai/gsm.vala
index b11065d0a79511493c222874ff28187847c92aeb..3a7ac23e36b74ad4f643bf5f726120a637684589 100644 (file)
--- a/zavai/gsm.vala
+++ b/zavai/gsm.vala
@@ -1,7 +1,7 @@
 /*
  * gsm - gsm resource for zavai
  *
 /*
  * gsm - gsm resource for zavai
  *

- * Copyright (C) 2009  Enrico Zini <enrico@enricozini.org>
+ * Copyright (C) 2009--2010  Enrico Zini <enrico@enricozini.org>

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by