From fb48cf90dfebf783a9b6a3803348094fdf058836 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Thu, 7 Sep 2023 22:19:04 -0400 Subject: [PATCH] Drop Window XP (#710) * drop windows xp * fix mingw artifact ref name --------- Co-authored-by: wxyzhen --- .github/workflows/windows-build.yml | 4 ++++ CMakeLists.txt | 7 +------ build.bat | 3 --- env.vs2017_xp.bat | 15 --------------- 4 files changed, 5 insertions(+), 24 deletions(-) delete mode 100644 env.vs2017_xp.bat diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index e33b0c89d9..9f6a40903f 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -140,6 +140,10 @@ jobs: mingw-w64-x86_64-marisa \ mingw-w64-x86_64-opencc + - name: Configure build environment + run: | + echo git_ref_name="$(git describe --always)" >> $GITHUB_ENV + - name: Install Rime plugins run: ./action-install-plugins-macos.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index b2b8eb74de..12311a8ed8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,12 +152,7 @@ if(MSVC) # https://stackoverflow.com/a/31264946 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF") - if(MSVC10) - # stdint.h is missing from VS2010 - include_directories(${PROJECT_SOURCE_DIR}/include/msvc) - endif() - # Force Boost.Uuid to use wincrypt as random provider instead of bcrypt for Windows XP compatibility - add_definitions("/wd4244 /wd4996 /DBOOST_UUID_RANDOM_PROVIDER_FORCE_WINCRYPT") + add_definitions("/wd4244 /wd4996") endif() if(UNIX) diff --git a/build.bat b/build.bat index e98763fee5..960236db21 100644 --- a/build.bat +++ b/build.bat @@ -8,9 +8,6 @@ if not exist env.bat copy env.bat.template env.bat if exist env.bat call .\env.bat -rem for Windows XP compatibility (Visual Studio 2015+) -set CL=/Zc:threadSafeInit- - set OLD_PATH=%PATH% if defined DEVTOOLS_PATH set PATH=%OLD_PATH%;%DEVTOOLS_PATH% path diff --git a/env.vs2017_xp.bat b/env.vs2017_xp.bat deleted file mode 100644 index bcf4a1e3f5..0000000000 --- a/env.vs2017_xp.bat +++ /dev/null @@ -1,15 +0,0 @@ -rem Customize your build environment and save the modified copy to env.bat - -set RIME_ROOT=%CD% - -rem REQUIRED: path to Boost source directory -if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_1_69_0 - -rem architecture, Visual Studio version and platform toolset -set ARCH=Win32 -set BJAM_TOOLSET=msvc-14.1 -set CMAKE_GENERATOR="Visual Studio 15 2017" -set PLATFORM_TOOLSET=v141_xp - -rem OPTIONAL: path to additional build tools -rem set DEVTOOLS_PATH=%ProgramFiles%\Git\cmd;%ProgramFiles%\CMake\bin;C:\Python27;