From 04da3badb079d639eda3c9ccd8bc7513b4b06501 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 3 Oct 2019 20:49:40 -0700 Subject: [PATCH] Update how doc2dash is invoked --- build.py | 22 +++++++++------------- packaging/docset/Vippi-blocks-icon-32.png | Bin 0 -> 3200 bytes packaging/docset/mondrian.png | Bin 0 -> 127 bytes requirements/devel.txt | 1 + 4 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 packaging/docset/Vippi-blocks-icon-32.png create mode 100644 packaging/docset/mondrian.png diff --git a/build.py b/build.py index 319f7e63..e74c539f 100755 --- a/build.py +++ b/build.py @@ -82,8 +82,8 @@ baseName = version.PROJECT_NAME eggInfoName = baseName + '.egg-info' defaultMask='%s-%s*' % (baseName, version.VER_MAJOR) -pyICON = 'docs/sphinx/_static/images/sphinxdocs/phoenix_title.png' -wxICON = 'docs/sphinx/_static/images/sphinxdocs/mondrian.png' +pyICON = 'packaging/docset/Vippi-blocks-icon-32.png' +wxICON = 'packaging/docset/mondrian.png' # Some tools will be downloaded for the builds. These are the versions and # MD5s of the tool binaries currently in use. @@ -967,8 +967,6 @@ def cmd_doxhtml(options, args): _doDox('chm') -# NOTE: Because of the use of defaults and plutil the following docset -# commands will only work correctly on OSX. def cmd_docset_wx(options, args): cmdTimer = CommandTimer('docset_wx') cfg = Config() @@ -987,7 +985,6 @@ def cmd_docset_wx(options, args): shutil.rmtree(destname) shutil.move(srcname, destname) shutil.copyfile(wxICON, posixjoin(destname, 'icon.png')) - runcmd('plutil -convert xml1 {}/Contents/Info.plist'.format(destname)) def cmd_docset_py(options, args): @@ -1004,15 +1001,14 @@ def cmd_docset_py(options, args): # run the docset generator VERBOSE = '--verbose' if options.verbose else '' - runcmd('doc2dash {} --name "{}" --icon {} --destination dist docs/html' - .format(VERBOSE, name, pyICON)) + URL = 'https://docs.wxpython.org/' if options.release else 'https://wxpython.org/Phoenix/docs/html/' - # update its Info.plist file - docset = os.path.abspath(docset) - runcmd('defaults write {}/Contents/Info isJavaScriptEnabled true'.format(docset)) - runcmd('defaults write {}/Contents/Info dashIndexFilePath index.html'.format(docset)) - runcmd('defaults write {}/Contents/Info DocSetPlatformFamily wxpy'.format(docset)) - runcmd('plutil -convert xml1 {}/Contents/Info.plist'.format(docset)) + cmd = [PYTHON, '-m doc2dash', VERBOSE, + '--name', name, '--icon', pyICON, + '--index-page index.html', '--enable-js', + '--online-redirect-url', URL, + '--destination dist docs/html'] + runcmd(' '.join(cmd)) def cmd_docset(options, args): diff --git a/packaging/docset/Vippi-blocks-icon-32.png b/packaging/docset/Vippi-blocks-icon-32.png new file mode 100644 index 0000000000000000000000000000000000000000..364c293c271b372bece0b7fa6037860961b29307 GIT binary patch literal 3200 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 literal 0 HcmV?d00001 diff --git a/requirements/devel.txt b/requirements/devel.txt index 7f82cc4b..1e7c29bc 100644 --- a/requirements/devel.txt +++ b/requirements/devel.txt @@ -6,6 +6,7 @@ wheel twine sphinx==2.2.0 beautifulsoup4 +doc2dash requests requests[security] cython