From ec224fa8072b7e773994a920e34c0a8c61005004 Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Sun, 25 Aug 2024 22:07:23 +0800 Subject: [PATCH] [1.2.9.1] bump to 1.2.9.1 --- .github/workflows/cd_research_on_debian_bookworm.yml | 2 +- packages/debian/package.sh | 9 +-------- packages/windows/resource.rc.in | 6 +++--- xmake/vars.lua | 2 +- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cd_research_on_debian_bookworm.yml b/.github/workflows/cd_research_on_debian_bookworm.yml index fe77278257..f57e6f0959 100644 --- a/.github/workflows/cd_research_on_debian_bookworm.yml +++ b/.github/workflows/cd_research_on_debian_bookworm.yml @@ -49,7 +49,7 @@ jobs: - name: Generate Installer run: | packages/debian/package.sh - cp ../mogan*.deb mogan-research-v1.2.9-debian12.deb + cp ../mogan*.deb mogan-research-v1.2.9.1-rc1-debian12.deb - name: Upload uses: actions/upload-artifact@v3 if: ${{ !startsWith(github.ref, 'refs/tags/') }} diff --git a/packages/debian/package.sh b/packages/debian/package.sh index 9a445f5a35..4aba013ab2 100755 --- a/packages/debian/package.sh +++ b/packages/debian/package.sh @@ -8,14 +8,7 @@ fi APP_HOME="$(cd "${FWDIR}/../.."; pwd)" -VERSION_MAJOR="1" -VERSION_MINOR="2" -VERSION_BUILD="9" -if [ -n "$VERSION_BUILD" ]; then - VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} -else - VERSION=${VERSION_MAJOR}.${VERSION_MINOR} -fi +VERSION="1.2.9.1-rc1" ln -s $APP_HOME/packages/debian $APP_HOME/debian cp $APP_HOME/debian/control.in $APP_HOME/debian/control diff --git a/packages/windows/resource.rc.in b/packages/windows/resource.rc.in index 4a313cb164..1dd60f6600 100644 --- a/packages/windows/resource.rc.in +++ b/packages/windows/resource.rc.in @@ -8,8 +8,8 @@ appicon ICON "Xmacs.ico" // Version information; this, too, is used by WinSparkle 1 VERSIONINFO - FILEVERSION ${VERSION_MAJOR},${VERSION_MINOR},${VERSION_ALTER},0 - PRODUCTVERSION ${VERSION_MAJOR},${VERSION_MINOR},${VERSION_ALTER},0 + FILEVERSION 1,2,9,1 + PRODUCTVERSION 1,2,9.1 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 // indicate whether this file contains debugger information, and whether this is different from executable with same version. FILEOS VOS_NT_WINDOWS32 @@ -35,4 +35,4 @@ BEGIN BEGIN VALUE "Translation", 0x0409, 0x04B0 END -END \ No newline at end of file +END diff --git a/xmake/vars.lua b/xmake/vars.lua index f5098de3c1..353c24cf06 100644 --- a/xmake/vars.lua +++ b/xmake/vars.lua @@ -11,7 +11,7 @@ -- in the root directory or . TEXMACS_VERSION = "2.1.2" -XMACS_VERSION="1.2.9" +XMACS_VERSION="1.2.9.1-rc1" CONFIG_USER = "XmacsLabs" DEVEL_VERSION = TEXMACS_VERSION DEVEL_RELEASE = 1