Merge branch 'main' into consistent-enum

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/presubmit.yml

@@ -0,0 +1,49 @@
+name: Presubmit
+
+permissions:
+  contents: read
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Build all specs
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Install required packages
+        run: |
+          sudo apt-get install -y libpango1.0-dev libwebp-dev ghostscript fonts-lyx jing libavalon-framework-java libbatik-java python3-pyparsing
+          sudo gem install asciidoctor -v 2.0.16
+          sudo gem install coderay -v 1.1.1
+          sudo gem install rouge -v 3.19.0
+          sudo gem install ttfunk -v 1.7.0
+          sudo gem install hexapdf -v 0.27.0
+          sudo gem install asciidoctor-pdf -v 2.3.4
+          sudo gem install asciidoctor-mathematical -v 0.3.5
+          sudo pip install pyparsing
+
+      - name: List git tag
+        run: |
+          git describe --tags --dirty
+
+      - name: Generate core specs (HTML and PDF)
+        run: |
+          python3 makeSpec -clean -spec core OUTDIR=out.core -j 5 api c env ext cxx4opencl
+          
+      - name: Generate core + extension specs (HTML)
+        run: |
+          python3 makeSpec -clean -spec khr OUTDIR=out.khr -j 12 html
+
+      - name: Generate reference pages
+        run: |
+          python3 makeSpec -spec khr OUTDIR=out.refpages -j 12 manhtmlpages
+
+      - name: Validate XML
+        run: |
+          make -C xml validate

.travis.yml

@@ -1,5 +1,9 @@
 dist: focal
 
+# Only build (and deploy) on travis for tags.
+# Use GitHub actions for other CI.
+if: tag IS present
+
 language: ruby
 
 git:
@@ -9,24 +13,27 @@ rvm:
   - 2.7.1
 
 before_install:
-  - sudo apt-get install -y libpango1.0-dev ghostscript fonts-lyx jing
+  - sudo apt-get install -y libpango1.0-dev ghostscript fonts-lyx jing libavalon-framework-java libbatik-java python3-pyparsing
   - gem install asciidoctor -v 2.0.16
   - gem install coderay -v 1.1.1
   - gem install rouge -v 3.19.0
   - gem install ttfunk -v 1.5.1
+  - gem install hexapdf -v 0.27.0
   - gem install asciidoctor-pdf -v 1.5.0
   - gem install asciidoctor-mathematical -v 0.3.5
+  - pip install pyparsing
 
 script:
   - git describe --tags --dirty
-  - make -O -j 5 api c env ext cxx4opencl manhtmlpages
   - make -C xml validate
+  - python3 makeSpec -clean -spec core OUTDIR=out.core -j 5 api c env ext cxx4opencl
+  - python3 makeSpec -clean -spec khr OUTDIR=out.khr -j 12 html manhtmlpages
 
 deploy:
   provider: releases
   api_key: $GH_TOKEN
   file_glob: true
-  file: out/pdf/*
+  file: out.*/pdf/*
   skip_cleanup: true
   on:
     tags: true

CXX_for_OpenCL.txt

@@ -1,4 +1,4 @@
-// Copyright 2019-2023 The Khronos Group. This work is licensed under a
+// Copyright 2019-2024 The Khronos Group. This work is licensed under a
 // Creative Commons Attribution 4.0 International License; see
 // http://creativecommons.org/licenses/by/4.0/