Merge remote-tracking branch 'branchhint/main' into wasm-3.0+branchhint

Author: rossberg

.github/workflows/ci-spec.yml

@@ -40,25 +40,6 @@ jobs:
           name: core-rendered
           path: document/core/_build/html
 
-  build-legacy-exceptions-spec:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v2
-        with:
-          submodules: "recursive"
-      - name: Setup TexLive
-        run: sudo apt-get update -y && sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
-      - name: Setup Sphinx
-        run: pip install six && pip install sphinx==5.1.0
-      - name: Build main spec
-        run: cd document/legacy/exceptions && make main
-      - name: Upload artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: legacy-exceptions-rendered
-          path: document/legacy/exceptions/_build/html
-
   build-js-api-spec:
     runs-on: ubuntu-latest
     steps:
@@ -89,9 +70,48 @@ jobs:
           name: web-api-rendered
           path: document/web-api/index.html
 
+  build-code-metadata-spec:
+    runs-on: ubuntu-latest
+    needs: [build-core-spec]
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
+      - name: Setup TexLive
+        run: sudo apt-get update -y && sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
+      - name: Setup Sphinx
+        run: pip install six && pip install sphinx==5.1.0
+      - name: Build main spec
+        run: cd document/metadata/code && make main
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: code-metadata-rendered
+          path: document/metadata/code/_build/html
+
+  build-legacy-exceptions-spec:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
+      - name: Setup TexLive
+        run: sudo apt-get update -y && sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
+      - name: Setup Sphinx
+        run: pip install six && pip install sphinx==5.1.0
+      - name: Build main spec
+        run: cd document/legacy/exceptions && make main
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: legacy-exceptions-rendered
+          path: document/legacy/exceptions/_build/html
+
   publish-spec:
     runs-on: ubuntu-latest
-    needs: [build-core-spec, build-legacy-exceptions-spec, build-js-api-spec, build-web-api-spec]
+    needs: [build-core-spec, build-js-api-spec, build-web-api-spec, build-code-metadata-spec, build-legacy-exceptions-spec]
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -102,11 +122,6 @@ jobs:
         with:
           name: core-rendered
           path: _output/core
-      - name: Download legacy exceptions spec artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: legacy-exceptions-rendered
-          path: _output/legacy/exceptions
       - name: Download JS API spec artifact
         uses: actions/download-artifact@v2
         with:
@@ -117,6 +132,16 @@ jobs:
         with:
           name: web-api-rendered
           path: _output/web-api
+      - name: Download code metadata spec artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: code-metadata-rendered
+          path: _output/metadata/code
+      - name: Download legacy exceptions spec artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: legacy-exceptions-rendered
+          path: _output/legacy/exceptions
       - name: Publish to GitHub Pages
         if: github.ref == 'refs/heads/main'
         uses: peaceiris/actions-gh-pages@v3

document/Makefile

@@ -1,4 +1,4 @@
-DIRS     = core js-api web-api legacy/exceptions
+DIRS     = core js-api web-api metadata/code legacy/exceptions
 FILES    = index.html
 BUILDDIR = _build
 TAR      = tar

document/index.html

@@ -62,6 +62,19 @@ <h3>Embedder specifications</h3>
   </li>
   </ul>
 
+<h3>Metadata specifications</h3>
+
+<p>Define the format and semantics of extra information attached to a WebAssembly module</p>
+
+  <ul>
+    <li><p><b>Code Metadata</b>: defines metadata attached to instructions</p>
+      <ul>
+        <li><a href="metadata/code/">Browser version</a></li>
+        <li><a href="metadata/code/_download/WebAssembly-Metadata-Code.pdf">PDF version</a></li>
+      </ul>
+    </li>
+  </ul>
+
 <h3>Legacy Extensions</h3>
 
 <p>Define extensions that are deprecated, but may still be in use.</p>
@@ -75,9 +88,8 @@ <h3>Legacy Extensions</h3>
     </li>
   </ul>
 
-
 <p>
-  Source for these documents is available
+  Source for all documents is available
   <a href="https://github.com/WebAssembly/spec/">here</a>.
 </p>
 

document/metadata/code/.gitignore

@@ -0,0 +1,3 @@
+_build
+_static
+document/*.pyc

document/metadata/code/LICENSE

@@ -0,0 +1,50 @@
+W3C SOFTWARE AND DOCUMENT NOTICE AND LICENSE
+
+This work is being provided by the copyright holders under the following
+license.
+
+
+LICENSE
+
+By obtaining and/or copying this work, you (the licensee) agree that you have
+read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this work, with or without
+modification, for any purpose and without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the work or portions
+thereof, including modifications:
+
+* The full text of this NOTICE in a location viewable to users of the
+  redistributed or derivative work.
+
+* Any pre-existing intellectual property disclaimers, notices, or terms and
+  conditions. If none exist, the W3C Software and Document Short Notice
+  (https://www.w3.org/Consortium/Legal/copyright-software-short-notice) should
+  be included.
+
+* Notice of any changes or modifications, through a copyright statement on the
+  new code or document such as "This software or document includes material
+  copied from or derived from [title and URI of the W3C document]. Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
+
+
+DISCLAIMERS
+
+THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
+SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
+TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the work without specific, written prior permission.
+Title to copyright in this work will at all times remain with copyright
+holders.
+
+
+NOTES
+
+This version:
+http://www.w3.org/Consortium/Legal/2015/copyright-software-and-document