mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Remove overrides directory as being obsolete.
Also don't install qof test headers to libexec.
This commit is contained in:
John Ralls
parent
9b0a8723a4
commit
0a8e50069c
@ -9,7 +9,6 @@ ADD_SUBDIRECTORY (import-export)
|
||||
ADD_SUBDIRECTORY (python)
|
||||
ADD_SUBDIRECTORY (register)
|
||||
ADD_SUBDIRECTORY (report)
|
||||
ADD_SUBDIRECTORY (overrides)
|
||||
ADD_SUBDIRECTORY (test)
|
||||
|
||||
ADD_DEFINITIONS (-DHAVE_CONFIG_H)
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
|
||||
SET(GNC_PKGLIB_INSTALLDIR ${PKGLIBDIR})
|
||||
SET(GNC_SCM_INSTALLDIR ${SCHEME_INSTALLED_SOURCE_DIR})
|
||||
SET(GNC_LIB_INSTALLDIR ${LIBDIR})
|
||||
SET(GNC_PYTHON_DIR ${GNUCASH_PATH_DIR})
|
||||
SET(GUILE ${GUILE_EXECUTABLE})
|
||||
SET(GNC_SRCDIR ${CMAKE_SOURCE_DIR})
|
||||
SET(GNC_BUILDDIR ${CMAKE_BINARY_DIR})
|
||||
|
||||
CONFIGURE_FILE(gnucash-make-guids.in gnucash-make-guids)
|
||||
CONFIGURE_FILE(gnucash-make-guids.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-make-guids)
|
||||
GNC_CONFIGURE(gnucash-env.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-env)
|
||||
GNC_CONFIGURE(guile.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/guile) #not installed
|
||||
GNC_CONFIGURE(gnucash-build-env.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-build-env) # not installed
|
||||
|
||||
SET_DIST_LIST(overrides_DIST CMakeLists.txt gnucash-build-env.in gnucash-env.in gnucash-make-guids.in guile.in Makefile.am)
|
||||
|
||||
SET(SCRIPT_OUTPUT_DIR ${LIBDIR_BUILD}exec/gnucash/overrides)
|
||||
|
||||
FOREACH(file gnucash-make-guids gnucash-env guile gnucash-build-env)
|
||||
FILE(COPY ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${file}
|
||||
DESTINATION ${SCRIPT_OUTPUT_DIR}
|
||||
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
||||
)
|
||||
ENDFOREACH(file)
|
||||
|
||||
INSTALL(
|
||||
PROGRAMS
|
||||
${SCRIPT_OUTPUT_DIR}/gnucash-env
|
||||
${SCRIPT_OUTPUT_DIR}/gnucash-make-guids
|
||||
DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/gnucash/overrides
|
||||
)
|
||||
@ -1,50 +0,0 @@
|
||||
gncoverridesdir = ${GNC_LIBEXECDIR}/overrides
|
||||
# When you add a file here, please modify ../test/Makefile.am's overrides.stamp
|
||||
gncoverrides_SCRIPTS = \
|
||||
gnucash-env \
|
||||
gnucash-make-guids
|
||||
|
||||
EXTRA_DIST = \
|
||||
gnucash-env.in \
|
||||
gnucash-build-env.in \
|
||||
gnucash-make-guids \
|
||||
guile.in \
|
||||
CMakeLists.txt
|
||||
|
||||
noinst_DATA = gnucash-build-env guile
|
||||
|
||||
PWD := $(shell pwd)
|
||||
|
||||
## We borrow guile's convention and use @-...-@ as the substitution
|
||||
## brackets below, instead of the usual @...@. This prevents autoconf
|
||||
## from substituting the values directly into the left-hand sides of
|
||||
## the sed substitutions. *sigh*
|
||||
|
||||
guile: guile.in ${top_builddir}/config.status Makefile
|
||||
rm -f $@.tmp
|
||||
sed < $< > $@.tmp \
|
||||
-e 's#@-GUILE-@#${GUILE}#'
|
||||
mv $@.tmp $@
|
||||
chmod u+x $@
|
||||
CLEANFILES = guile
|
||||
|
||||
gnucash-env: gnucash-env.in ${top_builddir}/config.status Makefile
|
||||
rm -f $@.tmp
|
||||
sed < $< > $@.tmp \
|
||||
-e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
|
||||
-e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
|
||||
-e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
|
||||
-e 's#@-GNC_SCRIPT_OVERRIDE_DIR-@#${gncoverridedir}#g' \
|
||||
-e 's#@-GNC_PYTHON_DIR-@#${pythondir}#g'
|
||||
mv $@.tmp $@
|
||||
chmod u+x $@
|
||||
CLEANFILES += gnucash-env
|
||||
|
||||
gnucash-build-env: gnucash-build-env.in ${top_builddir}/config.status Makefile
|
||||
rm -f $@.tmp
|
||||
sed < $< > $@.tmp \
|
||||
-e 's#@-GNC_BUILDDIR-@#${abs_top_builddir}#g' \
|
||||
-e 's#@-GNC_SRCDIR-@#${abs_top_srcdir}#g'
|
||||
mv $@.tmp $@
|
||||
chmod u+x $@
|
||||
CLEANFILES += gnucash-build-env
|
||||
@ -1,88 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Usage: gnucash-build-env
|
||||
|
||||
# Usage: gnucash-build-env any-cmd [ args ... ]
|
||||
# runs any-cmd in gnucash's build environment.
|
||||
|
||||
# As with all the other gnucash overrides scripts, expects PATH to be
|
||||
# set appropriately.
|
||||
|
||||
top_srcdir="@-GNC_SRCDIR-@"
|
||||
top_builddir="@-GNC_BUILDDIR-@"
|
||||
|
||||
if test "${GNC_CONFIG_PATH}"x = x
|
||||
then
|
||||
GNC_CONFIG_PATH="(\"${top_srcdir}/libgnucash/scm\")"
|
||||
export GNC_CONFIG_PATH
|
||||
fi
|
||||
|
||||
if test "${GNC_SHARE_PATH}"x = x
|
||||
then
|
||||
GNC_SHARE_PATH="(\"${top_srcdir}/libgnucash/scm\" \"${top_srcdir}/libgnucash/quotes\")"
|
||||
export GNC_SHARE_PATH
|
||||
fi
|
||||
|
||||
if test "${GNC_DOC_PATH}"x = x
|
||||
then
|
||||
GNC_DOC_PATH="(\"${top_srcdir}/libgnucash/scm\")"
|
||||
export GNC_DOC_PATH
|
||||
fi
|
||||
|
||||
set +x
|
||||
eval `${top_srcdir}/common/gnc-test-env.pl \
|
||||
--gnc-module-dir ${top_builddir}/libgnucash/engine \
|
||||
--gnc-module-dir ${top_builddir}/libgnucash/tax/us \
|
||||
--gnc-module-dir ${top_builddir}/libgnucash/app-utils \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/gnome-utils \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/gnome-search \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/import-export \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/import-export/hbci \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/import-export/log-replay \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/import-export/ofx \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/import-export/qif-import \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/report/locale-specific/us \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/report/report-gnome \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/report/stylesheets \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/register/register-core \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/register/register-gnome \
|
||||
--gnc-module-dir ${top_builddir}/gnucash/register/ledger-core \
|
||||
\
|
||||
--guile-load-dir ${top_builddir}/libgnucash/app-utils \
|
||||
--guile-load-dir ${top_builddir}/libgnucash/core-utils \
|
||||
--guile-load-dir ${top_builddir}/libgnucash/gnc-module \
|
||||
--guile-load-dir ${top_builddir}/libgnucash/engine \
|
||||
--guile-load-dir ${top_builddir}/libgnucash/scm \
|
||||
--guile-load-dir ${top_builddir}/libgnucash/tax/us \
|
||||
--guile-load-dir ${top_builddir}/gnucash/gnome-utils \
|
||||
--guile-load-dir ${top_builddir}/gnucash/import-export/qif-import \
|
||||
--guile-load-dir ${top_builddir}/gnucash/report/report-system \
|
||||
--guile-load-dir ${top_builddir}/gnucash/report/standard-reports \
|
||||
--guile-load-dir ${top_builddir}/gnucash/report/business-reports \
|
||||
--guile-load-dir ${top_builddir}/gnucash/report/utility-reports \
|
||||
--guile-load-dir ${top_builddir}/gnucash/report/locale-specific/us \
|
||||
--guile-load-dir ${top_builddir}/gnucash/report/report-gnome \
|
||||
--guile-load-dir ${top_builddir}/gnucash/report/stylesheets \
|
||||
\
|
||||
--library-dir ${top_builddir}/common/test-core \
|
||||
--library-dir ${top_builddir}/libgnucash/core-utils \
|
||||
--library-dir ${top_builddir}/libgnucash/app-utils \
|
||||
--library-dir ${top_builddir}/libgnucash/app-utils/calculation \
|
||||
--library-dir ${top_builddir}/libgnucash/engine \
|
||||
--library-dir ${top_builddir}/libgnucash/backend/xml \
|
||||
--library-dir ${top_builddir}/libgnucash/backend/sql \
|
||||
--library-dir ${top_builddir}/libgnucash/gnc-module \
|
||||
--library-dir ${top_builddir}/gnucash/gnome \
|
||||
--library-dir ${top_builddir}/gnucash/gnome-search \
|
||||
--library-dir ${top_builddir}/gnucash/gnome-utils \
|
||||
--library-dir ${top_builddir}/gnucash/html \
|
||||
--library-dir ${top_builddir}/gnucash/import-export \
|
||||
--library-dir ${top_builddir}/gnucash/register/register-gnome \
|
||||
--library-dir ${top_builddir}/gnucash/register/ledger-core \
|
||||
--library-dir ${top_builddir}/gnucash/register/register-core \
|
||||
--library-dir ${top_builddir}/gnucash/report/report-gnome \
|
||||
--library-dir ${top_builddir}/gnucash/report/report-system
|
||||
`
|
||||
LD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}"
|
||||
|
||||
exec "$@"
|
||||
@ -1,28 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Usage: gnucash-env any-cmd [ args ... ]
|
||||
# runs any-cmd in an environment appropriate for gnucash.
|
||||
# we'll also add a gnucash-build-env later for running from the install tree.
|
||||
|
||||
GNC_MODULE_PATH="@-GNC_PKGLIB_INSTALLDIR-@:${GNC_MODULE_PATH}"
|
||||
|
||||
EXTRA_PATH="${EXTRA_PATH}:@-GNC_SCM_INSTALL_DIR-@"
|
||||
|
||||
GUILE_LOAD_PATH="${EXTRA_PATH}:${GUILE_LOAD_PATH}"
|
||||
|
||||
EXTRA_LIBS="${GNC_MODULE_PATH}"
|
||||
EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_LIB_INSTALLDIR-@"
|
||||
EXTRA_LIBS="${EXTRA_LIBS}:@-GNC_PKGLIB_INSTALLDIR-@"
|
||||
|
||||
LD_LIBRARY_PATH="${EXTRA_LIBS}:${LD_LIBRARY_PATH}"
|
||||
DYLD_LIBRARY_PATH="${EXTRA_LIBS}:${DYLD_LIBRARY_PATH}"
|
||||
|
||||
PYTHONPATH="${PYTHONPATH}:@-GNC_PYTHON_DIR-@"
|
||||
|
||||
export GNC_MODULE_PATH
|
||||
export GUILE_LOAD_PATH
|
||||
export LD_LIBRARY_PATH
|
||||
export DYLD_LIBRARY_PATH
|
||||
export PYTHONPATH
|
||||
|
||||
exec "$@"
|
||||
@ -1,36 +0,0 @@
|
||||
#!/bin/sh
|
||||
exec gnucash-env guile -s "$0" "$@"
|
||||
!#
|
||||
|
||||
(define (usage)
|
||||
(display "Usage: gnucash-make-guids [number-to-make (default is 100)]\n")
|
||||
(exit 1))
|
||||
|
||||
(define args (cdr (program-arguments)))
|
||||
(define num-to-make 100)
|
||||
|
||||
;; Too many arguments
|
||||
(if (> (length args) 1)
|
||||
(usage))
|
||||
|
||||
(if (= (length args) 1)
|
||||
(let ((arg (string->number (car args))))
|
||||
(if (not (number? arg))
|
||||
(usage))
|
||||
(set! arg (inexact->exact arg))
|
||||
(if (<= arg 0)
|
||||
(usage))
|
||||
(set! num-to-make arg)))
|
||||
|
||||
(use-modules (gnucash gnc-module))
|
||||
(gnc:module-system-init)
|
||||
(gnc:module-load "gnucash/engine" 0)
|
||||
|
||||
(let loop ((remaining num-to-make))
|
||||
(display (guid-new-return)) (newline)
|
||||
(if (> remaining 1)
|
||||
(loop (- remaining 1))))
|
||||
|
||||
;; Local Variables:
|
||||
;; mode: scheme
|
||||
;; End:
|
||||
@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if test "${GNC_GUILE}"x = x
|
||||
then
|
||||
GNC_GUILE="@-GUILE-@"
|
||||
fi
|
||||
|
||||
exec ${GNC_GUILE} "$@"
|
||||
@ -259,16 +259,6 @@ INSTALL(TARGETS gncmod-engine
|
||||
|
||||
INSTALL(FILES ${engine_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
|
||||
|
||||
SET(qof_test_HEADERS
|
||||
kvp-frame.hpp
|
||||
qofbook.h
|
||||
qofinstance.h
|
||||
qofobject.h
|
||||
qofsession.h
|
||||
)
|
||||
|
||||
INSTALL(FILES ${qof_test_HEADERS} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/gnucash/libgnucash/engine/test)
|
||||
|
||||
# Scheme
|
||||
|
||||
SET (engine_SCHEME_0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user