Merge branch 'maint'

.gitignore

@@ -12,6 +12,7 @@
 *.pyo
 *.schemas
 *~
+.*.sw?
 .autotools
 .cproject
 .deps
@@ -24,6 +25,7 @@ INSTALL
 Makefile
 Makefile.in
 TAGS
+tags
 aclocal.m4
 autom4te.cache
 build*/

bindings/python/CMakeLists.txt

@@ -62,6 +62,8 @@ IF(WITH_PYTHON)
     ${PYTHON_INCLUDE_DIRS}
   )
 
+  SET(PYEXEC_FILES  __init__.py function_class.py gnucash_business.py gnucash_core.py)
+
   ADD_LIBRARY(gnucash_core_c MODULE ${SWIG_GNUCASH_CORE_C})
   TARGET_INCLUDE_DIRECTORIES(gnucash_core_c PRIVATE ${gnucash_core_c_INCLUDE_DIRS})
 
@@ -100,19 +102,19 @@ IF(WITH_PYTHON)
     DESTINATION ${PYTHON_SYSCONFIG_OUTPUT}/gnucash
   )
 
+  FILE(COPY ${PYEXEC_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gnucash)
+
+  ADD_CUSTOM_TARGET(gnucash-core-c-py ALL
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/gnucash_core_c.py ${CMAKE_CURRENT_BINARY_DIR}/gnucash
+    DEPENDS ${SWIG_GNUCASH_CORE_C})
+
 ENDIF()
 
-SET(python_bindings_DATA
-        __init__.py
-        function_class.py
-        gnucash_business.py
+SET(python_bindings_DATA ${PYEXEC_FILES}
         gnucash_core.i
-        gnucash_core.py
         sqlite3test.c
         timespec.i)
 
 SET_LOCAL_DIST(python_bindings_DIST_local CMakeLists.txt Makefile.am ${python_bindings_DATA})
 
-SET(python_bindings_DIST ${python_bindings_DIST_local} ${test_python_bindings_DIST} ${example_scripts_DIST} PARENT_SCOPE)
-
-
+SET(python_bindings_DIST ${python_bindings_DIST_local} ${test_python_bindings_DIST} ${example_scripts_DIST} PARENT_SCOPE)

bindings/python/tests/CMakeLists.txt

@@ -1,4 +1,12 @@
 
+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=${CMAKE_BINARY_DIR}/src/optional/python-bindings:${CMAKE_BINARY_DIR}/lib/gnucash:${CMAKE_BINARY_DIR}/src/test-core
+  )
+ENDIF()
+
 SET(test_python_bindings_DATA
         runTests.py.in
         test_account.py

gnucash/gnome-search/CMakeLists.txt

@@ -62,3 +62,9 @@ INSTALL(FILES ${gnome_search_HEADERS} DESTINATION include/gnucash)
 SET(gnome_search_GLADE dialog-search.glade)
 
 INSTALL(FILES ${gnome_search_GLADE} DESTINATION share/gnucash/gtkbuilder)
+
+FILE(COPY .
+    DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
+    PATTERN Makefile.* EXCLUDE
+    PATTERN CMakeLists.txt EXCLUDE)
+

po/CMakeLists.txt

@@ -27,7 +27,7 @@ SET_LOCAL_DIST(po_DIST_local ${po_SOURCES} CMakeLists.txt ChangeLog Makevars
 SET(po_DIST ${po_DIST_local} ${po_glossary_DIST} PARENT_SCOPE)
 
 FOREACH(lingua ${ALL_LINGUAS})
-  SET(_OUTPUT_FILE ${lingua}.gmo)
+  SET(_OUTPUT_FILE ${lingua}.mo)
   LIST(APPEND CATALOGS ${_OUTPUT_FILE})
   ADD_CUSTOM_COMMAND(
       OUTPUT ${_OUTPUT_FILE}
@@ -35,11 +35,11 @@ FOREACH(lingua ${ALL_LINGUAS})
   )
 SET(_BUILD_FILE_DIR ${DATADIR_BUILD}/locale/${lingua}/LC_MESSAGES)
   MAKE_DIRECTORY(${_BUILD_FILE_DIR})
-  SET(_BUILD_FILE ${_BUILD_FILE_DIR}/gnucash.gmo)
+  SET(_BUILD_FILE ${_BUILD_FILE_DIR}/gnucash.mo)
   LIST(APPEND BUILD_CATALOGS ${_BUILD_FILE})
   ADD_CUSTOM_COMMAND(
     OUTPUT ${_BUILD_FILE}
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.gmo ${_BUILD_FILE}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.mo ${_BUILD_FILE}
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_OUTPUT_FILE}
     #APPEND
     )
@@ -50,7 +50,7 @@ ADD_CUSTOM_TARGET(po-gmo-build ALL DEPENDS ${BUILD_CATALOGS})
 
 
 FOREACH(lingua ${ALL_LINGUAS})
-  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.gmo RENAME gnucash.mo DESTINATION share/locale/${lingua}/LC_MESSAGES)
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${lingua}.mo RENAME gnucash.mo DESTINATION share/locale/${lingua}/LC_MESSAGES)
 ENDFOREACH(lingua)
 
 FUNCTION(READ_FILE_REMOVING_COMMENTS OUTPUT PATH)