From f8ad7162b1bf116c58149929c739d6760e09cd5c Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Sun, 15 May 2022 23:41:21 +0200
Subject: [PATCH] try a release
maybe something has brok since 6 months ?
---
.appveyor.yml | 4 ++--
.gitlab-ci.yml | 8 ++++----
CHANGELOG.md | 5 +++--
setup/build-release.sh | 4 ++--
setup/version.txt | 2 +-
src/u_infos.lfm | 5 ++---
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
index 133759e0..ecc7e6d7 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -22,13 +22,13 @@ install:
$LDC_URL = "https://github.com/ldc-developers/ldc/releases/download/v1.27.1/ldc2-1.27.1-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.12-fpc-3.2.0-win64.exe"
+ $LAZ_NME = "laz-bin-cache\lazarus-2.2.0-fpc-3.2.2-win64.exe"
(new-object net.webclient).DownloadFile($LDC_URL, $LDC_NME)
7z x $LDC_NME -o"C:\" -y -r
Rename-Item "C:\ldc2-1.27.1-windows-x64" "C:\ldc"
- git clone $LAZ_URL
+ git clone $LAZ_URL --depth=1
Start-Process -FilePath $LAZ_NME -Wait -ArgumentList "/SILENT", "/SUPPRESSMSGBOXES", "/DIR=C:\lazarus"
build_script:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5ff08062..62298235 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,11 +34,11 @@ release:
- update-alternatives --config ld
- ld --version
# lazarus
- - git clone https://gitlab.com/basile.b/laz-bin-cache.git
+ - git clone https://gitlab.com/basile.b/laz-bin-cache.git --depth=1
- 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.12-0_amd64.deb
+ - apt install -y ./fpc-laz_3.2.2-210709_amd64.deb
+ - apt install -y ./fpc-src_3.2.2-210709_amd64.deb
+ - apt install -y ./lazarus-project_2.2.0-0_amd64.deb
- cd ..
script:
- bash setup/build-release.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32f8c402..b69aaef9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,10 @@
-# v3.9.18-dev
+# v3.9.18-beta.1
## Enhancements
- Search and Replace: after a failed search give the editor the focus back.
- It's possible to open ".mak" or "makefile" files as projects. The project inspector will display the rules as configurations and the content of "src/", "include/", "import/" as source files.
-- Added symbolic strings CLN (CaretLineNUmber) and CCN (CaretColumnNumber).
+- Added new symbolic strings _CLN_ (CaretLineNUmber) and _CCN_ (CaretColumnNumber).
## Bugs fixed
@@ -16,6 +16,7 @@
## Other
- dexed-d does not rely on the old "iz" library anymore.
+- last version that can be build with Lazarus 2.1.z
# v3.9.17
diff --git a/setup/build-release.sh b/setup/build-release.sh
index c6b783ee..e5d6cb02 100644
--- a/setup/build-release.sh
+++ b/setup/build-release.sh
@@ -25,8 +25,8 @@ if [ ! -f "../bin/libdexed-d.so" ]; then
echo "this explains linking issues..."
exit 1
fi
-cp "../bin/libdexed-d.so" "/lib64/libdexed-d.so"
-cp "../bin/libdexed-d.so" "/lib/libdexed-d.so"
+#cp "../bin/libdexed-d.so" "/lib64/libdexed-d.so"
+#cp "../bin/libdexed-d.so" "/lib/libdexed-d.so"
cd ..
# dexed
diff --git a/setup/version.txt b/setup/version.txt
index 5c29192a..1f18d461 100644
--- a/setup/version.txt
+++ b/setup/version.txt
@@ -1 +1 @@
-v3.9.17
+v3.9.18-beta.1
diff --git a/src/u_infos.lfm b/src/u_infos.lfm
index af350cd9..5c853779 100644
--- a/src/u_infos.lfm
+++ b/src/u_infos.lfm
@@ -41,7 +41,6 @@ inherited InfoWidget: TInfoWidget
BorderSpacing.Around = 8
Font.Style = [fsBold]
Layout = tlCenter
- ParentColor = False
ParentFont = False
end
object Label2: TLabel
@@ -52,10 +51,9 @@ inherited InfoWidget: TInfoWidget
Align = alClient
Alignment = taCenter
BorderSpacing.Around = 8
- Caption = 'Licensed under the terms of the BSL-1.0'#10'©Basile Burg, 2014-2021'
+ Caption = 'Licensed under the terms of the BSL-1.0'#10'©Basile Burg, 2014-2022'
Font.Style = [fsItalic]
Layout = tlCenter
- ParentColor = False
ParentFont = False
end
end
@@ -87,6 +85,7 @@ inherited InfoWidget: TInfoWidget
end
end
inherited toolbar: TDexedToolBar
+ Height = 30
Width = 279
end
end