IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename the gnc-module test libraries to be consistent with other modules.

Browse Source
This commit is contained in:
John Ralls 2018-02-18 16:07:25 -08:00
parent a5f46a5e45
commit 605f3466cb
9 changed files with 72 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libgnucash/gnc-module/test/CMakeLists.txt
View File

@ -12,7 +12,16 @@ SET(GNC_MODULE_TEST_INCLUDE_DIRS
${GUILE_INCLUDE_DIRS} ${GUILE_INCLUDE_DIRS}
) )
SET(GNC_MODULE_TEST_LIBS gnc-module test-core) SET(GNC_MODULE_TEST_LIBS
gnc-module
test-core
gncmod-foo
gncmod-bar
gncmod-baz
gncmod-agedver
gncmod-futuremodsys
gncmod-incompatdep
)
MACRO(ADD_GNC_MODULE_TEST _TARGET _SOURCE_FILES) MACRO(ADD_GNC_MODULE_TEST _TARGET _SOURCE_FILES)
GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" GNC_MODULE_TEST_INCLUDE_DIRS GNC_MODULE_TEST_LIBS) GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" GNC_MODULE_TEST_INCLUDE_DIRS GNC_MODULE_TEST_LIBS)
@ -43,7 +52,7 @@ GNC_ADD_TEST_WITH_GUILE(test-incompatdep test-incompatdep.c
GNC_ADD_TEST_WITH_GUILE(test-agedver test-agedver.c GNC_ADD_TEST_WITH_GUILE(test-agedver test-agedver.c
GNC_MODULE_TEST_INCLUDE_DIRS GNC_MODULE_TEST_LIBS GNC_MODULE_TEST_INCLUDE_DIRS GNC_MODULE_TEST_LIBS
"GNC_MODULE_PATH=${LIBDIR_BUILD}/gnucash/test" "GNC_MODULE_PATH=${LIBDIR_BUILD}/gnucash/test"
) )
SET(_LIBDIR ${LIBDIR_BUILD}) SET(_LIBDIR ${LIBDIR_BUILD})
IF (WIN32) IF (WIN32)
@ -64,7 +73,16 @@ SET(test_gnc_module_SCHEME
test-gnc-module-scm-multi.scm test-gnc-module-scm-multi.scm
) )
SET(GUILE_DEPENDS gnc-module scm-test-core scm-mod-foo scm-mod-baz) SET(GUILE_DEPENDS
gnc-module
scm-test-core
scm-mod-foo
gncmod-bar
scm-mod-baz
gncmod-agedver
gncmod-incompatdep
gncmod-futuremodsys
)
GNC_ADD_SCHEME_TARGETS(test-gnc-modules-scm GNC_ADD_SCHEME_TARGETS(test-gnc-modules-scm
"${test_gnc_module_SCHEME}" "${test_gnc_module_SCHEME}"
@ -76,7 +94,7 @@ GNC_ADD_SCHEME_TARGETS(test-gnc-modules-scm
GNC_ADD_SCHEME_TESTS("${test_gnc_module_SCHEME}") GNC_ADD_SCHEME_TESTS("${test_gnc_module_SCHEME}")
IF(NOT WIN32) IF(NOT WIN32)
# This little dance is needed because gnc_module_init will assert if # This little dance is needed because gnc_module_init will assert if
# it finds libgncmod_futuremod.so outside of a test that expects it. # it finds libgncmod-futuremod.so outside of a test that expects it.
GET_GUILE_ENV() GET_GUILE_ENV()
SET(_GNC_MODULE_PATH "${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash:${LIBDIR_BUILD}/gnucash/test") SET(_GNC_MODULE_PATH "${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash:${LIBDIR_BUILD}/gnucash/test")
FOREACH(test_file ${test_gnc_module_SCHEME}) FOREACH(test_file ${test_gnc_module_SCHEME})

14
libgnucash/gnc-module/test/misc-mods/CMakeLists.txt
View File

@ -4,16 +4,16 @@ INCLUDE_DIRECTORIES(
${GLIB2_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS}
) )
ADD_LIBRARY(gncmod_agedver EXCLUDE_FROM_ALL agedver.c) ADD_LIBRARY(gncmod-agedver EXCLUDE_FROM_ALL agedver.c)
TARGET_LINK_LIBRARIES(gncmod_agedver ${GLIB2_LDFLAGS}) TARGET_LINK_LIBRARIES(gncmod-agedver ${GLIB2_LDFLAGS})
ADD_LIBRARY(gncmod_futuremodsys EXCLUDE_FROM_ALL futuremodsys.c) ADD_LIBRARY(gncmod-futuremodsys EXCLUDE_FROM_ALL futuremodsys.c)
TARGET_LINK_LIBRARIES(gncmod_futuremodsys ${GLIB2_LDFLAGS}) TARGET_LINK_LIBRARIES(gncmod-futuremodsys ${GLIB2_LDFLAGS})
ADD_LIBRARY(gncmod_incompatdep EXCLUDE_FROM_ALL incompatdep.c) ADD_LIBRARY(gncmod-incompatdep EXCLUDE_FROM_ALL incompatdep.c)
TARGET_LINK_LIBRARIES(gncmod_incompatdep gnc-module ${GLIB2_LDFLAGS}) TARGET_LINK_LIBRARIES(gncmod-incompatdep gnc-module ${GLIB2_LDFLAGS})
SET_TARGET_PROPERTIES(gncmod_agedver gncmod_futuremodsys gncmod_incompatdep PROPERTIES SET_TARGET_PROPERTIES(gncmod-agedver gncmod-futuremodsys gncmod-incompatdep PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

15
libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
View File

@ -5,11 +5,11 @@ gnc_add_swig_guile_command (swig-bar-c
) )
ADD_LIBRARY(bar EXCLUDE_FROM_ALL bar.c bar.h) ADD_LIBRARY(bar EXCLUDE_FROM_ALL bar.c bar.h)
ADD_LIBRARY(gncmodbar EXCLUDE_FROM_ALL gnc-mod-bar.c) ADD_LIBRARY(gncmod-bar EXCLUDE_FROM_ALL gnc-mod-bar.c)
SET_SOURCE_FILES_PROPERTIES (gnc-mod-bar.c PROPERTY OBJECT_DEPENDS ${SWIG_BAR_C}) SET_SOURCE_FILES_PROPERTIES (gnc-mod-bar.c PROPERTY OBJECT_DEPENDS ${SWIG_BAR_C})
TARGET_LINK_LIBRARIES(gncmodbar bar gnc-module) TARGET_LINK_LIBRARIES(gncmod-bar bar gnc-module)
TARGET_INCLUDE_DIRECTORIES(gncmodbar PRIVATE TARGET_INCLUDE_DIRECTORIES(gncmod-bar PRIVATE
${CMAKE_BINARY_DIR}/common ${CMAKE_BINARY_DIR}/common
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
@ -19,9 +19,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmodbar PRIVATE
${GUILE_INCLUDE_DIRS} ${GUILE_INCLUDE_DIRS}
) )
SET_TARGET_PROPERTIES(bar gncmodbar PROPERTIES SET_TARGET_PROPERTIES(bar gncmod-bar PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
)
SET_DIST_LIST(mod_bar_DIST CMakeLists.txt bar.c gnucash/bar.scm bar.h bar.i gnc-mod-bar.c) SET_DIST_LIST(mod_bar_DIST CMakeLists.txt bar.c gnucash/bar.scm bar.h bar.i gnc-mod-bar.c)

16
libgnucash/gnc-module/test/mod-bar/gnc-mod-bar.c
View File

@ -29,28 +29,28 @@
#include "gnc-module-api.h" #include "gnc-module-api.h"
#include "swig-bar.c" #include "swig-bar.c"
GNC_MODULE_API_DECL(libgncmodbar) GNC_MODULE_API_DECL(libgncmod_bar)
int libgncmodbar_gnc_module_system_interface = 0; int libgncmod_bar_gnc_module_system_interface = 0;
int libgncmodbar_gnc_module_current = 0; int libgncmod_bar_gnc_module_current = 0;
int libgncmodbar_gnc_module_age = 0; int libgncmod_bar_gnc_module_age = 0;
int libgncmodbar_gnc_module_revision = 0; int libgncmod_bar_gnc_module_revision = 0;
char * char *
libgncmodbar_gnc_module_path(void) libgncmod_bar_gnc_module_path(void)
{ {
return g_strdup("gnucash/bar"); return g_strdup("gnucash/bar");
} }
char * char *
libgncmodbar_gnc_module_description(void) libgncmod_bar_gnc_module_description(void)
{ {
return g_strdup("this is a bar module"); return g_strdup("this is a bar module");
} }
int int
libgncmodbar_gnc_module_init(int refcount) libgncmod_bar_gnc_module_init(int refcount)
{ {
/* publish the wrapped Scheme bindings for libbar */ /* publish the wrapped Scheme bindings for libbar */
scm_init_sw_bar_module(); scm_init_sw_bar_module();

10
libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
View File

@ -11,11 +11,11 @@ TARGET_INCLUDE_DIRECTORIES(baz PRIVATE
TARGET_LINK_LIBRARIES(baz foo) TARGET_LINK_LIBRARIES(baz foo)
ADD_LIBRARY(gncmodbaz EXCLUDE_FROM_ALL gnc-mod-baz.c) ADD_LIBRARY(gncmod-baz EXCLUDE_FROM_ALL gnc-mod-baz.c)
SET_SOURCE_FILES_PROPERTIES (gnc-mod-baz.c PROPERTY OBJECT_DEPENDS ${SWIG_BAZ_C}) SET_SOURCE_FILES_PROPERTIES (gnc-mod-baz.c PROPERTY OBJECT_DEPENDS ${SWIG_BAZ_C})
TARGET_LINK_LIBRARIES(gncmodbaz baz gnc-module) TARGET_LINK_LIBRARIES(gncmod-baz baz gnc-module)
TARGET_INCLUDE_DIRECTORIES(gncmodbaz PRIVATE TARGET_INCLUDE_DIRECTORIES(gncmod-baz PRIVATE
${CMAKE_BINARY_DIR}/common ${CMAKE_BINARY_DIR}/common
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
@ -28,11 +28,11 @@ TARGET_INCLUDE_DIRECTORIES(gncmodbaz PRIVATE
GNC_ADD_SCHEME_TARGETS(scm-mod-baz GNC_ADD_SCHEME_TARGETS(scm-mod-baz
gnucash/baz.scm gnucash/baz.scm
"gnucash" "gnucash"
gncmodbaz gncmod-baz
TRUE TRUE
) )
SET_TARGET_PROPERTIES(baz gncmodbaz PROPERTIES SET_TARGET_PROPERTIES(baz gncmod-baz PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

16
libgnucash/gnc-module/test/mod-baz/gnc-mod-baz.c
View File

@ -30,28 +30,28 @@
#include "gnc-module-api.h" #include "gnc-module-api.h"
#include "swig-baz.c" #include "swig-baz.c"
GNC_MODULE_API_DECL(libgncmodbaz) GNC_MODULE_API_DECL(libgncmod_baz)
int libgncmodbaz_gnc_module_system_interface = 0; int libgncmod_baz_gnc_module_system_interface = 0;
int libgncmodbaz_gnc_module_current = 0; int libgncmod_baz_gnc_module_current = 0;
int libgncmodbaz_gnc_module_age = 0; int libgncmod_baz_gnc_module_age = 0;
int libgncmodbaz_gnc_module_revision = 0; int libgncmod_baz_gnc_module_revision = 0;
char * char *
libgncmodbaz_gnc_module_path(void) libgncmod_baz_gnc_module_path(void)
{ {
return g_strdup("gnucash/baz"); return g_strdup("gnucash/baz");
} }
char * char *
libgncmodbaz_gnc_module_description(void) libgncmod_baz_gnc_module_description(void)
{ {
return g_strdup("this is the baz module"); return g_strdup("this is the baz module");
} }
int int
libgncmodbaz_gnc_module_init(int refcount) libgncmod_baz_gnc_module_init(int refcount)
{ {
/* load libfoo */ /* load libfoo */
if (gnc_module_load("gnucash/foo", 0)) if (gnc_module_load("gnucash/foo", 0))

10
libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
View File

@ -5,11 +5,11 @@ gnc_add_swig_guile_command (swig-foo-c
) )
ADD_LIBRARY(foo EXCLUDE_FROM_ALL foo.c foo.h) ADD_LIBRARY(foo EXCLUDE_FROM_ALL foo.c foo.h)
ADD_LIBRARY(gncmodfoo EXCLUDE_FROM_ALL gnc-mod-foo.c) ADD_LIBRARY(gncmod-foo EXCLUDE_FROM_ALL gnc-mod-foo.c)
SET_SOURCE_FILES_PROPERTIES (gnc-mod-foo.c PROPERTY OBJECT_DEPENDS ${SWIG_FOO_C}) SET_SOURCE_FILES_PROPERTIES (gnc-mod-foo.c PROPERTY OBJECT_DEPENDS ${SWIG_FOO_C})
TARGET_LINK_LIBRARIES(gncmodfoo foo gnc-module) TARGET_LINK_LIBRARIES(gncmod-foo foo gnc-module)
TARGET_INCLUDE_DIRECTORIES(gncmodfoo PRIVATE TARGET_INCLUDE_DIRECTORIES(gncmod-foo PRIVATE
${CMAKE_BINARY_DIR}/common ${CMAKE_BINARY_DIR}/common
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
@ -22,11 +22,11 @@ TARGET_INCLUDE_DIRECTORIES(gncmodfoo PRIVATE
GNC_ADD_SCHEME_TARGETS(scm-mod-foo GNC_ADD_SCHEME_TARGETS(scm-mod-foo
gnucash/foo.scm gnucash/foo.scm
"gnucash" "gnucash"
gncmodfoo gncmod-foo
TRUE TRUE
) )
SET_TARGET_PROPERTIES(foo gncmodfoo PROPERTIES SET_TARGET_PROPERTIES(foo gncmod-foo PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

16
libgnucash/gnc-module/test/mod-foo/gnc-mod-foo.c
View File

@ -29,28 +29,28 @@
#include "gnc-module-api.h" #include "gnc-module-api.h"
#include "swig-foo.c" #include "swig-foo.c"
GNC_MODULE_API_DECL(libgncmodfoo) GNC_MODULE_API_DECL(libgncmod_foo)
int libgncmodfoo_gnc_module_system_interface = 0; int libgncmod_foo_gnc_module_system_interface = 0;
int libgncmodfoo_gnc_module_current = 0; int libgncmod_foo_gnc_module_current = 0;
int libgncmodfoo_gnc_module_age = 0; int libgncmod_foo_gnc_module_age = 0;
int libgncmodfoo_gnc_module_revision = 0; int libgncmod_foo_gnc_module_revision = 0;
char * char *
libgncmodfoo_gnc_module_path(void) libgncmod_foo_gnc_module_path(void)
{ {
return g_strdup("gnucash/foo"); return g_strdup("gnucash/foo");
} }
char * char *
libgncmodfoo_gnc_module_description(void) libgncmod_foo_gnc_module_description(void)
{ {
return g_strdup("this is a foo module"); return g_strdup("this is a foo module");
} }
int int
libgncmodfoo_gnc_module_init(int refcount) libgncmod_foo_gnc_module_init(int refcount)
{ {
/* publish the wrapped Scheme bindings for libfoo */ /* publish the wrapped Scheme bindings for libfoo */
scm_init_sw_foo_module(); scm_init_sw_foo_module();

2
libgnucash/gnc-module/test/test-load-c.c
View File

@ -30,7 +30,7 @@ static void
guile_main(void *closure, int argc, char ** argv) guile_main(void *closure, int argc, char ** argv)
{ {
GNCModule foo; GNCModule foo;
gchar *msg = "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n"; gchar *msg = "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod-futuremodsys.so' requires newer module system\n";
gchar *logdomain = "gnc.module"; gchar *logdomain = "gnc.module";
guint loglevel = G_LOG_LEVEL_WARNING; guint loglevel = G_LOG_LEVEL_WARNING;
TestErrorStruct check = { loglevel, logdomain, msg }; TestErrorStruct check = { loglevel, logdomain, msg };