gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Thu Jun 6 15:00:13 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/e210af23 (commit)
via https://github.com/Gnucash/gnucash/commit/fae33123 (commit)
from https://github.com/Gnucash/gnucash/commit/598c374c (commit)
commit e210af23f6d49070b2a78e6435e5c085f81d5118
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Jun 6 21:00:06 2019 +0200
Fix list REMOVE_ITEM command
diff --git a/borrowed/chartjs/CMakeLists.txt b/borrowed/chartjs/CMakeLists.txt
index cf371aeb9..c6795e0bd 100644
--- a/borrowed/chartjs/CMakeLists.txt
+++ b/borrowed/chartjs/CMakeLists.txt
@@ -8,7 +8,7 @@ file(GLOB_RECURSE chartjs_NOINST_DATA
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
samples Chart*)
-list(REMOVE_ITEM ${chartjs_DATA})
+list(REMOVE_ITEM chartjs_NOINST_DATA ${chartjs_DATA})
install (FILES ${chartjs_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/chartjs)
commit fae3312389ceb8bb54d8635d4acac966d71bab8a
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Jun 6 18:37:33 2019 +0200
RptCleanup - integrate report-gnome into gnome
diff --git a/.gitignore b/.gitignore
index 718b2dbe8..b13f1f21d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -173,8 +173,6 @@ gnucash/register/register-gnome/test/test-link-module
gnucash/report/business-reports/gnucash
gnucash/report/locale-specific/us/gnucash
gnucash/report/locale-specific/us/test/test-link-module
-gnucash/report/report-gnome/gnucash
-gnucash/report/report-gnome/test/test-link-module
gnucash/report/report-system/gnucash
gnucash/report/report-system/test/test-link-module
gnucash/report/reports/gnucash
diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 179a3a66c..f9ca797bc 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -65,7 +65,7 @@ if (BUILDING_FROM_VCS)
endif (BUILDING_FROM_VCS)
target_link_libraries (gnucash
- gncmod-ledger-core gncmod-report-gnome gnc-gnome gncmod-gnome-utils gncmod-app-utils
+ gncmod-ledger-core gnc-gnome gncmod-gnome-utils gncmod-app-utils
gncmod-engine gnc-module gnc-core-utils gncmod-report-system
${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS}
)
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 970606c8b..0a37e0471 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -10,6 +10,7 @@ set (gnc_gnome_noinst_HEADERS
dialog-billterms.h
dialog-choose-owner.h
dialog-customer.h
+ dialog-custom-report.h
dialog-date-close.h
dialog-employee.h
dialog-fincalc.h
@@ -25,6 +26,8 @@ set (gnc_gnome_noinst_HEADERS
dialog-payment.h
dialog-print-check.h
dialog-progress.h
+ dialog-report-column-view.h
+ dialog-report-style-sheet.h
dialog-sx-editor.h
dialog-sx-editor2.h
dialog-sx-from-trans.h
@@ -42,9 +45,10 @@ set (gnc_gnome_noinst_HEADERS
gnc-plugin-page-budget.h
gnc-plugin-page-invoice.h
gnc-plugin-page-owner-tree.h
- gnc-plugin-page-sx-list.h
gnc-plugin-page-register.h
gnc-plugin-page-register2.h
+ gnc-plugin-page-report.h
+ gnc-plugin-page-sx-list.h
gnc-split-reg.h
gnc-split-reg2.h
reconcile-view.h
@@ -52,6 +56,7 @@ set (gnc_gnome_noinst_HEADERS
top-level.h
window-reconcile.h
window-reconcile2.h
+ window-report.h
window-autoclear.h
)
@@ -73,6 +78,7 @@ set (gnc_gnome_SOURCES
dialog-choose-owner.c
dialog-commodities.c
dialog-customer.c
+ dialog-custom-report.c
dialog-date-close.c
dialog-employee.c
dialog-fincalc.c
@@ -90,6 +96,8 @@ set (gnc_gnome_SOURCES
dialog-price-edit-db.c
dialog-print-check.c
dialog-progress.c
+ dialog-report-column-view.c
+ dialog-report-style-sheet.c
dialog-sx-editor.c
dialog-sx-editor2.c
dialog-sx-from-trans.c
@@ -108,9 +116,10 @@ set (gnc_gnome_SOURCES
gnc-plugin-page-budget.c
gnc-plugin-page-invoice.c
gnc-plugin-page-owner-tree.c
- gnc-plugin-page-sx-list.c
gnc-plugin-page-register.c
gnc-plugin-page-register2.c
+ gnc-plugin-page-report.c
+ gnc-plugin-page-sx-list.c
gnc-split-reg.c
gnc-split-reg2.c
reconcile-view.c
@@ -118,13 +127,14 @@ set (gnc_gnome_SOURCES
top-level.c
window-reconcile.c
window-reconcile2.c
+ window-report.c
window-autoclear.c
)
set_source_files_properties (${gnc_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
add_library (gnc-gnome ${gnc_gnome_SOURCES} ${gnc_gnome_noinst_HEADERS} ${SWIG_GNOME_C})
-target_link_libraries(gnc-gnome gncmod-gnome-search gncmod-ledger-core gncmod-report-gnome gncmod-report-system
+target_link_libraries(gnc-gnome gncmod-gnome-search gncmod-ledger-core gncmod-html gncmod-report-system
gncmod-register-gnome gncmod-register-core gncmod-gnome-utils gncmod-engine ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS})
target_compile_definitions (gnc-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\" ${GTK_MAC_CFLAGS_OTHER})
@@ -134,6 +144,7 @@ target_include_directories(gnc-gnome
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE
${CMAKE_SOURCE_DIR}/libgnucash/app-utils/calculation
+ ${CMAKE_SOURCE_DIR}/gnucash/html
${CMAKE_BINARY_DIR}/gnucash/gnome-utils # for gnc-warnings.h
${GTK_MAC_INCLUDE_DIRS}
)
@@ -203,6 +214,30 @@ add_custom_target(gnucash-desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucas
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+# Scheme
+
+set(gnome_SCHEME
+ report-menus.scm
+)
+
+set(GUILE_OUTPUT_DIR gnucash)
+set(GUILE_DEPENDS
+ gncmod-gnome-utils
+ scm-engine
+ scm-gettext
+ scm-gnome-utils
+ scm-gnc-module
+ scm-scm
+ scm-report-system
+ scm-reports
+)
+
+gnc_add_scheme_targets(scm-gnome
+"${gnome_SCHEME}"
+${GUILE_OUTPUT_DIR}
+"${GUILE_DEPENDS}"
+FALSE
+)
set_dist_list(gnome_DIST
CMakeLists.txt gnome.i gnucash.appdata.xml.in gnucash.desktop.in.in
- ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES})
+ ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES} ${gnome_SCHEME})
diff --git a/gnucash/report/report-gnome/dialog-custom-report.c b/gnucash/gnome/dialog-custom-report.c
similarity index 100%
rename from gnucash/report/report-gnome/dialog-custom-report.c
rename to gnucash/gnome/dialog-custom-report.c
diff --git a/gnucash/report/report-gnome/dialog-custom-report.h b/gnucash/gnome/dialog-custom-report.h
similarity index 100%
rename from gnucash/report/report-gnome/dialog-custom-report.h
rename to gnucash/gnome/dialog-custom-report.h
diff --git a/gnucash/report/report-gnome/dialog-report-column-view.c b/gnucash/gnome/dialog-report-column-view.c
similarity index 100%
rename from gnucash/report/report-gnome/dialog-report-column-view.c
rename to gnucash/gnome/dialog-report-column-view.c
diff --git a/gnucash/report/report-gnome/dialog-report-column-view.h b/gnucash/gnome/dialog-report-column-view.h
similarity index 100%
rename from gnucash/report/report-gnome/dialog-report-column-view.h
rename to gnucash/gnome/dialog-report-column-view.h
diff --git a/gnucash/report/report-gnome/dialog-report-style-sheet.c b/gnucash/gnome/dialog-report-style-sheet.c
similarity index 100%
rename from gnucash/report/report-gnome/dialog-report-style-sheet.c
rename to gnucash/gnome/dialog-report-style-sheet.c
diff --git a/gnucash/report/report-gnome/dialog-report-style-sheet.h b/gnucash/gnome/dialog-report-style-sheet.h
similarity index 100%
rename from gnucash/report/report-gnome/dialog-report-style-sheet.h
rename to gnucash/gnome/dialog-report-style-sheet.h
diff --git a/gnucash/report/report-gnome/gnc-plugin-page-report.c b/gnucash/gnome/gnc-plugin-page-report.c
similarity index 100%
rename from gnucash/report/report-gnome/gnc-plugin-page-report.c
rename to gnucash/gnome/gnc-plugin-page-report.c
diff --git a/gnucash/report/report-gnome/gnc-plugin-page-report.h b/gnucash/gnome/gnc-plugin-page-report.h
similarity index 100%
rename from gnucash/report/report-gnome/gnc-plugin-page-report.h
rename to gnucash/gnome/gnc-plugin-page-report.h
diff --git a/gnucash/gnome/gnome.i b/gnucash/gnome/gnome.i
index 18107cfa2..f761a1562 100644
--- a/gnucash/gnome/gnome.i
+++ b/gnucash/gnome/gnome.i
@@ -24,6 +24,11 @@
#include <config.h>
#include <gtk/gtk.h>
#include <dialog-progress.h>
+#include <config.h>
+#include <gtk/gtk.h>
+#include <gnc-plugin-page-report.h>
+#include <window-report.h>
+#include <dialog-custom-report.h>
%}
#if defined(SWIGGUILE)
%{
@@ -38,3 +43,6 @@ SCM scm_init_sw_gnome_module (void);
/* Parse the header file to generate wrappers */
%include <dialog-progress.h>
+void gnc_main_window_open_report(int report_id, GncMainWindow *window);
+void gnc_ui_custom_report(GncMainWindow * window);
+
diff --git a/gnucash/report/report-gnome/report-gnome.scm b/gnucash/gnome/report-menus.scm
similarity index 93%
rename from gnucash/report/report-gnome/report-gnome.scm
rename to gnucash/gnome/report-menus.scm
index 4da38959c..bc0ff48f2 100644
--- a/gnucash/report/report-gnome/report-gnome.scm
+++ b/gnucash/gnome/report-menus.scm
@@ -1,6 +1,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; report-gnome.scm
-;; module definition for the gnome report system code
+;; report-menus.scm
+;; code to initialize the report menus
;;
;; Copyright (c) 2001 Linux Developers Group, Inc.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -24,7 +24,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(define-module (gnucash report report-gnome))
+(define-module (gnucash report-menus))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gnome-utils))
@@ -32,9 +32,8 @@
(use-modules (gnucash report reports standard dashboard))
(eval-when (compile load eval expand)
- (load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module")
- (load-extension "libgncmod-report-gnome" "scm_init_sw_report_gnome_module"))
-(use-modules (sw_report_gnome))
+ (load-extension "libgnc-gnome" "scm_init_sw_gnome_module"))
+(use-modules (sw_gnome))
(gnc:module-load "gnucash/gnome-utils" 0)
(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
diff --git a/gnucash/report/report-gnome/window-report.c b/gnucash/gnome/window-report.c
similarity index 100%
rename from gnucash/report/report-gnome/window-report.c
rename to gnucash/gnome/window-report.c
diff --git a/gnucash/report/report-gnome/window-report.h b/gnucash/gnome/window-report.h
similarity index 100%
rename from gnucash/report/report-gnome/window-report.h
rename to gnucash/gnome/window-report.h
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index 7d8902767..f95331960 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -56,6 +56,7 @@
#include "engine-helpers-guile.h"
#include "swig-runtime.h"
#include "guile-mappings.h"
+#include "window-report.h"
#ifdef __MINGW32__
#include <Windows.h>
#include <fcntl.h>
@@ -503,7 +504,6 @@ load_gnucash_modules()
{ "gnucash/report/report-system", 0, FALSE },
{ "gnucash/report/stylesheets", 0, FALSE },
{ "gnucash/report/locale-specific/us", 0, FALSE },
- { "gnucash/report/report-gnome", 0, FALSE },
{ "gnucash/python", 0, TRUE },
};
@@ -605,6 +605,8 @@ get_file_to_load()
return gnc_history_get_last();
}
+extern SCM scm_init_sw_gnome_module(void);
+
static void
inner_main (void *closure, int argc, char **argv)
{
@@ -628,8 +630,10 @@ inner_main (void *closure, int argc, char **argv)
load_user_config();
/* Setting-up the report menu must come after the module
- loading but before the gui initialization. */
- scm_c_use_module("gnucash report report-gnome");
+ loading but before the gui initializat*ion. */
+ gnc_report_init ();
+ scm_c_use_module("gnucash report reports");
+ scm_c_use_module("gnucash report-menus");
scm_c_eval_string("(gnc:report-menu-setup)");
/* TODO: After some more guile-extraction, this should happen even
diff --git a/gnucash/import-export/aqb/test/CMakeLists.txt b/gnucash/import-export/aqb/test/CMakeLists.txt
index abcc5b339..651eb1170 100644
--- a/gnucash/import-export/aqb/test/CMakeLists.txt
+++ b/gnucash/import-export/aqb/test/CMakeLists.txt
@@ -21,7 +21,7 @@ set(test_aqb_INCLUDE_DIRS
set(test_aqb_LIBS
gncmod-aqbanking gncmod-generic-import gnc-gnome gncmod-gnome-utils
- gncmod-ledger-core gncmod-report-gnome gncmod-app-utils
+ gncmod-ledger-core gncmod-app-utils
gncmod-backend-xml-utils gncmod-engine gnc-core-utils gnc-module
${GLIB2_LDFLAGS}
)
diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt
index 519d76e9b..5d5ca40dc 100644
--- a/gnucash/report/CMakeLists.txt
+++ b/gnucash/report/CMakeLists.txt
@@ -1,11 +1,10 @@
add_subdirectory(jqplot)
add_subdirectory(locale-specific)
-add_subdirectory(report-gnome)
add_subdirectory(report-system)
add_subdirectory(reports)
add_subdirectory(stylesheets)
set_local_dist(report_DIST_local CMakeLists.txt )
-set(report_DIST ${report_DIST_local} ${jqplot_DIST} ${locale_specific_DIST} ${report_gnome_DIST} ${report_system_DIST}
+set(report_DIST ${report_DIST_local} ${jqplot_DIST} ${locale_specific_DIST} ${report_system_DIST}
${reports_DIST} ${stylesheets_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt
deleted file mode 100644
index 30995fd40..000000000
--- a/gnucash/report/report-gnome/CMakeLists.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-add_subdirectory(test)
-
-set (report_gnome_HEADERS
- dialog-report-column-view.h
- dialog-custom-report.h
- dialog-report-style-sheet.h
- gnc-plugin-page-report.h
- window-report.h
-)
-
-# Command to generate the swig-report-gnome.c wrapper file
-gnc_add_swig_guile_command (swig-report-gnome-c
- SWIG_REPORT_GNOME_C swig-report-gnome.c
- ${CMAKE_CURRENT_SOURCE_DIR}/report-gnome.i ${report_gnome_HEADERS}
-)
-
-set (report_gnome_SOURCES
- dialog-report-column-view.c
- dialog-custom-report.c
- dialog-report-style-sheet.c
- gnc-plugin-page-report.c
- gncmod-report-gnome.c
- window-report.c
-)
-
-add_library (gncmod-report-gnome
- ${report_gnome_SOURCES}
- ${report_gnome_HEADERS}
- ${SWIG_REPORT_GNOME_C}
-)
-target_link_libraries(gncmod-report-gnome gncmod-report-system gncmod-html gncmod-gnome-utils
- ${GUILE_LDFLAGS} ${GTK3_LDFLAGS})
-
-target_compile_definitions (gncmod-report-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.report.gui\")
-target_compile_options(gncmod-report-gnome PRIVATE -Wno-deprecated-declarations)
-
-target_include_directories(gncmod-report-gnome PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-if (APPLE)
- set_target_properties (gncmod-report-gnome PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-endif()
-
-install(TARGETS gncmod-report-gnome
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-install(FILES ${report_gnome_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
-
-# Scheme
-
-set(report_gnome_SCHEME
- report-gnome.scm
-)
-
-set(GUILE_OUTPUT_DIR gnucash/report)
-set(GUILE_DEPENDS
- gncmod-report-gnome
- scm-engine
- scm-gettext
- scm-gnome-utils
- scm-gnc-module
- scm-scm
- scm-report-system
- scm-reports
- )
-
-gnc_add_scheme_targets(scm-report-gnome
- "${report_gnome_SCHEME}"
- ${GUILE_OUTPUT_DIR}
- "${GUILE_DEPENDS}"
- FALSE
-)
-
-set_local_dist(report_gnome_DIST_local CMakeLists.txt report-gnome.i ${report_gnome_HEADERS}
- ${report_gnome_SOURCES} ${report_gnome_SCHEME})
-set(report_gnome_DIST ${report_gnome_DIST_local} ${test_report_gnome_DIST} PARENT_SCOPE)
diff --git a/gnucash/report/report-gnome/gncmod-report-gnome.c b/gnucash/report/report-gnome/gncmod-report-gnome.c
deleted file mode 100644
index 42051faf7..000000000
--- a/gnucash/report/report-gnome/gncmod-report-gnome.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*********************************************************************
- * gncmod-report-gnome.c
- * module definition/initialization for the gnome report infrastructure
- *
- * Copyright (c) 2001 Linux Developers Group, Inc.
- *********************************************************************/
-/********************************************************************\
- * 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, contact: *
- * *
- * Free Software Foundation Voice: +1-617-542-5942 *
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
- * Boston, MA 02110-1301, USA gnu at gnu.org *
- * *
-\********************************************************************/
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <gmodule.h>
-#include <gtk/gtk.h>
-#include <libguile.h>
-
-#include "gnc-module.h"
-#include "gnc-module-api.h"
-
-#include "window-report.h"
-
-GNC_MODULE_API_DECL(libgncmod_report_gnome)
-
-/* version of the gnc module system interface we require */
-int libgncmod_report_gnome_gnc_module_system_interface = 0;
-
-/* module versioning uses libtool semantics. */
-int libgncmod_report_gnome_gnc_module_current = 0;
-int libgncmod_report_gnome_gnc_module_revision = 0;
-int libgncmod_report_gnome_gnc_module_age = 0;
-
-
-char *
-libgncmod_report_gnome_gnc_module_path(void)
-{
- return g_strdup("gnucash/report/report-gnome");
-}
-
-char *
-libgncmod_report_gnome_gnc_module_description(void)
-{
- return g_strdup("Gnome component of GnuCash report generation system");
-}
-
-static void
-lmod(char * mn)
-{
- char * form = g_strdup_printf("(use-modules %s)\n", mn);
- scm_c_eval_string(form);
- g_free(form);
-}
-extern SCM scm_init_sw_report_gnome_module(void);
-
-int
-libgncmod_report_gnome_gnc_module_init(int refcount)
-{
- if (!gnc_module_load("gnucash/app-utils", 0))
- {
- return FALSE;
- }
-
- if (!gnc_module_load("gnucash/gnome-utils", 0))
- {
- return FALSE;
- }
-
- if (!gnc_module_load("gnucash/report/report-system", 0))
- {
- return FALSE;
- }
-
- lmod ("(gnucash report reports)");
-
- scm_init_sw_report_gnome_module();
-
- lmod ("(sw_report_gnome)");
- lmod ("(gnucash report report-gnome)");
-
- if (refcount == 0)
- gnc_report_init ();
-
- return TRUE;
-}
-
-int
-libgncmod_report_gnome_gnc_module_end(int refcount)
-{
- return TRUE;
-}
diff --git a/gnucash/report/report-gnome/report-gnome.i b/gnucash/report/report-gnome/report-gnome.i
deleted file mode 100644
index 92118dcb1..000000000
--- a/gnucash/report/report-gnome/report-gnome.i
+++ /dev/null
@@ -1,41 +0,0 @@
-/********************************************************************\
- * 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, contact: *
- * *
- * Free Software Foundation Voice: +1-617-542-5942 *
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
- * Boston, MA 02110-1301, USA gnu at gnu.org *
- * *
-\********************************************************************/
-
-%module sw_report_gnome
-%{
-/* Includes the header in the wrapper code */
-#include <config.h>
-#include <gtk/gtk.h>
-#include <gnc-plugin-page-report.h>
-#include <window-report.h>
-#include <dialog-custom-report.h>
-%}
-#if defined(SWIGGUILE)
-%{
-#include "guile-mappings.h"
-
-SCM scm_init_sw_report_gnome_module (void);
-%}
-#endif
-
-%import "base-typemaps.i"
-
-void gnc_main_window_open_report(int report_id, GncMainWindow *window);
-void gnc_ui_custom_report(GncMainWindow * window);
diff --git a/gnucash/report/report-gnome/test/CMakeLists.txt b/gnucash/report/report-gnome/test/CMakeLists.txt
deleted file mode 100644
index e35e71604..000000000
--- a/gnucash/report/report-gnome/test/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-set(REPORT_GNOME_TEST_INCLUDE_DIRS
- ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
- ${GUILE_INCLUDE_DIRS}
-
-)
-
-
-set(REPORT_GNOME_TEST_LIBS gnc-module)
-
-gnc_add_test_with_guile(test-link-module-report-gnome test-link-module.c
- REPORT_GNOME_TEST_INCLUDE_DIRS REPORT_GNOME_TEST_LIBS
-)
-
-set(GUILE_DEPENDS
- scm-app-utils
- scm-gnome-utils
- gnc-module
- scm-engine
- scm-report-gnome
-)
-
-add_custom_target(test-report-gnome ALL DEPENDS ${GUILE_DEPENDS})
-add_dependencies(test-link-module-report-gnome test-report-gnome)
-
-gnc_add_scheme_test_targets(scm-test-load-report-gnome-module
- "test-load-report-gnome-module.scm"
- "tests"
- "${GUILE_DEPENDS}"
- FALSE
-)
-gnc_add_scheme_tests(test-load-report-gnome-module.scm)
-
-set_dist_list(test_report_gnome_DIST CMakeLists.txt test-link-module.c test-load-report-gnome-module.scm)
-
diff --git a/gnucash/report/report-gnome/test/test-link-module.c b/gnucash/report/report-gnome/test/test-link-module.c
deleted file mode 100644
index 63935259c..000000000
--- a/gnucash/report/report-gnome/test/test-link-module.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/********************************************************************\
- * 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, contact: *
- * *
- * Free Software Foundation Voice: +1-617-542-5942 *
- * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
- * Boston, MA 02110-1301, USA gnu at gnu.org *
- * *
-\********************************************************************/
-
-#include <stdlib.h>
-#include <libguile.h>
-#include <gnc-module.h>
-
-static void
-guile_main(void *closure, int argc, char ** argv)
-{
- GNCModule mod;
- gnc_module_system_init();
- mod = gnc_module_load("gnucash/report/report-gnome", 0);
-
- exit(mod == NULL);
-}
-
-int
-main(int argc, char ** argv)
-{
- g_setenv ("GNC_UNINSTALLED", "1", TRUE);
- scm_boot_guile(argc, argv, guile_main, NULL);
- return 0;
-}
-
-
-
diff --git a/gnucash/report/report-gnome/test/test-load-report-gnome-module.scm b/gnucash/report/report-gnome/test/test-load-report-gnome-module.scm
deleted file mode 100755
index 85f07cdc8..000000000
--- a/gnucash/report/report-gnome/test/test-load-report-gnome-module.scm
+++ /dev/null
@@ -1,22 +0,0 @@
-#! @SHELL@
-exec ${GUILE} -s "$0"
-!#
-
-(debug-enable 'backtrace)
-
-(debug-set! stack 500000)
-(if (< (string->number (major-version)) 2)
- (debug-set! maxdepth 100000))
-
-(display " testing report module load ... ")
-(use-modules (gnucash gnc-module))
-(gnc:module-system-init)
-
-(setenv "GNC_UNINSTALLED" "1")
-(if (gnc:module-load "gnucash/report/report-gnome" 0)
- (begin
- (display "ok\n")
- (exit 0))
- (begin
- (display "failed\n")
- (exit -1)))
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index 285662cb8..ff86da5bb 100644
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -11,11 +11,16 @@ set(stylesheets_noinst_HEADERS
add_library(gncmod-stylesheets MODULE ${stylesheets_SOURCES} ${stylesheets_noinst_HEADERS})
-target_link_libraries(gncmod-stylesheets gncmod-report-gnome gncmod-report-system gncmod-gnome-utils gnc-module
+target_link_libraries(gncmod-stylesheets gnc-gnome gncmod-report-system gncmod-gnome-utils gnc-module
${GUILE_LDFLAGS} ${GTK3_LDFLAGS} ${GLIB2_LDFLAGS})
target_compile_definitions(gncmod-stylesheets PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")
+target_include_directories(gncmod-stylesheets
+ PRIVATE
+ ${CMAKE_SOURCE_DIR}/gnucash/gnome
+)
+
set(LIB_DIR ${CMAKE_INSTALL_LIBDIR}/gnucash)
if (WIN32)
set(LIB_DIR ${CMAKE_INSTALL_BINDIR})
diff --git a/gnucash/report/stylesheets/test/CMakeLists.txt b/gnucash/report/stylesheets/test/CMakeLists.txt
index 30eb540da..38d2f751a 100644
--- a/gnucash/report/stylesheets/test/CMakeLists.txt
+++ b/gnucash/report/stylesheets/test/CMakeLists.txt
@@ -9,7 +9,7 @@ set(GUILE_DEPENDS
scm-gnome-utils
gncmod-html
scm-report-system
- scm-report-gnome
+ scm-gnome
scm-report-stylesheets
)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 146c2e99f..04585113c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -49,6 +49,7 @@ gnucash/gnome/dialog-billterms.c
gnucash/gnome/dialog-choose-owner.c
gnucash/gnome/dialog-commodities.c
gnucash/gnome/dialog-customer.c
+gnucash/gnome/dialog-custom-report.c
gnucash/gnome/dialog-date-close.c
gnucash/gnome/dialog-employee.c
gnucash/gnome/dialog-fincalc.c
@@ -66,6 +67,8 @@ gnucash/gnome/dialog-price-edit-db.c
gnucash/gnome/dialog-price-editor.c
gnucash/gnome/dialog-print-check.c
gnucash/gnome/dialog-progress.c
+gnucash/gnome/dialog-report-column-view.c
+gnucash/gnome/dialog-report-style-sheet.c
gnucash/gnome/dialog-sx-editor2.c
gnucash/gnome/dialog-sx-editor.c
gnucash/gnome/dialog-sx-from-trans.c
@@ -84,6 +87,7 @@ gnucash/gnome/gnc-plugin-page-invoice.c
gnucash/gnome/gnc-plugin-page-owner-tree.c
gnucash/gnome/gnc-plugin-page-register2.c
gnucash/gnome/gnc-plugin-page-register.c
+gnucash/gnome/gnc-plugin-page-report.c
gnucash/gnome/gnc-plugin-page-sx-list.c
gnucash/gnome/gnc-plugin-register2.c
gnucash/gnome/gnc-plugin-register.c
@@ -92,11 +96,13 @@ gnucash/gnome/gnc-split-reg.c
gnucash/gnome/gnucash.appdata.xml.in
gnucash/gnome/gnucash.desktop.in.in
gnucash/gnome/reconcile-view.c
+gnucash/gnome/report-menus.scm
gnucash/gnome/search-owner.c
gnucash/gnome/top-level.c
gnucash/gnome/window-autoclear.c
gnucash/gnome/window-reconcile2.c
gnucash/gnome/window-reconcile.c
+gnucash/gnome/window-report.c
gnucash/gnome-search/dialog-search.c
gnucash/gnome-search/gnc-general-search.c
gnucash/gnome-search/gncmod-gnome-search.c
@@ -416,13 +422,6 @@ gnucash/report/locale-specific/us/gncmod-locale-reports-us.c
gnucash/report/locale-specific/us/taxtxf-de_DE.scm
gnucash/report/locale-specific/us/taxtxf.scm
gnucash/report/locale-specific/us/us.scm
-gnucash/report/report-gnome/dialog-custom-report.c
-gnucash/report/report-gnome/dialog-report-column-view.c
-gnucash/report/report-gnome/dialog-report-style-sheet.c
-gnucash/report/report-gnome/gncmod-report-gnome.c
-gnucash/report/report-gnome/gnc-plugin-page-report.c
-gnucash/report/report-gnome/report-gnome.scm
-gnucash/report/report-gnome/window-report.c
gnucash/report/reports/aging.scm
gnucash/report/reports/reports.scm
gnucash/report/reports/sample/hello-world.scm
Summary of changes:
.gitignore | 2 -
borrowed/chartjs/CMakeLists.txt | 2 +-
gnucash/CMakeLists.txt | 2 +-
gnucash/gnome/CMakeLists.txt | 43 +++++++-
.../report-gnome => gnome}/dialog-custom-report.c | 0
.../report-gnome => gnome}/dialog-custom-report.h | 0
.../dialog-report-column-view.c | 0
.../dialog-report-column-view.h | 0
.../dialog-report-style-sheet.c | 0
.../dialog-report-style-sheet.h | 0
.../gnc-plugin-page-report.c | 0
.../gnc-plugin-page-report.h | 0
gnucash/gnome/gnome.i | 8 ++
.../report-gnome.scm => gnome/report-menus.scm} | 11 +--
.../{report/report-gnome => gnome}/window-report.c | 0
.../{report/report-gnome => gnome}/window-report.h | 0
gnucash/gnucash-bin.c | 10 +-
gnucash/import-export/aqb/test/CMakeLists.txt | 2 +-
gnucash/report/CMakeLists.txt | 3 +-
gnucash/report/report-gnome/CMakeLists.txt | 77 ---------------
gnucash/report/report-gnome/gncmod-report-gnome.c | 108 ---------------------
gnucash/report/report-gnome/report-gnome.i | 41 --------
gnucash/report/report-gnome/test/CMakeLists.txt | 34 -------
.../report/report-gnome/test/test-link-module.c | 44 ---------
.../test/test-load-report-gnome-module.scm | 22 -----
gnucash/report/stylesheets/CMakeLists.txt | 7 +-
gnucash/report/stylesheets/test/CMakeLists.txt | 2 +-
po/POTFILES.in | 13 ++-
28 files changed, 76 insertions(+), 355 deletions(-)
rename gnucash/{report/report-gnome => gnome}/dialog-custom-report.c (100%)
rename gnucash/{report/report-gnome => gnome}/dialog-custom-report.h (100%)
rename gnucash/{report/report-gnome => gnome}/dialog-report-column-view.c (100%)
rename gnucash/{report/report-gnome => gnome}/dialog-report-column-view.h (100%)
rename gnucash/{report/report-gnome => gnome}/dialog-report-style-sheet.c (100%)
rename gnucash/{report/report-gnome => gnome}/dialog-report-style-sheet.h (100%)
rename gnucash/{report/report-gnome => gnome}/gnc-plugin-page-report.c (100%)
rename gnucash/{report/report-gnome => gnome}/gnc-plugin-page-report.h (100%)
rename gnucash/{report/report-gnome/report-gnome.scm => gnome/report-menus.scm} (93%)
rename gnucash/{report/report-gnome => gnome}/window-report.c (100%)
rename gnucash/{report/report-gnome => gnome}/window-report.h (100%)
delete mode 100644 gnucash/report/report-gnome/CMakeLists.txt
delete mode 100644 gnucash/report/report-gnome/gncmod-report-gnome.c
delete mode 100644 gnucash/report/report-gnome/report-gnome.i
delete mode 100644 gnucash/report/report-gnome/test/CMakeLists.txt
delete mode 100644 gnucash/report/report-gnome/test/test-link-module.c
delete mode 100755 gnucash/report/report-gnome/test/test-load-report-gnome-module.scm
More information about the gnucash-changes
mailing list