diff --git a/vala/abstract_class/abstract_class.vala b/vala/abstract_class/abstract_class.vala new file mode 100644 index 0000000..29c4e92 --- /dev/null +++ b/vala/abstract_class/abstract_class.vala @@ -0,0 +1,22 @@ +public abstract class Animal : Object { + + public void eat() { + stdout.printf("*chomp chomp*\n"); + } + + public abstract void say_hello(); +} + +public class Tiger : Animal { + + public override void say_hello() { + stdout.printf("*roar*\n"); + } +} + +/*public class Duck : Animal { + + public override void say_hello() { + stdout.printf("*quack*\n"); + } +}*/ diff --git a/vala/abstract_class/simple_class.vala b/vala/abstract_class/simple_class.vala new file mode 100644 index 0000000..342d143 --- /dev/null +++ b/vala/abstract_class/simple_class.vala @@ -0,0 +1,23 @@ +public abstract class Animal : Object { + + public void eat() { + stdout.printf("*chomp chomp*\n"); + } + + public abstract void say_hello(); +} + +public class Tiger : Animal { + + public override void say_hello() { + stdout.printf("*roar*\n"); + } +} + +/*public class Duck : Animal { + + public override void say_hello() { + stdout.printf("*quack*\n"); + } +}*/ + diff --git a/vala/gmodule.live.gnome/loader.vala b/vala/gmodule.live.gnome/loader.vala new file mode 100644 index 0000000..1c93d21 --- /dev/null +++ b/vala/gmodule.live.gnome/loader.vala @@ -0,0 +1,56 @@ +class MyModule : TypeModule +{ + [CCode (has_target = false)] + private delegate Type PluginInitFunc(TypeModule module); + + private GLib.Module module = null; + + private string name = null; + + public MyModule(string name) + { + this.name = name; + } + + public override bool load() + { + string path = Module.build_path(null, name); + module = Module.open(path, GLib.ModuleFlags.BIND_LAZY); + if(null == module) { + error("Module not found"); + } + + void * plugin_init = null; + if(! module.symbol("plugin_init", out plugin_init)) { + error("No such symbol"); + } + + ((PluginInitFunc) plugin_init)(this); + + return true; + } + + public override void unload() + { + module = null; + + message("Library unloaded"); + } +} + +// Never unref instance of GTypeModule +// http://www.lanedo.com/~mitch/module-system-talk-guadec-2006/Module-System-Talk-Guadec-2006.pdf +static TypeModule module = null; + +int main() +{ + module = new MyModule("plugin"); + module.load(); + + var o = GLib.Object.new(Type.from_name("MyClass")); + + // free last instance, plugin unload + o = null; + + return 0; +} diff --git a/vala/gmodule.live.gnome/plugin.vala b/vala/gmodule.live.gnome/plugin.vala new file mode 100644 index 0000000..2afdb20 --- /dev/null +++ b/vala/gmodule.live.gnome/plugin.vala @@ -0,0 +1,18 @@ +public class MyClass : Object +{ + static construct + { + message("MyClass init"); + } + + static ~MyClass() + { + message("MyClass deinit"); + } +} + +[ModuleInit] +Type plugin_init(GLib.TypeModule type_modul) +{ + return typeof(MyClass); +} diff --git a/vala/gmodule/CMakeLists.txt b/vala/gmodule/CMakeLists.txt new file mode 100644 index 0000000..25ad513 --- /dev/null +++ b/vala/gmodule/CMakeLists.txt @@ -0,0 +1,14 @@ +cmake_minimum_required(VERSION 2.8) + +list (APPEND CMAKE_MODULE_PATH + ${CMAKE_SOURCE_DIR}/cmake + ${CMAKE_SOURCE_DIR}/cmake/vala) +include(MacroOptionalAddSubdirectory) + +# Vala requirements +find_package (Vala REQUIRED) +include (FindVala) +include (UseVala) + +add_subdirectory (src) +add_subdirectory (test) diff --git a/vala/gmodule/cmake/MacroOptionalAddSubdirectory.cmake b/vala/gmodule/cmake/MacroOptionalAddSubdirectory.cmake new file mode 100644 index 0000000..545048b --- /dev/null +++ b/vala/gmodule/cmake/MacroOptionalAddSubdirectory.cmake @@ -0,0 +1,31 @@ +# - MACRO_OPTIONAL_ADD_SUBDIRECTORY() combines ADD_SUBDIRECTORY() with an OPTION() +# MACRO_OPTIONAL_ADD_SUBDIRECTORY( ) +# If you use MACRO_OPTIONAL_ADD_SUBDIRECTORY() instead of ADD_SUBDIRECTORY(), +# this will have two effects +# 1 - CMake will not complain if the directory doesn't exist +# This makes sense if you want to distribute just one of the subdirs +# in a source package, e.g. just one of the subdirs in kdeextragear. +# 2 - If the directory exists, it will offer an option to skip the +# subdirectory. +# This is useful if you want to compile only a subset of all +# directories. + +# Copyright (c) 2007, Alexander Neundorf, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +MACRO (MACRO_OPTIONAL_ADD_SUBDIRECTORY _dir ) + GET_FILENAME_COMPONENT(_fullPath ${_dir} ABSOLUTE) + IF(EXISTS ${_fullPath}) + IF(${ARGC} EQUAL 2) + OPTION(BUILD_${_dir} "Build directory ${_dir}" ${ARGV1}) + ELSE(${ARGC} EQUAL 2) + OPTION(BUILD_${_dir} "Build directory ${_dir}" TRUE) + ENDIF(${ARGC} EQUAL 2) + IF(BUILD_${_dir}) + ADD_SUBDIRECTORY(${_dir}) + ENDIF(BUILD_${_dir}) + ENDIF(EXISTS ${_fullPath}) +ENDMACRO (MACRO_OPTIONAL_ADD_SUBDIRECTORY) diff --git a/vala/gmodule/cmake/vala/FindVala.cmake b/vala/gmodule/cmake/vala/FindVala.cmake new file mode 100644 index 0000000..c8854ce --- /dev/null +++ b/vala/gmodule/cmake/vala/FindVala.cmake @@ -0,0 +1,69 @@ +## +# Find module for the Vala compiler (valac) +# +# This module determines wheter a Vala compiler is installed on the current +# system and where its executable is. +# +# Call the module using "find_package(Vala) from within your CMakeLists.txt. +# +# The following variables will be set after an invocation: +# +# VALA_FOUND Whether the vala compiler has been found or not +# VALA_EXECUTABLE Full path to the valac executable if it has been found +# VALA_VERSION Version number of the available valac +# VALA_USE_FILE Include this file to define the vala_precompile function +## + +## +# Copyright 2009-2010 Jakob Westhoff. All rights reserved. +# Copyright 2010-2011 Daniel Pfeifer +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# The views and conclusions contained in the software and documentation are those +# of the authors and should not be interpreted as representing official policies, +# either expressed or implied, of Jakob Westhoff +## + +# Search for the valac executable in the usual system paths. +find_program(VALA_EXECUTABLE valac) +mark_as_advanced(VALA_EXECUTABLE) + +# Determine the valac version +if(VALA_EXECUTABLE) + execute_process(COMMAND ${VALA_EXECUTABLE} "--version" + OUTPUT_VARIABLE VALA_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REPLACE "Vala " "" VALA_VERSION "${VALA_VERSION}") +endif(VALA_EXECUTABLE) + +# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call. +# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka. +# VALA_EXECUTABLE is set) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Vala + REQUIRED_VARS VALA_EXECUTABLE + VERSION_VAR VALA_VERSION) + +set(VALA_USE_FILE "${CMAKE_CURRENT_LIST_DIR}/UseVala.cmake") + diff --git a/vala/gmodule/cmake/vala/UseVala.cmake b/vala/gmodule/cmake/vala/UseVala.cmake new file mode 100644 index 0000000..436d1d0 --- /dev/null +++ b/vala/gmodule/cmake/vala/UseVala.cmake @@ -0,0 +1,180 @@ +## +# Compile vala files to their c equivalents for further processing. +# +# The "vala_precompile" function takes care of calling the valac executable on +# the given source to produce c files which can then be processed further using +# default cmake functions. +# +# The first parameter provided is a variable, which will be filled with a list +# of c files outputted by the vala compiler. This list can than be used in +# conjuction with functions like "add_executable" or others to create the +# neccessary compile rules with CMake. +# +# The following sections may be specified afterwards to provide certain options +# to the vala compiler: +# +# SOURCES +# A list of .vala files to be compiled. Please take care to add every vala +# file belonging to the currently compiled project or library as Vala will +# otherwise not be able to resolve all dependencies. +# +# PACKAGES +# A list of vala packages/libraries to be used during the compile cycle. The +# package names are exactly the same, as they would be passed to the valac +# "--pkg=" option. +# +# OPTIONS +# A list of optional options to be passed to the valac executable. This can be +# used to pass "--thread" for example to enable multi-threading support. +# +# CUSTOM_VAPIS +# A list of custom vapi files to be included for compilation. This can be +# useful to include freshly created vala libraries without having to install +# them in the system. +# +# GENERATE_VAPI +# Pass all the needed flags to the compiler to create an internal vapi for +# the compiled library. The provided name will be used for this and a +# .vapi file will be created. +# +# GENERATE_HEADER +# Let the compiler generate a header file for the compiled code. There will +# be a header file as well as an internal header file being generated called +# .h and _internal.h +# +# The following call is a simple example to the vala_precompile macro showing +# an example to every of the optional sections: +# +# find_package(Vala "0.12" REQUIRED) +# inlcude(${VALA_USE_FILE}) +# +# vala_precompile(VALA_C +# SOURCES +# source1.vala +# source2.vala +# source3.vala +# PACKAGES +# gtk+-2.0 +# gio-1.0 +# posix +# DIRECTORY +# gen +# OPTIONS +# --thread +# CUSTOM_VAPIS +# some_vapi.vapi +# GENERATE_VAPI +# myvapi +# GENERATE_HEADER +# myheader +# ) +# +# Most important is the variable VALA_C which will contain all the generated c +# file names after the call. +## + +## +# Copyright 2009-2010 Jakob Westhoff. All rights reserved. +# Copyright 2010-2011 Daniel Pfeifer +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# The views and conclusions contained in the software and documentation are those +# of the authors and should not be interpreted as representing official policies, +# either expressed or implied, of Jakob Westhoff +## + +include(CMakeParseArguments) + +function(vala_precompile output) + cmake_parse_arguments(ARGS "" "DIRECTORY;GENERATE_HEADER;GENERATE_VAPI" + "SOURCES;PACKAGES;OPTIONS;CUSTOM_VAPIS" ${ARGN}) + + if(ARGS_DIRECTORY) + set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY}) + else(ARGS_DIRECTORY) + set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + endif(ARGS_DIRECTORY) + include_directories(${DIRECTORY}) + set(vala_pkg_opts "") + foreach(pkg ${ARGS_PACKAGES}) + list(APPEND vala_pkg_opts "--pkg=${pkg}") + endforeach(pkg ${ARGS_PACKAGES}) + set(in_files "") + set(out_files "") + foreach(src ${ARGS_SOURCES} ${ARGS_UNPARSED_ARGUMENTS}) + list(APPEND in_files "${CMAKE_CURRENT_SOURCE_DIR}/${src}") + string(REPLACE ".vala" ".c" src ${src}) + string(REPLACE ".gs" ".c" src ${src}) + set(out_file "${DIRECTORY}/${src}") + list(APPEND out_files "${DIRECTORY}/${src}") + endforeach(src ${ARGS_SOURCES} ${ARGS_UNPARSED_ARGUMENTS}) + + set(custom_vapi_arguments "") + if(ARGS_CUSTOM_VAPIS) + foreach(vapi ${ARGS_CUSTOM_VAPIS}) + if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) + list(APPEND custom_vapi_arguments ${vapi}) + else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) + list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi}) + endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR}) + endforeach(vapi ${ARGS_CUSTOM_VAPIS}) + endif(ARGS_CUSTOM_VAPIS) + + set(vapi_arguments "") + if(ARGS_GENERATE_VAPI) + list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi") + set(vapi_arguments "--internal-vapi=${ARGS_GENERATE_VAPI}.vapi") + + # Header and internal header is needed to generate internal vapi + if (NOT ARGS_GENERATE_HEADER) + set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI}) + endif(NOT ARGS_GENERATE_HEADER) + endif(ARGS_GENERATE_VAPI) + + set(header_arguments "") + if(ARGS_GENERATE_HEADER) + list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}.h") + list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h") + list(APPEND header_arguments "--header=${DIRECTORY}/${ARGS_GENERATE_HEADER}.h") + list(APPEND header_arguments "--internal-header=${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h") + endif(ARGS_GENERATE_HEADER) + + add_custom_command(OUTPUT ${out_files} + COMMAND + ${VALA_EXECUTABLE} + ARGS + "-C" + ${header_arguments} + ${vapi_arguments} + "-b" ${CMAKE_CURRENT_SOURCE_DIR} + "-d" ${DIRECTORY} + ${vala_pkg_opts} + ${ARGS_OPTIONS} + ${in_files} + ${custom_vapi_arguments} + DEPENDS + ${in_files} + ${ARGS_CUSTOM_VAPIS} + ) + set(${output} ${out_files} PARENT_SCOPE) +endfunction(vala_precompile) diff --git a/vala/gmodule/test/CMakeLists.txt b/vala/gmodule/test/CMakeLists.txt new file mode 100644 index 0000000..2db40cf --- /dev/null +++ b/vala/gmodule/test/CMakeLists.txt @@ -0,0 +1,25 @@ +find_package (PkgConfig REQUIRED) +pkg_check_modules (GLIB2 REQUIRED glib-2.0) +pkg_check_modules (GOBJECT2 REQUIRED gobject-2.0) + +include_directories (${GLIB2_INCLUDE_DIRS}) +link_directories (${GLIB2_LIBRARY_DIRS}) +include_directories (${GOBJECT2_INCLUDE_DIRS}) +link_directories (${GOBJECT2_LIBRARY_DIRS}) +if (CMAKE_COMPILER_IS_GNUCC) + add_definitions (${GLIB2_CFLAGS_OTHER}) + add_definitions (${GOBJECT2_CFLAGS_OTHER}) +endif () + +FILE (GLOB GModuleSources RELATIVE ${PROJECT_SOURCE_DIR}/test *.vala) +vala_precompile (VALA_C ${GModuleSources} + PACKAGES gtk+-3.0 + OPTIONS ${VALAC_OPTIONS} + CUSTOM_VAPIS + GENERATE_VAPI gmodule-test + GENERATE_HEADER gmodule-test + ) + +# add the executable +add_executable (gmodule-test ${VALA_C}) +target_link_libraries (gmodule-test ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES}) diff --git a/vala/gmodule/test/main.vala b/vala/gmodule/test/main.vala new file mode 100644 index 0000000..2061759 --- /dev/null +++ b/vala/gmodule/test/main.vala @@ -0,0 +1,7 @@ +using GLib; + +void main (string[] args) { + // stdout.printf ("Hello world!\n"); + + var m = new GLib.Module (); +}