Merge branch 'main' into usm-v1.1

.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,56 @@
+name: Presubmit
+
+permissions:
+ contents: read
+
+# Controls when the action will run.
+on:
+ push:
+ workflow_dispatch:
+ pull_request:
+
+# These jobs are potentially parallelizeable
+jobs:
+ build:
+ name: Build spec artifacts
+ runs-on: ubuntu-latest
+ # Refer to the build container by its SHA instead of the name, to
+ # prevent caching problems when updating the image.
+ # container: khronosgroup/docker-images:asciidoctor-spec.20240702
+ container: khronosgroup/docker-images@sha256:4aab96a03ef292439c9bd0f972adfa29cdf838d0909b1cb4ec2a6d7b2d14a37f
+
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: recursive
+ # If fetch-depth: 0 is not specified, then
+ # git describe --tags --dirty
+ # below fails.
+ # This could also affect SPECREVISION in the Makefile.
+ fetch-depth: 0
+
+ # Ownerships in the working directory are odd.
+ # . is owned by UID 1001, while repo files are owned by root.
+ # This leads to many odd messages like
+ # fatal: detected dubious ownership in repository at '/__w/OpenCL-Docs/OpenCL-Docs'
+ # The 'git config' is a brute-force workaround.
+ - name: Git safe directory workaround
+ run: |
+ git config --global --add safe.directory '*'
+ ls -lda . .. .git Makefile
+
+ - name: Validate XML
+ run: |
+ make -C xml validate
+
+ - name: Generate core specs (HTML and PDF)
+ run: |
+ python3 makeSpec -clean -spec core OUTDIR=out.core -j 5 -O api c env ext cxx4opencl
+
+ - name: Generate core + extension specs (HTML)
+ run: |
+ python3 makeSpec -clean -spec khr OUTDIR=out.khr -j -O html
+
+ - name: Generate reference pages
+ run: |
+ python3 makeSpec -spec khr OUTDIR=out.refpages -j -O manhtmlpages

.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/