gnucash unstable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/ad11afef (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e319a167 (commit)
	from  https://github.com/Gnucash/gnucash/commit/fcb4bdac (commit)



commit ad11afefb48dbcfa958e332042f3be80159f78dd
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Dec 1 20:31:44 2017 -0800

    LIBDIR is not lib--two more CMakeLists.txt.

diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index 5c8f129..2038a35 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -96,7 +96,7 @@ IF(WITH_PYTHON)
     DEPENDS ${SWIG_GNUCASH_CORE_C})
 
   ADD_CUSTOM_TARGET(gnucash-core-c-build ALL
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/gnucash/_gnucash_core_c${CMAKE_SHARED_MODULE_SUFFIX} ${PYTHON_SYSCONFIG_BUILD}/gnucash
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR_BUILD}/gnucash/_gnucash_core_c${CMAKE_SHARED_MODULE_SUFFIX} ${PYTHON_SYSCONFIG_BUILD}/gnucash
     DEPENDS gnucash_core_c)
     
 ENDIF()
diff --git a/bindings/python/tests/CMakeLists.txt b/bindings/python/tests/CMakeLists.txt
index 201bde7..75bc92e 100644
--- a/bindings/python/tests/CMakeLists.txt
+++ b/bindings/python/tests/CMakeLists.txt
@@ -3,7 +3,7 @@ IF (WITH_PYTHON)
   ADD_TEST(python-bindings ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runTests.py.in)
   SET_PROPERTY(TEST python-bindings PROPERTY ENVIRONMENT
     GNC_BUILDDIR=${CMAKE_BINARY_DIR}
-    PYTHONPATH=${PYTHON_SYSCONFIG_BUILD}:${CMAKE_BINARY_DIR}/lib/gnucash:${CMAKE_BINARY_DIR}/common/test-core
+    PYTHONPATH=${PYTHON_SYSCONFIG_BUILD}:${LIBDIR_BUILD}/gnucash:${CMAKE_BINARY_DIR}/common/test-core
   )
 ENDIF()
 

commit e319a16747d8b9b9d91ed60de22f77a75c0e5320
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Dec 1 20:10:55 2017 -0800

    Remove gnucash/test.
    
    The only purpose of which was to test overrides/gnucash-env.

diff --git a/common/cmake_modules/MakeDistFiles.cmake b/common/cmake_modules/MakeDistFiles.cmake
index bb57499..2fb80db 100644
--- a/common/cmake_modules/MakeDistFiles.cmake
+++ b/common/cmake_modules/MakeDistFiles.cmake
@@ -46,7 +46,6 @@ SET(COPY_FROM_BUILD
   libgnucash/app-utils/swig-app-utils-python.c
   libgnucash/backend/xml/test/test-real-data.sh
   gnucash/gnucash.rc
-  gnucash/test/test-version
   libgnucash/core-utils/gnc-vcs-info.h
   libgnucash/core-utils/swig-core-utils-guile.c
   libgnucash/core-utils/swig-core-utils-python.c
diff --git a/configure.ac b/configure.ac
index 83f76fb..cdc0a5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1777,8 +1777,6 @@ AC_CONFIG_FILES(
 dnl # Shell scripts, to have their shells set
 AC_CONFIG_FILES([libgnucash/backend/xml/test/test-real-data.sh],
                 [chmod +x libgnucash/backend/xml/test/test-real-data.sh])
-AC_CONFIG_FILES([gnucash/test/test-version],
-                [chmod +x gnucash/test/test-version])
 
 
 #Link (copy on Windows) test data files:
diff --git a/gnucash/test/CMakeLists.txt b/gnucash/test/CMakeLists.txt
deleted file mode 100644
index 2ec82f0..0000000
--- a/gnucash/test/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIGURE_FILE(test-version.in test-version)
-
-ADD_TEST(NAME test-version
-         COMMAND ${CMAKE_BINARY_DIR}/bin/gnucash --version)
-
-SET_DIST_LIST(test_bin_DIST CMakeLists.txt Makefile.am test-version.in)
\ No newline at end of file
diff --git a/gnucash/test/Makefile.am b/gnucash/test/Makefile.am
deleted file mode 100644
index b8d3ad4..0000000
--- a/gnucash/test/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-TESTS = test-version
-
-TESTS_ENVIRONMENT = \
-	PATH="..:${PATH}"
-
-EXTRA_DIST = \
-	test-version \
-	CMakeLists.txt
diff --git a/gnucash/test/test-version.in b/gnucash/test/test-version.in
deleted file mode 100755
index d5b1356..0000000
--- a/gnucash/test/test-version.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#! @SHELL@
-GUILE_WARN_DEPRECATED="no"
-export GUILE_WARN_DEPRECATED
-
-exec ../overrides/gnucash-build-env ../gnucash --version



Summary of changes:
 bindings/python/CMakeLists.txt           | 2 +-
 bindings/python/tests/CMakeLists.txt     | 2 +-
 common/cmake_modules/MakeDistFiles.cmake | 1 -
 configure.ac                             | 2 --
 gnucash/test/CMakeLists.txt              | 6 ------
 gnucash/test/Makefile.am                 | 9 ---------
 gnucash/test/test-version.in             | 5 -----
 7 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 gnucash/test/CMakeLists.txt
 delete mode 100644 gnucash/test/Makefile.am
 delete mode 100755 gnucash/test/test-version.in