Merge pull request #6 from adamyg/topic/beta5

Topic/beta5
adamyg · Jan 16, 2022 · f89a9f7 · f89a9f7
2 parents 13dcf5b + 17c0f12
commit f89a9f7
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -50,15 +50,14 @@ jobs:
         call ./mk-cmake --vs140 --lang en
         @exit 0
 
-    - name: Windows, publish
-      uses: actions/upload-artifact@v2
-      with:
-        name: install-win32.vs140
-        path: ./installer.vs140/*
-
     - name: Windows, tarball
       uses: actions/upload-artifact@v2
       with:
         name: package-win32.vs140
         path: ./output.vs140/*
 
+    - name: Windows, release
+      uses: softprops/action-gh-release@v1
+      with:
+       files: ./installer.vs140/*
+       draft: true
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+        "cmake.sourceDirectory": "${workspaceFolder}/CMakefiles"
+}
diff --git a/CMakefiles/libaspell/make-dicts/CMakeLists.txt b/CMakefiles/libaspell/make-dicts/CMakeLists.txt
@@ -203,7 +203,7 @@ foreach(dict_spec ${DICTIONARIES})
                 )
 
         # Dictionary custom target
-        message("build: dictionary_${DICTIONARY_LANG} [${DICTIONARY_NAME}=${DICTIONARY_FILE}]")
+        message("build: dictionary_${DICTIONARY_LANG} [${DICTIONARY_NAME}, ${DICTIONARY_FILE}, ${DICTIONARY_VERSION}]")
 
         add_custom_target(
                 dictionary_${DICTIONARY_LANG}_import

diff --git a/README.md b/README.md
@@ -6,13 +6,13 @@ spell checker. Its main feature is that it does a superior job of suggesting pos
 replacements for a misspelled word than just about any other spell checker out there
 for the English language.
 
-The following packages need to be installed to build this package, based on aspell 0.60.8:
+The following tools need to be installed to build this package, based on aspell 0.60.8:
 
   * cmake
   * cygwin or msys
   * perl
   * Visual studio 2008+
-  * Innosetup
+  * Innosetup 5
 
 Build and package
 

diff --git a/mk-cmake.bat b/mk-cmake.bat
@@ -31,7 +31,7 @@ set BUILD=yes
 set PACKAGE=no
 set DICTIONARY=
 set INTERACTIVE=OFF
-set X32=yes
+set X86=yes
 set X64=yes
 
 :Arguments
@@ -168,13 +168,15 @@ if "%1"=="--vs143" (
         )
 
 if "%1"=="--Win32" (
-        set X32=yes
+:Win32
+        set X86=yes
         set X64=no
         shift
         goto Arguments
         )
+if "%1"=="--x86" goto Win32
 if "%1"=="--x64" (
-        set X32=no
+        set X86=no
         set X64=yes
         shift
         goto Arguments
@@ -202,7 +204,7 @@ if "%1"=="-?" goto Help
         echo #    --lang_list           list dictionaries.
         echo #
         echo #  Architecture:
-        echo #    --Win32               32-bit only.
+        echo #    --Win32,x86           32-bit only.
         echo #    --x64                 64-bit only.
         echo #
         echo #  Toolchains:
@@ -227,7 +229,7 @@ if "%1"=="-?" goto Help
                 )
         )
 
-        if "%X32%"=="yes" (
+        if "%X86%"=="yes" (
                 if "%PRIME%"=="yes" (
                         %CMAKE% -G %TOOLCHAIN% -A Win32 -S CMakefiles -B "build_win32_%CONFIG%.%MSVC%" -DPACKAGE_INTERACTIVE=%INTERACTIVE%
                 )

diff --git a/msvc2015/msvc2015.sln → msvc2015/aspell_msvc2015.sln b/msvc2015/msvc2015.sln → msvc2015/aspell_msvc2015.sln
diff --git a/win32port/Aspell.iss.in b/win32port/Aspell.iss.in
@@ -38,12 +38,16 @@ InfoBeforeFile=@ISS_SOURCE_DIRECTORY@\COPYING
 DirExistsWarning=no
 DisableStartupPrompt=yes
 OutputDir=@ISS_SETUP_DIRECTORY@
+Compression=lzma2
+SolidCompression=yes
 
 #define SourceDir "@ISS_SOURCE_DIRECTORY@"
 #define BuildDocDir "@ISS_BUILD_DIRECTORY@"
 
 #if "@ISS_ARCHITECTURE@"=="x64"
 #define BuildBinDir "@ISS_BUILD_DIRECTORY@/x64"
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode=x64
 OutputBaseFilename=aspell-@ASPELL_VERSION@-x64-setup
 
 #else
@@ -63,6 +67,9 @@ Source: "{#BuildBinDir}\Release\bin\aspell.exe";                DestDir: "{app}\
 Source: "{#BuildBinDir}\Release\bin\aspell-list-dicts.exe";     DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "{#BuildBinDir}\Release\bin\word-list-compress.exe";    DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "{#BuildBinDir}\Release\bin\*.dll";                     DestDir: "{app}\bin"; Flags: ignoreversion sharedfile
+   ; See, sharedfile:
+   ;    Computer\HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\SharedDlls
+   ;    Computer\HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\SharedDLLs
 
 ; Libraries
 Source: "{#BuildBinDir}\Release\lib\*";                         DestDir: "{app}\lib"; Flags: ignoreversion sharedfile
@@ -74,7 +81,7 @@ Source: "{#SourceDir}\scripts\aspell-import";                   DestDir: "{app}\
 
 ; Interface
 Source: "{#SourceDir}\interfaces\cc\aspell.h";                  DestDir: "{app}\include"; Flags: ignoreversion
-Source: "{#SourceDir}\interfaces\cc\pspell.h";                  DestDir: "{app}\include"; Flags: ignoreversion
+Source: "{#SourceDir}\interfaces\cc\pspell.h";                  DestDir: "{app}\include\pspell"; Flags: ignoreversion
 
 ; Documentation
 Source: "{#SourceDir}\README.md";                               DestDir: "{app}"; Flags: ignoreversion

diff --git a/win32port/Dictionary.iss.in b/win32port/Dictionary.iss.in
@@ -40,6 +40,8 @@ DirExistsWarning=no
 DisableStartupPrompt=yes
 OutputDir=@DICTIONARY_OUTPUT_DIRECTORY@
 OutputBaseFilename=aspell-@DICTIONARY_LANG@-@DICTIONARY_VERSION@-setup
+Compression=lzma2
+SolidCompression=yes
 
 [Files]
 

diff --git a/win32port/dirs.cpp b/win32port/dirs.cpp
@@ -226,6 +226,7 @@ aspell_DICT_DIR(void)
                     }
                 }
                 RegCloseKey(hKey);
+                hKey = 0;
             }
 
 #if defined(_WIN64)
-Original file line number
+Diff line change
@@ Expand Up / @@ -226,6 +226,7 @@ aspell_DICT_DIR(void) @@
                         }
                     }
                     RegCloseKey(hKey);
+                    hKey = 0;
                 }
     #if defined(_WIN64)
@@ Expand Down @@