From 302bc9a46f6621ca439dc0a99155c7c3778da7c5 Mon Sep 17 00:00:00 2001 From: Greg Lueck Date: Sat, 20 Jul 2024 12:14:18 -0400 Subject: [PATCH] Prepare for next SYCL spec major release Update the SYCL version number from "2020" to "NEXT". Also simplify some of the macros in the Makefile related to SYCL version. I verified this cleanup has no effect on the generated HTML by comparing the HTML before and after this change. NOTE: The generated spec output file names are now changed from "sycl-2020.html" to "sycl-next.html" and from "sycl-2020.pdf" to "sycl-next.pdf". --- adoc/Makefile | 8 +------- sycl_version.txt | 6 +++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/adoc/Makefile b/adoc/Makefile index 2f22bdb2..3a3dd1a3 100644 --- a/adoc/Makefile +++ b/adoc/Makefile @@ -67,14 +67,8 @@ VERBOSE = --verbose # SYCL_VERSION & SYCL_REVISION) are based on this external configuration file: include $(SYCL_DIR)/sycl_version.txt -# In particular, SYCL_LANGUAGE_VERSION is derived from other values -SYCL_LANGUAGE_VERSION=$(shell printf "%04d%02d" $(SYCLLANGVERSION) \ - $(SYCLREVISION)) -SYCL_NAME=$(SYCLNAME) -SYCL_VERSION=$(SYCLVERSION) -SYCL_REVISION=$(SYCLREVISION) # Name the generated spec from the revision -SPEC_BASE_NAME=$(shell echo $(SYCL_NAME)-$(SYCL_VERSION) \ +SPEC_BASE_NAME=$(shell echo $(SYCLNAME)-$(SYCLVERSION) \ | tr [:upper:] [:lower:]) # asciidoc build attributes to set (defaults are usually OK) diff --git a/sycl_version.txt b/sycl_version.txt index 4b2c507a..180d44fe 100644 --- a/sycl_version.txt +++ b/sycl_version.txt @@ -1,4 +1,4 @@ -SYCLLANGVERSION=2020 +SYCLLANGVERSION=NEXT SYCLNAME=SYCL -SYCLVERSION=2020 -SYCLREVISION=10 +SYCLVERSION=NEXT +SYCLREVISION=1