registry clean-up

CMakefiles/CMakeLists.txt

@@ -132,12 +132,15 @@ endif()
 
 setup_package_version_variables(ASPELL)
 
+add_subdirectory(win32port)
+
 add_subdirectory(libaspell)
 add_subdirectory(libaspell/man-pages)
 add_subdirectory(libaspell/html-doc)
 add_subdirectory(libaspell/example)
 add_subdirectory(libaspell/list-dicts)
 add_subdirectory(libaspell/make-dicts)
+add_subdirectory(libaspell/locales)
 add_subdirectory(libpspell)
 
 add_subdirectory(PDCurses)

CMakefiles/PDCurses/firework/CMakeLists.txt

@@ -59,9 +59,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 ################################################################################
 
 target_link_libraries(${PROJECT_NAME} PDCurses)
-add_dependencies(${PROJECT_NAME}
-        PDCurses
-        )
 
 ################################################################################
 # Compile and link options

CMakefiles/PDCurses/ozdemo/CMakeLists.txt

@@ -59,9 +59,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 ################################################################################
 
 target_link_libraries(${PROJECT_NAME} PDCurses)
-add_dependencies(${PROJECT_NAME}
-        PDCurses
-        )
 
 ################################################################################
 # Compile and link options

CMakefiles/PDCurses/tuidemo/CMakeLists.txt

@@ -60,9 +60,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 ################################################################################
 
 target_link_libraries(${PROJECT_NAME} PDCurses)
-add_dependencies(${PROJECT_NAME}
-        PDCurses
-        )
 
 ################################################################################
 # Compile and link options

CMakefiles/aspell/CMakeLists.txt

@@ -78,11 +78,7 @@ target_include_directories(${PROJECT_NAME} PRIVATE
 # Dependencies
 ################################################################################
 
-target_link_libraries(${PROJECT_NAME} PDCurses libaspell)
-add_dependencies(${PROJECT_NAME}
-        PDCurses
-        libaspell
-        )
+target_link_libraries(${PROJECT_NAME} PDCurses libaspell win32port_MD)
 
 
 ################################################################################

CMakefiles/libaspell/CMakeLists.txt

@@ -129,12 +129,6 @@ set(Header_Files__speller
         )
 source_group("Header Files\\speller" FILES ${Header_Files__speller})
 
-set(Header_Files__win32port
-        "../../win32port/dirent.h"
-        "../../win32port/settings.h"
-        )
-source_group("Header Files\\win32port" FILES ${Header_Files__win32port})
-
 set(Source_Files__common
         "../../submodule/aspell/common/cache.cpp"
         "../../submodule/aspell/common/can_have_error.cpp"
@@ -221,24 +215,15 @@ set(Source_Files__tokenizer
         )
 source_group("Source Files\\tokenizer" FILES ${Source_Files__tokenizer})
 
-set(Source_Files__win32port
-        "../../win32port/dirent.c"
-        "../../win32port/dirs.cpp"
-        "../../win32port/dirs.h"
-        )
-source_group("Source Files\\win32port" FILES ${Source_Files__win32port})
-
 set(ALL_FILES
         ${Header_Files__common}
         ${Header_Files__lib}
         ${Header_Files__speller}
-        ${Header_Files__win32port}
         ${Source_Files__common}
         ${Source_Files__filter}
         ${Source_Files__lib}
         ${Source_Files__speller}
         ${Source_Files__tokenizer}
-        ${Source_Files__win32port}
         )
 
 
@@ -247,17 +232,15 @@ set(ALL_FILES
 ################################################################################
 
 include_directories(${CMAKE_BINARY_DIR})
-configure_file(
-        "../../win32port/BuildInfo.h.in"
-        "${CMAKE_BINARY_DIR}/BuildInfo.h" @ONLY
-        )
 
 add_library(${PROJECT_NAME} STATIC ${ALL_FILES})
 use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
 
 add_library(${PROJECT_NAME}${ASPELL_SHARED_VERSION}${SHARED_ARCH} SHARED ${ALL_FILES} "../../win32port/libaspell.def")
 use_props(${PROJECT_NAME}${ASPELL_SHARED_VERSION}${SHARED_ARCH} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
 
+target_link_libraries(${PROJECT_NAME}${ASPELL_SHARED_VERSION}${SHARED_ARCH} win32port_MT)
+
 
 ################################################################################
 # Include directories
@@ -302,7 +285,7 @@ set_property(TARGET ${PROJECT_NAME}${ASPELL_SHARED_VERSION}${SHARED_ARCH} PROPER
         #
         # Your personal wordlists will be saved in the prefix directory with their names changed from
         # .aspell.lang.* to lang.* (you can override the path by setting the HOME environment variable).
-        #
+
 ##add_compile_definitions(
 ##      "ENABLE_WIN32_RELOCATABLE=1"
 ##      )

CMakefiles/libaspell/html-doc/CMakeLists.txt

@@ -56,7 +56,7 @@ find_path(MAKEINFO_PATH makeinfo HINTS "c:/Cygwin64/bin" "d:/Cygwin64/bin" ENV P
 if (MAKEINFO_PATH STREQUAL "MAKEINFO_PATH-NOTFOUND")
         find_path(MAKEINFO_PATH makeinfo HINTS "c:/tools/cygwin" "c:/msys64/usr/bin" "d:/msys64/usr/bin" ENV PATH) #githb-ci: cygwin/msys
 endif()
-message("makeinfo: ${MAKEINFO_PATH}")
+message("makeinfo: ${MAKEINFO_PATH}/makeinfo")
 
 # targets
 foreach(html_doc ${MANUAL_PAGES})

CMakefiles/libaspell/list-dicts/CMakeLists.txt

@@ -60,9 +60,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 ################################################################################
 
 target_link_libraries(${PROJECT_NAME} libaspell${ASPELL_SHARED_VERSION}${SHARED_ARCH})
-add_dependencies(${PROJECT_NAME}
-        libaspell
-        )
 
 ################################################################################
 # Compile and link options

CMakefiles/libaspell/locales/CMakeLists.txt

@@ -0,0 +1,84 @@
+#
+# libaspell: locale generation
+#
+# This file is part of the aspell-win32.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+set(PROJECT_NAME aspell-locales)
+set(ROOT_NAMESPACE libaspell)
+
+################################################################################
+# Source groups
+################################################################################
+
+file(GLOB Locale_Pots
+        "../../../submodule/aspell/po/*.po")
+
+source_group("Po Files" FILES ${Locale_Pots})
+
+set(ASPELL_POTS
+        ${Locale_Pots}
+)
+
+
+################################################################################
+# Target
+################################################################################
+
+add_custom_target(locales)
+
+
+# destination
+if (NOT DEFINED ${MSVC_OUTPUT_DIRECTORY})
+        set(MSVC_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/../output.vs${MSVC_TOOLSET_VERSION}")
+endif()
+set(POT_OUTPUT_DIRECTORY "${MSVC_OUTPUT_DIRECTORY}/locale")
+file(MAKE_DIRECTORY "${POT_OUTPUT_DIRECTORY}")
+
+
+# toolchain
+find_path(MSGFMT_PATH msgfmt.exe HINTS "c:/Cygwin64/bin" "d:/Cygwin64/bin") #cygwin
+if (MSGFMT_PATH STREQUAL "MSGFMT_PATH-NOTFOUND")
+        find_path(MSGFMT_PATH msgfmt HINTS "c:/tools/cygwin" "c:/msys64/usr/bin" "d:/msys64/usr/bin" ENV PATH) #githb-ci: cygwin/msys
+endif()
+message("msgfmt: ${MSGFMT_PATH}/msgfmt")
+
+
+# targets
+foreach(po_file ${ASPELL_POTS})
+
+        # Get the filename from the full path.
+        get_filename_component(po_file_name ${po_file} NAME_WLE)
+        message("build: po_file ${po_file_name} [${POT_OUTPUT_DIRECTORY}/${po_file_name}]")
+        file(MAKE_DIRECTORY "${POT_OUTPUT_DIRECTORY}/${po_file_name}/LC_MESSAGES/")
+
+        # Add a new custom target for the current header.
+        add_custom_target(
+                po_file_${po_file_name} ALL
+                COMMENT "building: po_file [${po_file_name}.texi]"
+                COMMAND ${MSGFMT_PATH}/msgfmt --check --output=${POT_OUTPUT_DIRECTORY}/${po_file_name}/LC_MESSAGES/aspell.mo ${po_file}
+                VERBATIM
+                )
+        add_dependencies(locales po_file_${po_file_name})
+
+endforeach()
+
+#end
+

CMakefiles/libaspell/make-dicts/CMakeLists.txt

@@ -135,6 +135,7 @@ set(DICTIONARIES
 add_custom_target(dictionaries)
 use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
 
+
 # --- installer
 option(PACKAGE_INTERACTIVE "Interactive packaging creation" ON)
 if (PACKAGE_INTERACTIVE)
@@ -143,29 +144,32 @@ else()
         set(ISS_COMPILER "C:/Program Files (x86)/Inno Setup 5/iscc")
 endif()
 
+
 # --- destination
 set(DICTIONARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/../installer.vs${MSVC_TOOLSET_VERSION}") ##FIXME: target
 file(MAKE_DIRECTORY "${DICTIONARY_OUTPUT_DIRECTORY}")
 
+
 # --- toolchain
-find_path(BASH_PATH makeinfo HINTS "c:/Cygwin64/bin" "d:/Cygwin64/bin" ENV PATH) #cygwin
+find_path(BASH_PATH bash.exe HINTS "c:/Cygwin64/bin" "d:/Cygwin64/bin") #cygwin
 if (BASH_PATH STREQUAL "BASH_PATH-NOTFOUND")
-        find_path(BASH_PATH makeinfo HINTS "c:/tools/cygwin" "c:/msys64/usr/bin" "d:/msys64/usr/bin" ENV PATH) #githb-ci: cygwin/msys
+        find_path(BASH_PATH bash.exe HINTS "c:/tools/cygwin" "c:/msys64/usr/bin" "d:/msys64/usr/bin" ENV PATH) #githb-ci: cygwin/msys
 endif()
 message("bash: ${BASH_PATH}/bash")
 
-find_path(WGET_PATH makeinfo HINTS "c:/Cygwin64/bin" "d:/Cygwin64/bin" ENV PATH) #cygwin
+find_path(WGET_PATH wget.exe HINTS "c:/Cygwin64/bin" "d:/Cygwin64/bin") #cygwin
 if (WGET_PATH STREQUAL "WGET_PATH-NOTFOUND")
-        find_path(WGET_PATH makeinfo HINTS "c:/tools/cygwin" "c:/msys64/usr/bin" "d:/msys64/usr/bin" ENV PATH) #githb-ci: cygwin/msys
+        find_path(WGET_PATH wget.exe HINTS "c:/tools/cygwin" "c:/msys64/usr/bin" "d:/msys64/usr/bin" ENV PATH) #githb-ci: cygwin/msys
 endif()
 message("wget: ${WGET_PATH}/wget")
 
-find_path(TAR_PATH makeinfo HINTS "c:/Cygwin64/bin" "d:/Cygwin64/bin" ENV PATH) #cygwin
+find_path(TAR_PATH tar.exe HINTS "c:/Cygwin64/bin" "d:/Cygwin64/bin") #cygwin
 if (TAR_PATH STREQUAL "TAR_PATH-NOTFOUND")
-        find_path(TAR_PATH makeinfo HINTS "c:/tools/cygwin" "c:/msys64/usr/bin" "d:/msys64/usr/bin" ENV PATH) #githb-ci: cygwin/msys
+        find_path(TAR_PATH tar.exe HINTS "c:/tools/cygwin" "c:/msys64/usr/bin" "d:/msys64/usr/bin" ENV PATH) #githb-ci: cygwin/msys
 endif()
 message("tar:  ${TAR_PATH}/tar")
 
+
 # --- targets
 
 add_custom_target(

CMakefiles/libpspell/CMakeLists.txt

@@ -47,7 +47,7 @@ set(ALL_FILES
 add_library(${PROJECT_NAME}${ASPELL_SHARED_VERSION}${SHARED_ARCH} SHARED ${ALL_FILES} "../../win32port/libaspell.def")
 use_props(${PROJECT_NAME}${ASPELL_SHARED_VERSION}${SHARED_ARCH} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
 
-target_link_libraries(${PROJECT_NAME}${ASPELL_SHARED_VERSION}${SHARED_ARCH} libaspell${ASPELL_SHARED_VERSION}${SHARED_ARCH})
+target_link_libraries(${PROJECT_NAME}${ASPELL_SHARED_VERSION}${SHARED_ARCH} libaspell${ASPELL_SHARED_VERSION}${SHARED_ARCH} win32port_MT)
 
 
 ################################################################################

CMakefiles/prezip/CMakeLists.txt

@@ -69,9 +69,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE
 ################################################################################
 
 target_link_libraries(${PROJECT_NAME} libaspell)
-add_dependencies(${PROJECT_NAME}
-        libaspell
-        )
 
 
 ################################################################################