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 1a7cbf5a..63280410 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,7 +3,17 @@ 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 +## 11.0.0 2020-07-20 + +### 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 ### Breaking changes 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: 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))