From 4268914774f8ce1b1efd69777b9e822faf6ee88d Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Mon, 20 Jul 2020 16:39:15 +0100 Subject: [PATCH 1/4] build_info: Fix parsing of versions with no flavor --- build_info.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build_info.py b/build_info.py index b8d39fd8..2ac864b0 100755 --- a/build_info.py +++ b/build_info.py @@ -100,12 +100,15 @@ def deduce_software_version(directory): for line in f.readlines(): match = pattern.match(line) if match: + flavor = match.group(4) + if flavor == None: + flavor = "" return { "major": match.group(1), "minor": match.group(2), "patch": match.group(3), - "flavor": match.group(4).lstrip("-"), - "-flavor": match.group(4), + "flavor": flavor.lstrip("-"), + "-flavor": flavor, "date": match.group(5), } raise Exception('No version number found in {}'.format(changes_file)) From 6c7beeafa7a53c876c0dda13afd7f47e1ea6d905 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Mon, 20 Jul 2020 16:24:30 +0100 Subject: [PATCH 2/4] Finalize glslang 10.15.3847 --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 1a7cbf5a..e2b0c8b0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/). -## 10.15.3847-dev 2020-06-16 +## 10.15.3847 2020-07-20 ### Breaking changes From 70860c284e71a2346775974ce2b23f73a158dc86 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Mon, 20 Jul 2020 16:26:34 +0100 Subject: [PATCH 3/4] Start glslang 11.0.0 --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index e2b0c8b0..ad70f5e6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/). +## 11.0.0 2020-07-20 + +[Put `11.0.0` release notes here] + ## 10.15.3847 2020-07-20 ### Breaking changes From c487d0feaa3efac019e2845d1160b3369adf84c4 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Mon, 20 Jul 2020 16:32:30 +0100 Subject: [PATCH 4/4] Drop support for VS2013 This was scheduled for today - 20th July 2020. Updates Appveyor configs to use VS2015 instead. --- .appveyor.yml | 6 +++--- CHANGES.md | 8 +++++++- README.md | 15 ++++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 44d5f046..4c5b0da4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,7 +4,7 @@ # build version format version: "{build}" -os: Visual Studio 2013 +os: Visual Studio 2015 platform: - x64 @@ -58,7 +58,7 @@ build: build_script: - mkdir build && cd build - - cmake -G "Visual Studio 12 2013 Win64" -DCMAKE_INSTALL_PREFIX=install .. + - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=install .. - cmake --build . --config %CONFIGURATION% --target install test_script: @@ -105,4 +105,4 @@ deploy: force_update: true on: branch: master - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 diff --git a/CHANGES.md b/CHANGES.md index ad70f5e6..63280410 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,7 +5,13 @@ This project adheres to [Semantic Versioning](https://semver.org/). ## 11.0.0 2020-07-20 -[Put `11.0.0` release notes here] +### Breaking changes + +#### Visual Studio 2013 is no longer supported + +[As scheduled](https://github.com/KhronosGroup/glslang/blob/9eef54b2513ca6b40b47b07d24f453848b65c0df/README.md#planned-deprecationsremovals), +Microsoft Visual Studio 2013 is no longer officially supported. Please upgrade +to at least Visual Studio 2015. ## 10.15.3847 2020-07-20 diff --git a/README.md b/README.md index 756e857c..330ec825 100755 --- a/README.md +++ b/README.md @@ -1,8 +1,14 @@ # News -1. The versioning scheme is being improved, and you might notice some differences. This is currently WIP, but will be coming soon. See, for example, PR #2277. +1. Visual Studio 2013 is no longer supported -2. If you get a new **compilation error due to a missing header**, it might be caused by this planned removal: + [As scheduled](https://github.com/KhronosGroup/glslang/blob/9eef54b2513ca6b40b47b07d24f453848b65c0df/README.md#planned-deprecationsremovals), +Microsoft Visual Studio 2013 is no longer officially supported. \ + Please upgrade to at least Visual Studio 2015. + +2. The versioning scheme is being improved, and you might notice some differences. This is currently WIP, but will be coming soon. See, for example, PR #2277. + +3. If you get a new **compilation error due to a missing header**, it might be caused by this planned removal: **SPIRV Folder, 1-May, 2020.** Glslang, when installed through CMake, will install a `SPIRV` folder into `${CMAKE_INSTALL_INCLUDEDIR}`. @@ -16,11 +22,6 @@ If people are only using this location to get spirv.hpp, I recommend they get th [![Build Status](https://travis-ci.org/KhronosGroup/glslang.svg?branch=master)](https://travis-ci.org/KhronosGroup/glslang) [![Build status](https://ci.appveyor.com/api/projects/status/q6fi9cb0qnhkla68/branch/master?svg=true)](https://ci.appveyor.com/project/Khronoswebmaster/glslang/branch/master) -## Planned Deprecations/Removals - -1. **Visual Studio 2013, 20-July, 2020.** Keeping code compiling for MS Visual Studio 2013 will no longer be -a goal as of July 20, 2020, the fifth anniversary of the release of Visual Studio 2015. - # Glslang Components and Status There are several components: