Compare commits
57 Commits
Author | SHA1 | Date |
---|---|---|
Kolan Sh | e73cf2d921 | |
Kolan Sh | 097e41f370 | |
Kolan Sh | 8f213ec8f1 | |
Kolan Sh | b15a77a189 | |
Kolan Sh | f9fea4fe13 | |
Kolan Sh | 7f822a0b6a | |
Kolan Sh | 94cbc852ec | |
Kolan Sh | f63c847401 | |
Kolan Sh | ae0f0e3153 | |
Kolan Sh | ee8c6209db | |
Kolan Sh | 9b11bca35b | |
Kolan Sh | a8a1e2c66b | |
Kolan Sh | d93eb17d31 | |
Kolan Sh | c2640021cf | |
Kolan Sh | e19b314c05 | |
Kolan Sh | 6fa1e6c1ed | |
Kolan Sh | f8cda52102 | |
Kolan Sh | b17a728b52 | |
Kolan Sh | 16373e6e3c | |
Kolan Sh | 2d30aff257 | |
Kolan Sh | 8de8b0eb4d | |
Kolan Sh | cc44d12d93 | |
Kolan Sh | 463dc96bb5 | |
Kolan Sh | 52d8626c30 | |
Kolan Sh | dcbf50cb96 | |
Kolan Sh | d5f982970e | |
Kolan Sh | 0e3acf239f | |
Kolan Sh | 85ee333090 | |
Kolan Sh | c8f5085a15 | |
Kolan Sh | 824a4f3854 | |
Kolan Sh | 886bb5bdd1 | |
Kolan Sh | 8682acaa15 | |
Kolan Sh | 66df0fd678 | |
Kolan Sh | 7b89646055 | |
Kolan Sh | 1d65a203d0 | |
Kolan Sh | 557c30d925 | |
Kolan Sh | 9f72fe6feb | |
Kolan Sh | 73738be4f4 | |
Kolan Sh | 2e1ead96e9 | |
Kolan Sh | 07bf71fe73 | |
Kolan Sh | 8d46b72ba2 | |
Kolan Sh | 205ad66b0d | |
Kolan Sh | 5cbdd55444 | |
Kolan Sh | b6aadd0a76 | |
Kolan Sh | 827bd053b1 | |
Kolan Sh | 297f7509f4 | |
Kolan Sh | 870fcc2f96 | |
Kolan Sh | 141bf117f4 | |
Kolan Sh | 97d1d1a95f | |
Kolan Sh | e59f69b16a | |
Kolan Sh | 1d505afe4c | |
Kolan Sh | 285c0d44e0 | |
Kolan Sh | 7d8ef569de | |
Kolan Sh | e7507003a3 | |
Kolan Sh | 8dfecd735e | |
Kolan Sh | b7eeb77e76 | |
Kolan Sh | 89cfe64716 |
|
@ -1,3 +1,6 @@
|
|||
[submodule "cmake"]
|
||||
path = cmake/backbone
|
||||
url = git@git.backbone.ws:cmake/backbone.git
|
||||
url = https://git.backbone.ws/kolan/cmake.backbone.git
|
||||
[submodule "util/backbone"]
|
||||
path = util/backbone
|
||||
url = https://git.backbone.ws/kolan/cmake.backbone-utils.git
|
||||
|
|
|
@ -7,7 +7,7 @@ SET (PROJECT_DESCRIPTION "Host/Plugin Interfaces for GObject Based Applications/
|
|||
|
||||
SET (MAJOR 0)
|
||||
SET (MINOR 1)
|
||||
SET (PATCH 0)
|
||||
SET (PATCH 13)
|
||||
|
||||
LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/backbone)
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit a3bf0ee0e7f0c514ab3c9d6c37d2c386579465a6
|
||||
Subproject commit 206751e1f4814716d716f6bc297c280d4bf1dcf7
|
|
@ -2,9 +2,9 @@ SET (CONTACT "backbone@backbone.ws")
|
|||
SET (DEBIAN_DEPENDENCIES "valac (>= 0.24), libglib2.0-bin (>= 2.33)")
|
||||
SET (DEBIAN_SECTION "Libraries")
|
||||
SET (REDHAT_DEPENDENCIES "vala >= 0.24, glib >= 2.33")
|
||||
SET (REDHAT_SECTION "Applications/Text")
|
||||
SET (REDHAT_SECTION "Development/Libraries")
|
||||
SET (LICENSE "LGPLv3+")
|
||||
SET (WIN32_UNINSTALL_NAME "GobjPlug") # <= 8 symbols for the name
|
||||
|
||||
LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
|
||||
INCLUDE (CPackCommon)
|
||||
SET (CPACK_NSIS_MENU_LINKS "https://redmine.backbone.ws/projects/plugin"
|
||||
"Homepage for GObject/Plugin")
|
||||
INCLUDE (CPackCommonRules)
|
||||
|
|
|
@ -1,23 +1,15 @@
|
|||
# configure pkg-config file
|
||||
IF (WIN32)
|
||||
SET (PkgConfigPrefix "")
|
||||
ELSE ()
|
||||
SET (PkgConfigPrefix ${CMAKE_INSTALL_PREFIX})
|
||||
ENDIF ()
|
||||
SET (PkgConfigExecPrefix "\${prefix}")
|
||||
SET (PkgConfigLibDir "\${exec_prefix}/lib")
|
||||
SET (PkgConfigIncludeDir "\${prefix}/include")
|
||||
INCLUDE (PkgConfigCommonRules)
|
||||
|
||||
SET (PkgConfigName "${CMAKE_PROJECT_NAME}")
|
||||
SET (PkgConfigDescription "${PROJECT_DESCRIPTION}")
|
||||
SET (PkgConfigVersion "${MAJOR}.${MINOR}.${PATCH}")
|
||||
SET (PkgConfigLibs "-L\${libdir}")
|
||||
SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}")
|
||||
SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-loader-${MAJOR}")
|
||||
SET (PkgConfigLibsPrivate "")
|
||||
SET (PkgConfigCflags "")
|
||||
IF (WIN32)
|
||||
SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}")
|
||||
SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-loader-${MAJOR}")
|
||||
ELSE (WIN32)
|
||||
SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-iface.so.${MAJOR}")
|
||||
SET (PkgConfigLibs "${PkgConfigLibs} -l${PROJECT_LOWERCASE_NAME}-loader.so.${MAJOR}")
|
||||
ENDIF (WIN32)
|
||||
|
||||
CONFIGURE_FILE (
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/pkg-config.pc.in"
|
||||
"${CMAKE_SOURCE_DIR}/cmake/backbone/templates/pkg-config.pc.in"
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_LOWERCASE_NAME}-${MAJOR}.pc"
|
||||
)
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
prefix=@PkgConfigPrefix@
|
||||
exec_prefix=@PkgConfigExecPrefix@
|
||||
libdir=@PkgConfigLibDir@
|
||||
includedir=@PkgConfigIncludeDir@
|
||||
|
||||
Name: @PkgConfigName@
|
||||
Description: @PkgConfigDescription@
|
||||
Version: @PkgConfigVersion@
|
||||
Libs: @PkgConfigLibs@
|
||||
Libs.private: @PkgConfigLibsPrivate@
|
||||
Cflags: @PkgConfigCflags@
|
|
@ -1,41 +1 @@
|
|||
SET (GETTEXT_PACKAGE "${PROJECT_LOWERCASE_NAME_ABI}")
|
||||
ADD_DEFINITIONS (-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}")
|
||||
|
||||
IF (WIN32)
|
||||
SET (LOCALEDIR "")
|
||||
ELSE ()
|
||||
SET (LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
|
||||
ENDIF ()
|
||||
|
||||
SET (CUSTOM_LOCALEDIR "" CACHE STRING "Directory to install l10n files into")
|
||||
|
||||
IF (NOT CUSTOM_LOCALEDIR STREQUAL "")
|
||||
SET (LOCALEDIR "${CUSTOM_LOCALEDIR}")
|
||||
MESSAGE(STATUS "Using LOCALEDIR=${LOCALEDIR}")
|
||||
ENDIF ()
|
||||
|
||||
ADD_DEFINITIONS (-DLOCALEDIR="${LOCALEDIR}")
|
||||
SET (LOCALE_INSTALL_DIR "share/locale")
|
||||
LIST (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
|
||||
INCLUDE (MacroOptionalAddSubdirectory)
|
||||
FIND_PACKAGE (Gettext REQUIRED)
|
||||
|
||||
MACRO_OPTIONAL_ADD_SUBDIRECTORY (langs)
|
||||
|
||||
# configure a header file for Gettext
|
||||
SET (VERSION ${MAJOR}.${MINOR}.${PATCH})
|
||||
SET (PROJECT_LOWERCASE_NAME_ABI "${PROJECT_LOWERCASE_NAME}-${MAJOR}")
|
||||
|
||||
STRING (TOUPPER "${CMAKE_PROJECT_NAME}" GettextUniqueHeader)
|
||||
SET (GettextPackageNameAbi "${PROJECT_LOWERCASE_NAME_ABI}")
|
||||
CONFIGURE_FILE (
|
||||
"gettext-config.h.in"
|
||||
"${PROJECT_BINARY_DIR}/po/gettext-config.h"
|
||||
)
|
||||
|
||||
IF (NOT GETTEXT_MSGMERGE_EXECUTABLE)
|
||||
MESSAGE (FATAL_ERROR "Please install msgmerge binary")
|
||||
ENDIF (NOT GETTEXT_MSGMERGE_EXECUTABLE)
|
||||
IF (NOT GETTEXT_MSGFMT_EXECUTABLE)
|
||||
MESSAGE(FATAL_ERROR "Please install msgmerge binary")
|
||||
ENDIF (NOT GETTEXT_MSGFMT_EXECUTABLE)
|
||||
INCLUDE (GettextCommonRules)
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
#ifndef @GettextUniqueHeader@_H
|
||||
#define @GettextUniqueHeader@_H
|
||||
|
||||
#define GETTEXT_PACKAGE "@GettextPackageNameAbi@"
|
||||
#include <glib/gi18n-lib.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#define _(String) dgettext (GETTEXT_PACKAGE, String)
|
||||
#endif
|
||||
|
||||
#endif // @GettextUniqueHeader@_H
|
|
@ -1,2 +0,0 @@
|
|||
ADD_SUBDIRECTORY (ru)
|
||||
# ADD_SUBDIRECTORY (de)
|
|
@ -1,2 +0,0 @@
|
|||
FILE (GLOB _po_files *.po)
|
||||
GETTEXT_PROCESS_PO_FILES (ru ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} PO_FILES ${_po_files} )
|
|
@ -0,0 +1 @@
|
|||
INCLUDE (GettextLangRules)
|
|
@ -1,5 +1,2 @@
|
|||
INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/po)
|
||||
|
||||
ADD_SUBDIRECTORY (host-iface)
|
||||
ADD_SUBDIRECTORY (plugin-iface)
|
||||
ADD_SUBDIRECTORY (iface)
|
||||
ADD_SUBDIRECTORY (loader)
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
SET (LibName ${PROJECT_LOWERCASE_NAME}-host-iface)
|
||||
FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} HostInterface.vala)
|
||||
SET (LibPackages gee-0.8 gmodule-2.0 gio-2.0)
|
||||
SET (LibExtraSources ${PROJECT_SOURCE_DIR}/src/library_constructor.c)
|
||||
SET (LibInstall ON)
|
||||
INCLUDE (ValaLibCommonRules)
|
|
@ -0,0 +1,8 @@
|
|||
SET (LibName ${PROJECT_LOWERCASE_NAME}-iface)
|
||||
FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.vala)
|
||||
SET (LibPkgModules gee-0.8 gio-2.0)
|
||||
SET (LibInstall ON)
|
||||
SET (LibExtraSources ${CMAKE_CURRENT_BINARY_DIR}/library_constructor.c)
|
||||
SET (LC_RELATIVE_PREFIX "..")
|
||||
CONFIGURE_FILE ( "${CMAKE_SOURCE_DIR}/cmake/backbone/templates/library_constructor.c.in" "${LibExtraSources}")
|
||||
INCLUDE (ValaLibCommonRules)
|
|
@ -22,7 +22,7 @@ namespace GObject {
|
|||
/**
|
||||
* Host Interface.
|
||||
*/
|
||||
public IHost host = null;
|
||||
public unowned IHost host { get; set; default = null; }
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,35 +0,0 @@
|
|||
#if defined(_WIN32) || defined(_WIN64)
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#include "gettext-config.h"
|
||||
|
||||
#if defined(_WIN32) || defined(_WIN64)
|
||||
BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
|
||||
#elif defined(linux) || defined(UNIX) || defined(__unix__)
|
||||
void __attribute__ ((constructor)) load_library (void)
|
||||
#endif
|
||||
{
|
||||
#if defined(_WIN32) || defined(_WIN64)
|
||||
gchar dllPath[FILENAME_MAX],
|
||||
*dllDir,
|
||||
*localePath;
|
||||
|
||||
GetModuleFileName (hInstance, dllPath, FILENAME_MAX);
|
||||
dllDir = g_path_get_dirname (dllPath);
|
||||
localePath = g_build_filename (dllDir, "../share/locale", NULL);
|
||||
g_free (dllDir);
|
||||
bindtextdomain (GETTEXT_PACKAGE, localePath);
|
||||
g_free (localePath);
|
||||
#endif
|
||||
|
||||
#if (!GLIB_CHECK_VERSION (2, 36, 0))
|
||||
g_type_init ();
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) || defined(_WIN64)
|
||||
(void) dwReason; // avoid
|
||||
(void) lpReserved; // warngings
|
||||
return TRUE;
|
||||
#endif
|
||||
}
|
|
@ -1,13 +1,16 @@
|
|||
SET (LibName ${PROJECT_LOWERCASE_NAME}-loader)
|
||||
FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} PluginLoader.vala)
|
||||
SET (LibPackages gee-0.8 gmodule-2.0 gio-2.0)
|
||||
SET (LibCustomVapis ${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
|
||||
)
|
||||
SET (LibExtraSources ${PROJECT_SOURCE_DIR}/src/library_constructor.c)
|
||||
SET (LibPackages posix gee-0.8 gmodule-2.0 gio-2.0)
|
||||
SET (LibCustomVapis ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi)
|
||||
SET (LibInstall ON)
|
||||
SET (LibLinkLibs ${PROJECT_LOWERCASE_NAME}-iface ${PROJECT_LOWERCASE_NAME}-host-iface)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/plugin-iface"
|
||||
"${CMAKE_BINARY_DIR}/src/host-iface"
|
||||
)
|
||||
SET (LibExtraSources ${CMAKE_CURRENT_BINARY_DIR}/library_constructor.c)
|
||||
SET (LC_RELATIVE_PREFIX "..")
|
||||
CONFIGURE_FILE ( "${CMAKE_SOURCE_DIR}/cmake/backbone/templates/library_constructor.c.in" "${LibExtraSources}")
|
||||
SET (LibLinkLibs ${PROJECT_LOWERCASE_NAME}-iface gmodule-2.0)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface")
|
||||
IF (WIN32)
|
||||
SET (LibValaOpts -D WINDOWS)
|
||||
ELSE (WIN32)
|
||||
SET (LibValaOpts -D UNIX)
|
||||
ENDIF (WIN32)
|
||||
INCLUDE (ValaLibCommonRules)
|
||||
|
|
|
@ -34,15 +34,15 @@ namespace GObject {
|
|||
* Loads the module.
|
||||
*/
|
||||
public override bool load () {
|
||||
module = GLib.Module.open (path, GLib.ModuleFlags.BIND_LAZY);
|
||||
module = GLib.Module.open (path, GLib.ModuleFlags.LAZY);
|
||||
if (null == module) {
|
||||
message ("Module '%s' not found", path);
|
||||
stderr.printf("Cannot load module %s\n", path);
|
||||
return false;
|
||||
}
|
||||
|
||||
void * plugin_init = null;
|
||||
if (! module.symbol ("plugin_init", out plugin_init)) {
|
||||
message ("No such symbol: plugin_init in module " + path);
|
||||
stderr.printf("No such symbol: plugin_init in %s\n", path);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -75,6 +75,69 @@ namespace GObject {
|
|||
}
|
||||
}
|
||||
|
||||
void sort_modules (Gee.ArrayList<Module> modules) {
|
||||
modules.sort ((a, b) => {
|
||||
var a_name = a.get_plugin_type ().name ();
|
||||
var b_name = b.get_plugin_type ().name ();
|
||||
if (a_name < b_name) return -1;
|
||||
if (a_name > b_name) return 1;
|
||||
return 0;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads modules in the specific directory.
|
||||
*
|
||||
* @param dir_path path to the directory.
|
||||
* @param modules where to save list of modules.
|
||||
*
|
||||
* @return are the modules loaded correctly or not.
|
||||
*/
|
||||
public bool load_modules (string dir_path, ref Gee.ArrayList<Module>? modules) {
|
||||
|
||||
modules = new Gee.ArrayList<Module> ();
|
||||
#if (WINDOWS)
|
||||
var paths = new Gee.HashSet<string> ();
|
||||
#endif
|
||||
|
||||
try {
|
||||
var libPath = File.new_for_path (dir_path);
|
||||
#if (WINDOWS)
|
||||
for (var i = 0; i < 32; ++i) {
|
||||
var saved_length = modules.size;
|
||||
#endif
|
||||
var lib_enumerator = libPath.enumerate_children (FileAttribute.STANDARD_NAME, 0, null);
|
||||
FileInfo file_info = null;
|
||||
while ((file_info = lib_enumerator.next_file (null)) != null) {
|
||||
if (Regex.match_simple ("^.*\\.(so|dll)$", file_info.get_name ())) {
|
||||
var path = GLib.Module.build_path (dir_path, file_info.get_name ());
|
||||
#if (WINDOWS)
|
||||
if (paths.contains(path)) continue;
|
||||
#endif
|
||||
var module = new Module (path);
|
||||
if (module.load ()) {
|
||||
modules.add (module);
|
||||
#if (WINDOWS)
|
||||
paths.add(path);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
#if (WINDOWS)
|
||||
if (modules.size == saved_length) break;
|
||||
}
|
||||
#endif
|
||||
} catch (Error e) {
|
||||
message (e.message);
|
||||
return false;
|
||||
}
|
||||
|
||||
sort_modules (modules);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Loads modules in the 2-depth directory tree path.
|
||||
*
|
||||
|
@ -83,42 +146,55 @@ namespace GObject {
|
|||
*
|
||||
* @return are the modules loaded correctly or not.
|
||||
*/
|
||||
public bool load_modules (string dir_path, ref Gee.ArrayList<Module>? modules) {
|
||||
public bool load_modules_depth2 (string dir_path, ref Gee.ArrayList<Module>? modules) {
|
||||
|
||||
modules = new Gee.ArrayList<Module> ();
|
||||
#if (WINDOWS)
|
||||
var paths = new Gee.HashSet<string> ();
|
||||
#endif
|
||||
|
||||
try {
|
||||
var libPath = File.new_for_path (dir_path);
|
||||
var dir_enumerator = libPath.enumerate_children ("standard::*",
|
||||
FileQueryInfoFlags.NOFOLLOW_SYMLINKS, null);
|
||||
FileInfo dir_info = null;
|
||||
while ((dir_info = dir_enumerator.next_file (null)) != null ) {
|
||||
if (dir_info.get_file_type () == FileType.DIRECTORY) {
|
||||
File subdir = libPath.resolve_relative_path (dir_info.get_name ());
|
||||
var lib_enumerator = subdir.enumerate_children (FileAttribute.STANDARD_NAME, 0, null);
|
||||
FileInfo file_info = null;
|
||||
while ((file_info = lib_enumerator.next_file (null)) != null) {
|
||||
if (Regex.match_simple ("^.*\\.(so|dll)$", file_info.get_name ())) {
|
||||
var path = Path.build_path (Path.DIR_SEPARATOR_S, dir_path, dir_info.get_name ());
|
||||
var module = new Module (GLib.Module.build_path (path, file_info.get_name ()));
|
||||
if (module.load ())
|
||||
modules.add (module);
|
||||
#if (WINDOWS)
|
||||
for (var i = 0; i < 32; ++i) {
|
||||
var saved_length = modules.size;
|
||||
#endif
|
||||
var dir_enumerator = libPath.enumerate_children ("standard::*",
|
||||
FileQueryInfoFlags.NOFOLLOW_SYMLINKS, null);
|
||||
FileInfo dir_info = null;
|
||||
while ((dir_info = dir_enumerator.next_file (null)) != null ) {
|
||||
if (dir_info.get_file_type () == FileType.DIRECTORY) {
|
||||
File subdir = libPath.resolve_relative_path (dir_info.get_name ());
|
||||
var lib_enumerator = subdir.enumerate_children (FileAttribute.STANDARD_NAME, 0, null);
|
||||
FileInfo file_info = null;
|
||||
while ((file_info = lib_enumerator.next_file (null)) != null) {
|
||||
if (Regex.match_simple ("^.*\\.(so|dll)$", file_info.get_name ())) {
|
||||
var path = Path.build_path (Path.DIR_SEPARATOR_S, dir_path, dir_info.get_name ());
|
||||
path = GLib.Module.build_path (path, file_info.get_name ());
|
||||
#if (WINDOWS)
|
||||
if (paths.contains(path)) continue;
|
||||
#endif
|
||||
var module = new Module (path);
|
||||
if (module.load ()) {
|
||||
modules.add (module);
|
||||
#if (WINDOWS)
|
||||
paths.add(path);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#if (WINDOWS)
|
||||
if (modules.size == saved_length) break;
|
||||
}
|
||||
#endif
|
||||
} catch (Error e) {
|
||||
message (e.message);
|
||||
return false;
|
||||
}
|
||||
|
||||
modules.sort ((a, b) => {
|
||||
var a_name = a.get_plugin_type ().name ();
|
||||
var b_name = b.get_plugin_type ().name ();
|
||||
if (a_name < b_name) return -1;
|
||||
if (a_name > b_name) return 1;
|
||||
return 0;
|
||||
});
|
||||
sort_modules (modules);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
SET (LibName ${PROJECT_LOWERCASE_NAME}-iface)
|
||||
FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} PluginInterface.vala)
|
||||
SET (LibPackages gee-0.8 gmodule-2.0 gio-2.0)
|
||||
SET (LibCustomVapis ${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi)
|
||||
SET (LibExtraSources ${PROJECT_SOURCE_DIR}/src/library_constructor.c)
|
||||
SET (LibInstall ON)
|
||||
SET (LibLinkLibs ${PROJECT_LOWERCASE_NAME}-host-iface)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/host-iface")
|
||||
INCLUDE (ValaLibCommonRules)
|
|
@ -1,10 +1,6 @@
|
|||
SET (LibName loader_test-iface)
|
||||
FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} LoaderTestInterface.vala)
|
||||
SET (LibCustomVapis ${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
|
||||
)
|
||||
SET (LibCustomVapis ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi)
|
||||
SET (LibLinkLibs gobject-plugin-iface)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/plugin-iface"
|
||||
"${CMAKE_BINARY_DIR}/src/host-iface"
|
||||
)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface")
|
||||
INCLUDE (ValaLibCommonRules)
|
||||
|
|
|
@ -2,19 +2,16 @@ SET (BinName loader_test)
|
|||
FILE (GLOB_RECURSE BinSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} LoaderTest.vala)
|
||||
SET (BinPackages gee-0.8 gio-2.0)
|
||||
SET (BinCustomVapis ${CMAKE_BINARY_DIR}/src/loader/${PROJECT_LOWERCASE_NAME}-loader-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
|
||||
)
|
||||
SET (BinLinkLibs ${PROJECT_LOWERCASE_NAME}-loader
|
||||
${PROJECT_LOWERCASE_NAME}-iface
|
||||
${PROJECT_LOWERCASE_NAME}-host-iface
|
||||
loader_test-iface
|
||||
)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/loader"
|
||||
"${CMAKE_BINARY_DIR}/src/plugin-iface"
|
||||
"${CMAKE_BINARY_DIR}/src/iface"
|
||||
"${CMAKE_BINARY_DIR}/test/loader_test-iface"
|
||||
"${CMAKE_BINARY_DIR}/src/host-iface"
|
||||
)
|
||||
INCLUDE (ValaBinCommonRules)
|
||||
|
||||
|
|
|
@ -13,13 +13,13 @@ int main (string [] args) {
|
|||
|
||||
var h = new LoaderTestHost ();
|
||||
|
||||
GObject.Plugins.load_modules (
|
||||
GObject.Plugins.load_modules_depth2 (
|
||||
Path.build_path (Path.DIR_SEPARATOR_S, File.new_for_path (
|
||||
args[0]).get_parent ().get_parent ().get_path (), "test/plugins/typeA"),
|
||||
ref type_a_modules
|
||||
);
|
||||
|
||||
GObject.Plugins.load_modules (
|
||||
GObject.Plugins.load_modules_depth2 (
|
||||
Path.build_path (Path.DIR_SEPARATOR_S, File.new_for_path (
|
||||
args[0]).get_parent ().get_parent ().get_path (), "test/plugins/typeB"),
|
||||
ref type_b_modules
|
||||
|
|
|
@ -1,15 +1,13 @@
|
|||
SET (PluginName type_a1)
|
||||
FILE (GLOB_RECURSE PluginSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeA1.vala)
|
||||
SET (PluginCustomVapis
|
||||
${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
|
||||
SET (LibName type_a1)
|
||||
SET (LibIsPlugin ON)
|
||||
SET (LibNoApi ON)
|
||||
FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeA1.vala)
|
||||
SET (LibCustomVapis
|
||||
${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
|
||||
)
|
||||
SET (PluginLinkLibs gobject-plugin-iface loader_test-iface)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/plugin-iface"
|
||||
SET (LibLinkLibs gobject-plugin-iface loader_test-iface)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface"
|
||||
"${CMAKE_BINARY_DIR}/test/loader_test-iface"
|
||||
"${CMAKE_BINARY_DIR}/src/host-iface"
|
||||
)
|
||||
INCLUDE (ValaPluginCommonRules)
|
||||
|
||||
#INSTALL (TARGETS ${PluginName} DESTINATION lib/${PROJECT_LOWERCASE_NAME}-${MAJOR}/plugins/${PluginName})
|
||||
INCLUDE (ValaLibCommonRules)
|
||||
|
|
|
@ -15,7 +15,7 @@ public class TypeA1 : PluginTypeA {
|
|||
/**
|
||||
* Destroys the ``TypeA1``.
|
||||
*/
|
||||
~Test () {
|
||||
~TypeA1 () {
|
||||
stdout.puts ("TypeA1 deinit () called\n");
|
||||
}
|
||||
|
||||
|
@ -25,11 +25,12 @@ public class TypeA1 : PluginTypeA {
|
|||
public override void method_a () {
|
||||
stdout.puts ("TypeA1.method_a () called\n");
|
||||
stdout.puts ("Call IHostLoaderTest.method_host () from TypeA1:\n ");
|
||||
(host as IHostLoaderTest).method_host ();
|
||||
var test = host as IHostLoaderTest;
|
||||
if (test != null) test.method_host ();
|
||||
}
|
||||
}
|
||||
|
||||
[ModuleInit]
|
||||
Type plugin_init (GLib.TypeModule type_module) {
|
||||
public Type plugin_init (GLib.TypeModule type_module) {
|
||||
return typeof (TypeA1);
|
||||
}
|
||||
|
|
|
@ -1,15 +1,13 @@
|
|||
SET (PluginName type_a2)
|
||||
FILE (GLOB_RECURSE PluginSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeA2.vala)
|
||||
SET (PluginCustomVapis
|
||||
${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
|
||||
SET (LibName type_a2)
|
||||
SET (LibIsPlugin ON)
|
||||
SET (LibNoApi ON)
|
||||
FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeA2.vala)
|
||||
SET (LibCustomVapis
|
||||
${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
|
||||
)
|
||||
SET (PluginLinkLibs gobject-plugin-iface loader_test-iface)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/plugin-iface"
|
||||
SET (LibLinkLibs gobject-plugin-iface loader_test-iface)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface"
|
||||
"${CMAKE_BINARY_DIR}/test/loader_test-iface"
|
||||
"${CMAKE_BINARY_DIR}/src/host-iface"
|
||||
)
|
||||
INCLUDE (ValaPluginCommonRules)
|
||||
|
||||
#INSTALL (TARGETS ${PluginName} DESTINATION lib/${PROJECT_LOWERCASE_NAME}-${MAJOR}/plugins/${PluginName})
|
||||
INCLUDE (ValaLibCommonRules)
|
||||
|
|
|
@ -15,7 +15,7 @@ public class TypeA2 : PluginTypeA {
|
|||
/**
|
||||
* Destroys the ``TypeA2``.
|
||||
*/
|
||||
~Test () {
|
||||
~TypeA2 () {
|
||||
stdout.puts ("TypeA2 deinit () called\n");
|
||||
}
|
||||
|
||||
|
@ -28,6 +28,6 @@ public class TypeA2 : PluginTypeA {
|
|||
}
|
||||
|
||||
[ModuleInit]
|
||||
Type plugin_init (GLib.TypeModule type_module) {
|
||||
public Type plugin_init (GLib.TypeModule type_module) {
|
||||
return typeof (TypeA2);
|
||||
}
|
||||
|
|
|
@ -1,15 +1,13 @@
|
|||
SET (PluginName type_b1)
|
||||
FILE (GLOB_RECURSE PluginSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeB1.vala)
|
||||
SET (PluginCustomVapis
|
||||
${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
|
||||
SET (LibName type_b1)
|
||||
SET (LibIsPlugin ON)
|
||||
SET (LibNoApi ON)
|
||||
FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeB1.vala)
|
||||
SET (LibCustomVapis
|
||||
${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
|
||||
)
|
||||
SET (PluginLinkLibs gobject-plugin-iface loader_test-iface)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/plugin-iface"
|
||||
SET (LibLinkLibs gobject-plugin-iface loader_test-iface)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface"
|
||||
"${CMAKE_BINARY_DIR}/test/loader_test-iface"
|
||||
"${CMAKE_BINARY_DIR}/src/host-iface"
|
||||
)
|
||||
INCLUDE (ValaPluginCommonRules)
|
||||
|
||||
#INSTALL (TARGETS ${PluginName} DESTINATION lib/${PROJECT_LOWERCASE_NAME}-${MAJOR}/plugins/${PluginName})
|
||||
INCLUDE (ValaLibCommonRules)
|
||||
|
|
|
@ -15,7 +15,7 @@ public class TypeB1 : PluginTypeB {
|
|||
/**
|
||||
* Destroys the ``TypeB1``.
|
||||
*/
|
||||
~Test () {
|
||||
~TypeB1 () {
|
||||
stdout.puts ("TypeB1 deinit () called\n");
|
||||
}
|
||||
|
||||
|
@ -29,6 +29,6 @@ public class TypeB1 : PluginTypeB {
|
|||
}
|
||||
|
||||
[ModuleInit]
|
||||
Type plugin_init (GLib.TypeModule type_module) {
|
||||
public Type plugin_init (GLib.TypeModule type_module) {
|
||||
return typeof (TypeB1);
|
||||
}
|
||||
|
|
|
@ -1,15 +1,13 @@
|
|||
SET (PluginName type_b2)
|
||||
FILE (GLOB_RECURSE PluginSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeB2.vala)
|
||||
SET (PluginCustomVapis
|
||||
${CMAKE_BINARY_DIR}/src/plugin-iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
|
||||
SET (LibName type_b2)
|
||||
SET (LibIsPlugin ON)
|
||||
SET (LibNoApi ON)
|
||||
FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeB2.vala)
|
||||
SET (LibCustomVapis
|
||||
${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
|
||||
${CMAKE_BINARY_DIR}/src/host-iface/${PROJECT_LOWERCASE_NAME}-host-iface-${MAJOR}.vapi
|
||||
)
|
||||
SET (PluginLinkLibs gobject-plugin-iface loader_test-iface)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/plugin-iface"
|
||||
SET (LibLinkLibs gobject-plugin-iface loader_test-iface)
|
||||
INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface"
|
||||
"${CMAKE_BINARY_DIR}/test/loader_test-iface"
|
||||
"${CMAKE_BINARY_DIR}/src/host-iface"
|
||||
)
|
||||
INCLUDE (ValaPluginCommonRules)
|
||||
|
||||
#INSTALL (TARGETS ${PluginName} DESTINATION lib/${PROJECT_LOWERCASE_NAME}-${MAJOR}/plugins/${PluginName})
|
||||
INCLUDE (ValaLibCommonRules)
|
||||
|
|
|
@ -15,7 +15,7 @@ public class TypeB2 : PluginTypeB {
|
|||
/**
|
||||
* Destroys the ``TypeB2``.
|
||||
*/
|
||||
~Test () {
|
||||
~TypeB2 () {
|
||||
stdout.puts ("TypeB2 deinit () called\n");
|
||||
}
|
||||
|
||||
|
@ -29,6 +29,6 @@ public class TypeB2 : PluginTypeB {
|
|||
}
|
||||
|
||||
[ModuleInit]
|
||||
Type plugin_init (GLib.TypeModule type_module) {
|
||||
public Type plugin_init (GLib.TypeModule type_module) {
|
||||
return typeof (TypeB2);
|
||||
}
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 11c998aca2aa1b787286b336e579e5a4e31f471a
|
|
@ -1,50 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
##
|
||||
# settings
|
||||
##
|
||||
PO_DIR_NAME=po
|
||||
EXE_PATH="`readlink -f $0`"
|
||||
PRJ_PATH="${EXE_PATH%/*/*}"
|
||||
C_FILELIST="${PRJ_PATH}/src/*.vala"
|
||||
UI_FILELIST="${PRJ_PATH}/ui/*.glade"
|
||||
SOURCE_POT=source.pot
|
||||
GLADE_POT=glade.pot
|
||||
|
||||
##
|
||||
# code
|
||||
##
|
||||
PROJECT_LOWERCASE_NAME=`grep '\<SET *(PROJECT_LOWERCASE_NAME\>' "$PRJ_PATH"/CMakeLists.txt | sed 's~.*"\(.*\)".*~\1~'`
|
||||
MAJOR=`grep '\<SET *(MAJOR\>' "$PRJ_PATH"/CMakeLists.txt | sed 's~.*\([0-9]\+\).*~\1~'`
|
||||
PROJECT_LOWERCASE_NAME_ABI="$PROJECT_LOWERCASE_NAME-$MAJOR"
|
||||
|
||||
xgettext --language=C --escape --package-name=$PROJECT_LOWERCASE_NAME_ABI --default-domain=$PROJECT_LOWERCASE_NAME_ABI --add-comments=/// \
|
||||
-k_ -kQ_ -kC_ -kN_ -kNC_ -kg_dgettext -kg_dcgettext \
|
||||
-kg_dngettext -kg_dpgettext -kg_dpgettext2 -kg_strip_context -F -n -o \
|
||||
$PRJ_PATH/$PO_DIR_NAME/$SOURCE_POT $C_FILELIST
|
||||
|
||||
xgettext --language=C --escape --package-name=$PROJECT_LOWERCASE_NAME_ABI --default-domain=$PROJECT_LOWERCASE_NAME_ABI --add-comments=/// \
|
||||
-k_ -kQ_ -kC_ -kN_ -kNC_ -kg_dgettext -kg_dcgettext \
|
||||
-kg_dngettext -kg_dpgettext -kg_dpgettext2 -kg_strip_context -F -n -o \
|
||||
$PRJ_PATH/$PO_DIR_NAME/$GLADE_POT $C_FILELIST
|
||||
|
||||
msgcat -o $PRJ_PATH/$PO_DIR_NAME/$PROJECT.pot --use-first $PRJ_PATH/$PO_DIR_NAME/$SOURCE_POT $PRJ_PATH/$PO_DIR_NAME/$GLADE_POT
|
||||
|
||||
rm $PRJ_PATH/$PO_DIR_NAME/$SOURCE_POT
|
||||
rm $PRJ_PATH/$PO_DIR_NAME/$GLADE_POT
|
||||
|
||||
[ 0 != $? ] && echo "xgettext failed ;-(" && exit 1
|
||||
[ ! -e $PRJ_PATH/$PO_DIR_NAME/$PROJECT.pot ] && echo "No strings found ;-(" && exit 1
|
||||
|
||||
for d in $PRJ_PATH/$PO_DIR_NAME/*; do
|
||||
[ ! -d $d ] && continue
|
||||
|
||||
if [ -e $d/$PROJECT.po ]; then
|
||||
echo "Merging '${d##*/}' locale" && msgmerge -F -U $d/$PROJECT.po $PRJ_PATH/$PO_DIR_NAME/$PROJECT.pot
|
||||
[ 0 != $? ] && echo "msgmerge failed ;(" && exit 1
|
||||
else
|
||||
echo "Creating '${d##*/}' locale" && msginit -l ${d##*/} -o $d/$PROJECT.po -i $PRJ_PATH/$PO_DIR_NAME/$PROJECT.pot
|
||||
[ 0 != $? ] && echo "msginit failed ;(" && exit 1
|
||||
fi
|
||||
|
||||
done
|
|
@ -1,32 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
##
|
||||
# settings
|
||||
##
|
||||
BROWSER=firefox
|
||||
|
||||
##
|
||||
# code
|
||||
##
|
||||
EXE_PATH="`readlink -f $0`"
|
||||
PRJ_PATH="${EXE_PATH%/*/*}"
|
||||
PROJECT_LOWERCASE_NAME=`grep '\<SET *(PROJECT_LOWERCASE_NAME\>' "$PRJ_PATH"/CMakeLists.txt | sed 's~.*"\(.*\)".*~\1~'`
|
||||
|
||||
OUT_PATH="$PRJ_PATH/doc/html/$PROJECT_LOWERCASE_NAME"
|
||||
OUT_INTERNAL_PATH="$PRJ_PATH/doc/html/$PROJECT_LOWERCASE_NAME-internals"
|
||||
|
||||
VALA_BASEDIR=`grep -v '\.\.' "$PRJ_PATH"/valadoc_env | grep '^BASEDIR=[-+A-Za-z0-9. ]\+$' | cut -d= -f2`
|
||||
VALA_PKGS=`grep -v '\.\.' "$PRJ_PATH"/valadoc_env | grep '^PKGS=[-+A-Za-z0-9. ]\+$' | cut -d= -f2 | sed 's~\(^\| \)~ --pkg=~g; s~^ ~~'`
|
||||
|
||||
echo "Generating documentation..."
|
||||
rm -rf "$OUT_PATH"
|
||||
echo VALA_BASEDIR=$VALA_BASEDIR
|
||||
echo VALA_PKGS=$VALA_PKGS
|
||||
valadoc --no-protected -o "$OUT_PATH" -b "$PRJ_PATH/$VALA_BASEDIR" `find "$PRJ_PATH/$VALA_BASEDIR" -name "*.vapi" -or -name "*.vala"` $VALA_PKGS
|
||||
$BROWSER "$OUT_PATH"/$PROJECT_LOWERCASE_NAME/index.htm &>/dev/null
|
||||
|
||||
#echo "Generating internal documentation..."
|
||||
#rm -rf "$OUT_INTERNAL_PATH"
|
||||
#valadoc -o "$OUT_INTERNAL_PATH" -b "$PRJ_PATH/$VALA_BASEDIR" `find "$PRJ_PATH/$VALA_BASEDIR" -name "*.vapi" -or -name "*.vala"` $VALA_PKGS --internal
|
||||
|
||||
#$BROWSER "$OUT_INTERNAL_PATH"/$PROJECT_LOWERCASE_NAME-internals/index.htm &>/dev/null
|
Loading…
Reference in New Issue