From 3c1edd06e4be6cafc022f6109438cfa0e35be5d4 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Mon, 24 Aug 2020 16:01:58 +0200
Subject: [PATCH 1/2] unpaired encoding 79190c984aa0

---
 src/u_procinput.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/u_procinput.pas b/src/u_procinput.pas
index d73488c6..6a6845b4 100644
--- a/src/u_procinput.pas
+++ b/src/u_procinput.pas
@@ -63,7 +63,7 @@ begin
   EntitiesConnector.addSingleService(self);
   fname := getDocPath + OptsFname;
   if OptsFname.fileExists then
-    fMru.LoadFromFile(fname, TEncoding.Default);
+    fMru.LoadFromFile(fname, TEncoding.UTF8);
   if fMru.Count.equals(0) then
     fMru.Insert(0, '(your input here)');
 

From 625a7389e08b43174e746093481cd8aba4d1bd96 Mon Sep 17 00:00:00 2001
From: "Basile.B" <basile.b@gmx.com>
Date: Tue, 4 Aug 2020 08:46:15 +0000
Subject: [PATCH 2/2] build windows releases using appveyor and move source for
 lazarus binaries to a gitlab repo

---
 .appveyor.yml  | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++
 .gitlab-ci.yml | 10 +++++--
 setup/setup.d  | 15 ++++++----
 3 files changed, 94 insertions(+), 9 deletions(-)
 create mode 100644 .appveyor.yml

diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 00000000..e6c1ffb3
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,78 @@
+image:
+  - Visual Studio 2019
+
+clone_script:
+  - cmd: |
+         git clone -q --recursive --branch=%APPVEYOR_REPO_BRANCH% https://gitlab.com/%APPVEYOR_REPO_NAME%.git %APPVEYOR_BUILD_FOLDER% 
+         git checkout -qf %APPVEYOR_REPO_COMMIT%
+
+artifacts:
+  - path: setup\output
+  #- path: setup\output\dexed.%APPVEYOR_REPO_TAG_NAME%.win64.zip
+  #  name: zipped-binaries
+  #- path: setup\output\dexed.%APPVEYOR_REPO_TAG_NAME%.win64.setup.zip
+  #  name: zipped-installer
+
+branches:
+  only:
+    - /v\d*\.\d*\.\d*/
+
+install:
+  - ps: |
+        $LDC_URL = "https://github.com/ldc-developers/ldc/releases/download/v1.22.0/ldc2-1.22.0-windows-x64.7z"
+        $LDC_NME = "C:\ldc.7z";
+        $LAZ_URL = "https://gitlab.com/basile.b/laz-bin-cache.git"
+        $LAZ_NME = "laz-bin-cache\lazarus-2.0.10-fpc-3.2.0-win64.exe"
+
+        (new-object net.webclient).DownloadFile($LDC_URL, $LDC_NME)
+        7z x $LDC_NME -o"C:\" -y -r
+        Rename-Item "C:\ldc2-1.22.0-windows-x64" "C:\ldc"
+
+        git clone $LAZ_URL
+        Start-Process -FilePath $LAZ_NME -Wait -ArgumentList "/SILENT", "/SUPPRESSMSGBOXES", "/DIR=C:\lazarus"
+
+build_script:
+  - cmd: |
+        echo "building dexed..."
+        set PATH=C:\ldc\bin\;%PATH%
+        cd lazproj
+        C:\lazarus\lazbuild.exe -B dexeddesigncontrols.lpk
+        C:\lazarus\lazbuild.exe -B dexed.lpi
+        cd ..
+
+        echo "building dcd..."
+        git clone https://github.com/dlang-community/dcd.git
+        cd dcd
+        C:\ldc\bin\dub.exe build --config=server --build=release --compiler=ldc2.exe
+        C:\ldc\bin\dub.exe build --config=client --build=release --compiler=ldc2.exe
+        cd ..
+
+        echo "building d-scanner..."
+        git clone https://github.com/dlang-community/d-scanner.git
+        cd d-scanner
+        C:\ldc\bin\dub.exe build --build=release --compiler=ldc2.exe
+        cd ..
+
+        echo "moving files..."
+        mkdir setup\output
+        mkdir setup\win64
+        copy "bin\dexed.exe" "setup\win64\dexed.exe"
+        copy "bin\dexed-d.dll" "setup\win64\dexed-d.dll"
+        copy "d-scanner\bin\dscanner.exe" "setup\win64\dscanner.exe"
+        copy "dcd\bin\dcd-client.exe" "setup\win64\dcd-client.exe"
+        copy "dcd\bin\dcd-server.exe" "setup\win64\dcd-server.exe"
+        copy "logo\dexed.ico" "setup\win64\dexed.ico"
+        copy "logo\dexed256.png" "setup\win64\dexed.png"
+        copy "LICENSE_1_0.txt" "setup\win64\dexed.license.txt"
+        copy "dcd\License.txt" "setup\win64\dcd.license.txt"
+
+        echo "building installer and zips..."
+        cd setup
+        set /p ver=<version.txt
+        set ver=%ver:~1%
+
+        7z a -tzip -mx9 output\dexed.%ver%.win64.zip win64\dcd.license.txt win64\dexed.license.txt win64\dexed.exe win64\dexed-d.dll win64\dexed.ico win64\dexed.png win64\dcd-server.exe win64\dcd-client.exe win64\dscanner.exe
+
+        set SETUP_APP_NAME=dexed.%ver%.win64.setup
+        ldmd2.exe setup.d -O -release -Jwin64 -J./ -of%SETUP_APP_NAME%.exe
+        7z a -tzip -mx9 output\%SETUP_APP_NAME%.zip %SETUP_APP_NAME%.exe
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bdc1785a..436694ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,6 +26,7 @@ release:
   - apt-get install -y git
   - apt-get install -y zip
   - apt-get install -y libcurl4-openssl-dev
