diff --git a/ChangeLog.txt b/ChangeLog.txt index da939d9c..0699c5ce 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -638,7 +638,7 @@ Internal Issues: ----------------------------------------------------- -Change log for May 20, 2016 Vulkan 1.0.14 spec update: +Change log for May 13, 2016 Vulkan 1.0.14 spec update: * Bump API patch number and header version number to 14 for this update. diff --git a/doc/specs/vulkan/genRelease b/doc/specs/vulkan/genRelease index ae979cdc..535da30d 100755 --- a/doc/specs/vulkan/genRelease +++ b/doc/specs/vulkan/genRelease @@ -18,7 +18,9 @@ from datetime import * # branch = branch or commit or tag name # label = textual label to apply # outdir = directory to generate specs in -def buildRelease(branch,label,outdir,targets): +# xmlTargets = targets to build in src/spec/ +# specTargets = targets to build in doc/specs/vulkan/ +def buildRelease(branch,label,outdir,xmlTargets,specTargets): global root, xml, spec print('echo Info: Generating branch=' + branch, @@ -26,10 +28,6 @@ def buildRelease(branch,label,outdir,targets): 'outdir=' + outdir) print('git checkout', branch) - print('echo Info: Generating headers and spec include files') - print('cd', xml) - print('make OUTDIR=' + outdir, ' clobber full_install') - print('echo Info: Cleaning spec in', outdir) print('cd', spec) print('rm -rf', @@ -40,9 +38,15 @@ def buildRelease(branch,label,outdir,targets): outdir + '/vkspec.html', 'specversion.txt') + print('echo Info: Generating headers and spec include files') + print('cd', xml) + print('make OUTDIR=' + outdir, xmlTargets) + print('echo Info: Generating spec') + print('cd', spec) print('make specversion.txt') - print('make -j 4 OUTDIR=' + outdir, ' NOTEOPTS="-a implementation-guide"', targets) + print('make -j 4 OUTDIR=' + outdir, ' NOTEOPTS="-a implementation-guide"', + specTargets) print('rm', outdir + '/pdf/vkspec.xml') # Main @@ -68,11 +72,15 @@ wsibranch = '1.0-wsi_extensions' now = datetime.today().strftime('%Y%m%d') # Generate specs -coretargets='xhtml pdf styleguide manhtml manpdf manhtmlpages' -buildRelease(corebranch, corebranch, outdir + corebranch, coretargets) +coreXmlTargets='clobber full_install pdf_install' +coreSpecTargets='xhtml pdf styleguide manhtml manpdf manhtmlpages' +buildRelease(corebranch, corebranch, outdir + corebranch, + coreXmlTargets, coreSpecTargets) -wsitargets='xhtml pdf' -buildRelease(wsibranch, wsibranch, outdir + wsibranch, wsitargets) +wsiXmlTargets='clobber full_install' +wsiSpecTargets='xhtml pdf' +buildRelease(wsibranch, wsibranch, outdir + wsibranch, + wsiXmlTargets, wsiSpecTargets) print('echo Info: post-generation cleanup') @@ -80,8 +88,9 @@ print('git checkout ' + corebranch) print('echo To tag the spec branches, execute these commands:') print('echo git checkout', corebranch) -print('echo git tag -a -m \\"Tag core API specification for', now, 'release\\"', 'v1.0-core-' + now) +print('echo git tag -a -m \\"Tag core API specification for', now, + 'release\\"', 'v1.0-core-' + now) print('echo git checkout', wsibranch) -print('echo git tag -a -m \\"Tag core+WSI API specification for', now, 'release\\"', 'v1.0-core+wsi-' + now) -print('echo git push --tags') +print('echo git tag -a -m \\"Tag core+WSI API specification for', now, + 'release\\"', 'v1.0-core+wsi-' + now) diff --git a/out/index.html b/out/index.html index cfc7ba88..8c155c73 100644 --- a/out/index.html +++ b/out/index.html @@ -9,9 +9,11 @@ related documents. It is updated by hand periodically by Jon Leech.