From dcf7d400d52da3c52ed6e734f5608ee203bf6100 Mon Sep 17 00:00:00 2001 From: Jon Leech Date: Tue, 16 Feb 2016 02:06:25 -0800 Subject: [PATCH] Change path to the local repo to use the one reflecting the github server. --- doc/specs/vulkan/genRelease | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/doc/specs/vulkan/genRelease b/doc/specs/vulkan/genRelease index 049c0080..b8180314 100755 --- a/doc/specs/vulkan/genRelease +++ b/doc/specs/vulkan/genRelease @@ -4,7 +4,7 @@ import time from datetime import * # This script builds a full release package including XHTML and PDF -# versions of the specified branches (usually 1.0 and 1.0-wsi_extensions, +# versions of the specified branches (usually 1.0 and wsi_extensions, # but tags or commits can be used as well). Other files in the release # directory are removed, including man pages, XHTML chunked, HTML, # validity output, etc. @@ -13,7 +13,7 @@ from datetime import * # is run, with no outstanding un-added / un-committed files. Both # branches must have fully regnerated all automatically-regeneratable # files. After completing the build, the current branch is set to -# the first (core) branch and suggestions for creating tags are printed out. +# 'master' and suggestions for creating tags are printed out. # branch = branch or commit or tag name # label = textual label to apply @@ -44,38 +44,35 @@ def buildRelease(branch,label,outdir,targets): print('make specversion.txt') print('make -j 4 OUTDIR=' + outdir, ' NOTEOPTS="-a implementation-guide"', targets) print('rm', outdir + '/pdf/vkspec.xml') + print('git checkout -- specversion.txt') # Main global root, xml, spec -# Root of the Vulkan git repo containing the specs -root = '/home/tree/git/vulkan' +# Root of the Vulkan git repo +root = '/home/tree/git/Vulkan-Docs' # Directory with vk.xml and generation tools xml = root + '/src/spec' # Directory with spec sources spec = root + '/doc/specs/vulkan' -# Output directory, which does not have to be in the repo -outdir = '/home/tree/git/Vulkan-Web-Registry/specs/' - # These can be changed to tags, etc. -corebranch = '1.0' -wsibranch = '1.0-wsi_extensions' +corebranch = 'master' +wsibranch = 'wsi_extensions' # date in YYYYMMDD format now = datetime.today().strftime('%Y%m%d') # Generate specs -coretargets='xhtml pdf styleguide manhtml manpdf manhtmlpages' -buildRelease(corebranch, corebranch, outdir + corebranch, coretargets) - -wsitargets='xhtml pdf' -buildRelease(wsibranch, wsibranch, outdir + wsibranch, wsitargets) +wsitargets='xhtml chunked pdf' +coretargets=wsitargets + ' styleguide' +buildRelease(corebranch, 'core', root + '/out/core', coretargets) +buildRelease(wsibranch, 'core+wsi', root + '/out/wsi', wsitargets) print('echo Info: post-generation cleanup') -print('git checkout ' + corebranch) +print('git checkout master') print('echo To tag the spec branches, execute these commands:') print('echo git checkout', corebranch)