+  - apt-get install -y git-lfs && git lfs install
   # gitlab Ubuntu-based runners default to LD gold
   # but linking lazarus programs requires LD bfd.
   - update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 20
@@ -33,9 +34,12 @@ release:
   - update-alternatives --config ld
   - ld --version
   # lazarus
-  - curl -JLO https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.0.10/fpc-laz_3.2.0-1_amd64.deb/download && apt install -y ./fpc-laz_3.2.0-1_amd64.deb
-  - curl -JLO https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.0.10/fpc-src_3.2.0-1_amd64.deb/download && apt install -y ./fpc-src_3.2.0-1_amd64.deb
-  - curl -JLO https://sourceforge.net/projects/lazarus/files/Lazarus%20Linux%20amd64%20DEB/Lazarus%202.0.10/lazarus-project_2.0.10-0_amd64.deb/download && apt install -y ./lazarus-project_2.0.10-0_amd64.deb
+  - git clone https://gitlab.com/basile.b/laz-bin-cache.git
+  - cd laz-bin-cache
+  - apt install -y ./fpc-laz_3.2.0-1_amd64.deb
+  - apt install -y ./fpc-src_3.2.0-1_amd64.deb
+  - apt install -y ./lazarus-project_2.0.10-0_amd64.deb
+  - cd ..
   script:
   - bash setup/build-release.sh
   artifacts:
diff --git a/setup/setup.d b/setup/setup.d
index a52b1879..526a044a 100644
--- a/setup/setup.d
+++ b/setup/setup.d
@@ -38,10 +38,15 @@ struct Resource
     immutable Kind kind;
 }
 
+version(Windows)
+    enum libdexedd = "dexed-d";
+else
+    enum libdexedd = "libdexed-d";
+
 immutable Resource[] ceResources =
 [
     Resource(cast(ImpType) import("dexed" ~ exeExt), "dexed" ~ exeExt, Kind.exe),    
-    Resource(cast(ImpType) import("libdexed-d" ~ libExt), "libdexed-d" ~ libExt, Kind.exe),
+    Resource(cast(ImpType) import(libdexedd ~ libExt), libdexedd ~ libExt, Kind.exe),
     Resource(cast(ImpType) import("dexed.ico"), "dexed.ico", Kind.dat),
     Resource(cast(ImpType) import("dexed.png"), "dexed.png", Kind.dat),
     Resource(cast(ImpType) import("dexed.license.txt"), "dexed.license.txt", Kind.doc)
@@ -57,16 +62,14 @@ immutable Resource[] thirdPartBinaries =
 
 immutable Resource[] oldResources =
 [
-    Resource(cast(ImpType) [], "cesyms" ~ exeExt, Kind.exe),
-    Resource(cast(ImpType) [], "cetodo" ~ exeExt, Kind.exe),
-    Resource(cast(ImpType) [], "dastworx" ~ exeExt, Kind.exe),    
+    Resource(cast(ImpType) [], "dastworx" ~ exeExt, Kind.exe),
 ];
 
 version(Windows)
     immutable Resource[] systemRelResources =
     [
-        Resource(cast(ImpType) import("libeay32.dll"), "libeay32.dll", Kind.exe),
-        Resource(cast(ImpType) import("ssleay32.dll"), "ssleay32.dll", Kind.exe),
+        //Resource(cast(ImpType) import("libeay32.dll"), "libeay32.dll", Kind.exe),
+        //Resource(cast(ImpType) import("ssleay32.dll"), "ssleay32.dll", Kind.exe),
     ];
 else
     immutable Resource[] systemRelResources = [];