Migrate project to Visual C++

Author: rdipardo

.circleci/config.yml

@@ -1,20 +1,18 @@
 version: 2.1
 #
-# Copyright (c) 2023 Robert Di Pardo <dipardo.r@gmail.com>
+# Copyright (c) 2023,2024 Robert Di Pardo <dipardo.r@gmail.com>
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at https://mozilla.org/MPL/2.0/.
 #
 orbs:
-  lazarus: rdipardo/lazarus@2
   win: circleci/windows@5
 
 references:
   executor: &executor
     executor:
       name: win/default
-      shell: bash.exe
   development: &development
     filters:
       tags:
@@ -35,23 +33,24 @@ jobs:
   build:
     <<: *executor
     environment:
-      UPX_VER: 4.2.2
+      VisualStudioVersion: '17.0'
     steps:
       - checkout
       - run:
-          name: Clone submodules
+          name: Install CMake
           command: |
-            git reset --hard
-            git submodule sync --recursive
-            git submodule update -f --init --remote --checkout --recursive
+            choco install python -y
+            refreshenv
+            python -m pip install cmake~=3.30.0
+            cmake --version
       - run:
-          name: Install UPX
-          command: |
-            curl -sLO "https://github.com/upx/upx/releases/download/v$UPX_VER/upx-$UPX_VER-win64.zip"
-            7z e upx-$UPX_VER-win64.zip -o"$WINDIR"
-            upx.exe --version
-      - lazarus/install:
-          win32: true
+         name: Install the v141_xp VC toolset
+         command: |
+           cd "C:\Program Files (x86)\Microsoft Visual Studio\Installer"
+           .\vs_installer.exe modify --installPath "C:\Program Files\Microsoft Visual Studio\2022\Community" `
+            --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 `
+            --add Microsoft.VisualStudio.Component.WinXP `
+            --downloadThenInstall --quiet
       - run:
          name: Build and Pack
          command: make_release.cmd
@@ -62,14 +61,24 @@ jobs:
               pattern: 'v.*'
               value:   << pipeline.git.tag >>
           steps:
+            - run:
+               name: Prepare Artifacts
+               command: |
+                 7z a -tzip << pipeline.parameters.plugin-name >>_x64.zip ./dat/*.ini ./out/x64/Release/<< pipeline.parameters.plugin-name >>.dll
+                 7z a -tzip << pipeline.parameters.plugin-name >>_win32.zip ./dat/*.ini ./out/Win32/Release/<< pipeline.parameters.plugin-name >>_unicode.dll
+                 7z a -tzip << pipeline.parameters.plugin-name >>_arm64.zip ./dat/*.ini ./out/ARM64/Release/<< pipeline.parameters.plugin-name >>.dll
             - store_artifacts:
                 name: Upload << pipeline.parameters.plugin-name >>_unicode.dll (x86)
-                path: out/i386-win32/Release/<< pipeline.parameters.plugin-name >>_unicode.dll
-                destination: << pipeline.parameters.plugin-name >>_unicode.dll
+                path: << pipeline.parameters.plugin-name >>_win32.zip
+                destination: << pipeline.parameters.plugin-name >>_win32.zip
             - store_artifacts:
                 name: Upload << pipeline.parameters.plugin-name >>s.dll (x64)
-                path: out/x86_64-win64/Release/<< pipeline.parameters.plugin-name >>.dll
-                destination: << pipeline.parameters.plugin-name >>.dll
+                path: << pipeline.parameters.plugin-name >>_x64.zip
+                destination: << pipeline.parameters.plugin-name >>_x64.zip
+            - store_artifacts:
+                name: Upload << pipeline.parameters.plugin-name >>s.dll (ARM64)
+                path: << pipeline.parameters.plugin-name >>_arm64.zip
+                destination: << pipeline.parameters.plugin-name >>_arm64.zip
       - persist_to_workspace:
           root: .
           paths: out
@@ -88,6 +97,10 @@ jobs:
           name: Upload << pipeline.parameters.plugin-name >>_<< pipeline.git.tag >>_x64.zip
           path: out/<< pipeline.parameters.plugin-name >>_<< pipeline.git.tag >>_x64.zip
           destination: << pipeline.parameters.plugin-name >>_<< pipeline.git.tag >>_x64.zip
+      - store_artifacts:
+          name: Upload << pipeline.parameters.plugin-name >>_<< pipeline.git.tag >>_arm64.zip
+          path: out/<< pipeline.parameters.plugin-name >>_<< pipeline.git.tag >>_arm64.zip
+          destination: << pipeline.parameters.plugin-name >>_<< pipeline.git.tag >>_arm64.zip
       - run:
           name: Create Release
           command: |-
@@ -97,10 +110,11 @@ jobs:
           environment:
             SLUGX86: << pipeline.parameters.plugin-name >>_<< pipeline.git.tag >>.zip
             SLUGX64: << pipeline.parameters.plugin-name >>_<< pipeline.git.tag >>_x64.zip
+            SLUGARM64: << pipeline.parameters.plugin-name >>_<< pipeline.git.tag >>_arm64.zip
             BIN_DIR: out
 
 workflows:
-  lazarus-build:
+  cmake:
     jobs:
       - build:
           <<: *development

.circleci/scripts/bb_release.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 #
-# Copyright (c) 2023 Robert Di Pardo
+# Copyright (c) 2023,2024 Robert Di Pardo
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
@@ -13,11 +13,12 @@ cd "$BIN_DIR"
 curl -sJLO 'https://bitbucket.org/rdipardo/htmltag/downloads/sha256sums.txt'
 sha256sum "${SLUGX86}" >> sha256sums.txt
 sha256sum "${SLUGX64}" >> sha256sums.txt
+sha256sum "${SLUGARM64}" >> sha256sums.txt
 
 curl --request POST \
   --url "https://api.bitbucket.org/2.0/repositories/${CIRCLE_USERNAME}/${CIRCLE_PROJECT_REPONAME}/downloads" \
   --header "Authorization: Bearer ${BB_REPO_TOKEN}" \
-   -F files=@"${SLUGX86}" -F files=@"${SLUGX64}"
+   -F files=@"${SLUGX86}" -F files=@"${SLUGX64}" -F files=@"${SLUGARM64}"
 
 curl --request POST \
   --url "https://api.bitbucket.org/2.0/repositories/${CIRCLE_USERNAME}/${CIRCLE_PROJECT_REPONAME}/downloads" \

.clang-format

@@ -0,0 +1,21 @@
+BasedOnStyle: LLVM
+AccessModifierOffset: -8
+AlignAfterOpenBracket: DontAlign
+AlignEscapedNewlines: DontAlign
+AlignOperands: true
+AlignTrailingComments: Always
+AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortIfStatementsOnASingleLine: Never
+AlwaysBreakTemplateDeclarations: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+# BreakTemplateDeclarations: Yes
+ColumnLimit: 120
+Cpp11BracedListStyle: false
+FixNamespaceComments: false
+IndentCaseLabels: true
+IndentWidth: 8
+NamespaceIndentation: Inner
+PackConstructorInitializers: CurrentLine
+SortIncludes: false
+UseTab: Always

.clang-tidy

@@ -0,0 +1,18 @@
+Checks: |
+  clang-diagnostic-*,
+  clang-analyzer-*,
+  performance-*,
+  portability-*,
+  bugprone-*,
+  cppcoreguidelines-*,
+  -*avoid-c-arrays,
+  -*avoid-non-const-global-variables,
+  -*constant-array-index,
+  -*easily-swappable-parameters,
+  -*empty-catch,
+  -*pro-type-reinterpret-cast
+WarningsAsErrors: ''
+HeaderFilterRegex: ''
+AnalyzeTemporaryDtors: false
+UseColor : true
+FormatStyle: 'none'

.gitattributes

@@ -11,3 +11,5 @@
 *.bat     text   eol=crlf
 *.cmd     text   eol=crlf
 *.rc      text   eol=crlf
+*.cpp     text   eol=crlf
+*.h       text   eol=crlf

.gitignore

@@ -1,5 +1,17 @@
 *~
 *.~*
+*.d
+*.slo
+*.lo
+*.o
+*.obj
+*.gch
+*.pch
+*.lai
+*.la
+*.a
+*.lib
+*.out
 *.bak
 *.dcu
 *.dci
@@ -17,9 +29,15 @@
 *.todo
 *.tvsconfig
 *.zip
+_deps/
+CMakeFiles/
+CPM_modules/
 */__history/
 */__recovery/
 **/backup/
+**/build/
 [Ll]ib/**/*
 [Bb]in/**/*
+.vscode/*
+!.vscode/settings.json
 out/

.gitmodules

@@ -0,0 +1,14 @@
+{
+	"C_Cpp.intelliSenseEngine": "default",
+	"C_Cpp.default.cppStandard": "c++17",
+	"C_Cpp.default.defines": [
+		"${default}",
+		"NOMINMAX",
+		"_CRT_SECURE_NO_WARNINGS",
+		"_USING_V110_SDK71_",
+		"_WIN32_WINNT=_WIN32_WINNT_WINXP",
+		"NTDDI_VERSION=NTDDI_WINXPSP3"
+	],
+	"C_Cpp.autoAddFileAssociations": false,
+	"C_Cpp.codeAnalysis.runAutomatically": false
+}

.vscode/settings.json

@@ -1,42 +1,62 @@
 @echo off
 ::
-:: Copyright (c) 2023 Robert Di Pardo <dipardo.r@gmail.com>
+:: Copyright (c) 2023,2024 Robert Di Pardo <dipardo.r@gmail.com>
 ::
 :: This Source Code Form is subject to the terms of the Mozilla Public
 :: License, v. 2.0. If a copy of the MPL was not distributed with this file,
 :: You can obtain one at https://mozilla.org/MPL/2.0/.
 ::
-SETLOCAL
+SETLOCAL EnableDelayedExpansion
 
-set "FPC_BUILD_TYPE=Debug"
-set "FPC_CPU=x86_64"
+set "CMAKE_BUILD_TYPE=Debug"
+set "CMAKE_GENERATOR_PLATFORM=x64"
 
-if "%1" NEQ "" ( set "FPC_BUILD_TYPE=%1" )
-if "%2" NEQ "" ( set "FPC_CPU=%2" )
-call :%FPC_BUILD_TYPE% 2>NUL:
-if %errorlevel%==1 ( goto :USAGE )
+if "%1" NEQ "" ( set "CMAKE_BUILD_TYPE=%1" )
+if "%2" NEQ "" ( set "CMAKE_GENERATOR_PLATFORM=%2" )
+goto :%CMAKE_BUILD_TYPE%
 
 :Release
+:MinSizeRel
 del /S /Q /F out\*.zip 2>NUL:
 
 :Debug
-call %~dp0src\Forms\suppress_ole_init.cmd
-if %errorlevel%==2 (
-  echo Patch failed
-  goto :END
+:RelWithDebInfo
+if /I "%4"=="nmake" (
+  set "NMAKE_BUILD=true"
 )
+if /I "%4"=="clang" (
+  set "CMAKE_TOOL_CHAIN=-DCMAKE_CXX_COMPILER=clang++"
+  set "NMAKE_BUILD=true"
+)
+if "%NMAKE_BUILD%" NEQ "" (
+  set "CMAKE_GENERATOR=NMake Makefiles"
+  set "CMAKE_GENERATOR_PLATFORM=%VSCMD_ARG_TGT_ARCH%"
+  echo :: ===================================================
+  echo :: NOTE: This environment only supports %VSCMD_ARG_TGT_ARCH% targets
+  echo :: ===================================================
+ ) else (
+  if "%CMAKE_GENERATOR_PLATFORM%"=="x86" ( set "CMAKE_GENERATOR_PLATFORM=Win32" )
+  set "CMAKE_GENERATOR=Visual Studio %VisualStudioVersion:.0=%"
+  set "CONFIG_PARAMS=-A !CMAKE_GENERATOR_PLATFORM!"
+  set "BUILD_PARAMS=--config %CMAKE_BUILD_TYPE%"
+)
+
+set "BUILD_DIR=build\!CMAKE_GENERATOR_PLATFORM!\%CMAKE_BUILD_TYPE%"
 
-set "BUILD_ALL="
-if "%3"=="clean" (
-  rmdir /S /Q out 2>NUL:
-  set "BUILD_ALL=-B"
+if /I "%3"=="clean" (
+  del /S /Q "%BUILD_DIR%\CMakeCache.txt" 2>NUL:
+  set "CLEAN_FIRST=--clean-first"
 )
 
-lazbuild %BUILD_ALL% --bm=%FPC_BUILD_TYPE% --cpu=%FPC_CPU% src\prj\HTMLTag.lpi
+cmake -Hsrc\prj -B%BUILD_DIR% -G"!CMAKE_GENERATOR!" %CONFIG_PARAMS% %CMAKE_TOOL_CHAIN% ^
+  -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% -DTARGET_PLATFORM=!CMAKE_GENERATOR_PLATFORM!
+if %errorlevel% NEQ 0 ( goto :END )
+cmake --build %BUILD_DIR% %BUILD_PARAMS% %CLEAN_FIRST%
 goto :END
 
-:USAGE
-echo Usage: ".\%~n0 [Debug,Release] [i386,x86_64] [clean]"
+:-?
+:help
+echo Usage: ".\%~n0 [Debug,Release,MinSizeRel,RelWithDebInfo] [x86,x64,ARM64] [clean] [nmake,clang]"
 
 :END
 exit /B %errorlevel%

build.cmd

@@ -104,8 +104,8 @@ menu_5  = "Entitäten kodieren (&Zeilenenden eingeschlossen)"
 menu_6  = "Entitäten ent&schlüsseln"
 menu_7  = "&Unicode-Zeichen kodieren"
 menu_8  = "Unic&ode-Zeichen entschlüsseln"
-menu_8  = "Automatische Entschlüsselung von Entitäten aktivieren"
-menu_9  = "Automatische Entschlüsselung von Unicode-Zeichen aktivieren"
+menu_9  = "Automatische Entschlüsselung von Entitäten aktivieren"
+menu_10  = "Automatische Entschlüsselung von Unicode-Zeichen aktivieren"
 menu_11 = "Übe&r..."
 err_compat = "Diese Version von HTML Tag erfordert Notepad++ 8.3 oder höher. Die Befehle des Plugins wurden deaktiviert."
 err_config = "Entitätsdatei nicht gefunden"