Skip to content

Upgrade DOCBOOK_XSL_VERSION #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sdarwin wants to merge 1 commit into from
Closed

Upgrade DOCBOOK_XSL_VERSION #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions setup_boostbook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

# User configuration
# (MAINTANERS: please, keep in synch with setup_boostbook.sh)
DOCBOOK_XSL_VERSION = "1.75.2"
DOCBOOK_XSL_VERSION = "1.79.1"
Copy link

@barendgehrels barendgehrels Sep 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version 1.79.2 (the newest) gives errors in the chunking. The documentation is not correct anymore with the parameters supplied in current Jamfiles (at least, not for Boost.Geometry). It misses all tables of contents (apart from the one on the main page). Effectively it's completely broken.

That's likely the case with 1.79.1 as well, given that it is one patch lower.

Copy link

@barendgehrels barendgehrels Sep 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With version 1.79.1 , generation of Boost.Geometry is correct!

DOCBOOK_DTD_VERSION = "4.2"
FOP_VERSION = "0.94"
FOP_JDK_VERSION="1.4"
Expand All @@ -27,8 +27,10 @@
import optparse
import shutil

# sys.path.append( os.path.join( os.path.dirname( sys.modules[ __name__ ].__file__ )
# , "../regression/xsl_reports/utils" ) )
sys.path.append( os.path.join( os.path.dirname( sys.modules[ __name__ ].__file__ )
, "../regression/xsl_reports/utils" ) )
, "../regression/reports/src/utils" ) )

import checked_system
import urllib2
Expand Down Expand Up @@ -150,21 +152,21 @@ def adjust_user_config( config_file

def setup_docbook_xsl( tools_directory ):
print "DocBook XSLT Stylesheets ..."
DOCBOOK_XSL_TARBALL = os.path.join( tools_directory, "docbook-xsl-%s.tar.gz" % DOCBOOK_XSL_VERSION )
DOCBOOK_XSL_URL = "%s/docbook-xsl/%s/%s/download" % (SOURCEFORGE_DOWNLOAD, DOCBOOK_XSL_VERSION, os.path.basename( DOCBOOK_XSL_TARBALL ) )
DOCBOOK_XSL_ZIP = os.path.join( tools_directory, "docbook-xsl-%s.zip" % DOCBOOK_XSL_VERSION )
DOCBOOK_XSL_URL = "%s/docbook-xsl/%s/%s" % (SOURCEFORGE_DOWNLOAD, DOCBOOK_XSL_VERSION, os.path.basename( DOCBOOK_XSL_ZIP ) )

if os.path.exists( DOCBOOK_XSL_TARBALL ):
if os.path.exists( DOCBOOK_XSL_ZIP ):
print " Using existing DocBook XSLT Stylesheets (version %s)." % DOCBOOK_XSL_VERSION
else:
print " Downloading DocBook XSLT Stylesheets version %s..." % DOCBOOK_XSL_VERSION
print " from %s" % DOCBOOK_XSL_URL
http_get( DOCBOOK_XSL_TARBALL, DOCBOOK_XSL_URL )
http_get( DOCBOOK_XSL_ZIP, DOCBOOK_XSL_URL )

DOCBOOK_XSL_DIR = to_posix( os.path.join( tools_directory, "docbook-xsl-%s" % DOCBOOK_XSL_VERSION ) )

if not os.path.exists( DOCBOOK_XSL_DIR ):
print " Expanding DocBook XSLT Stylesheets into %s..." % DOCBOOK_XSL_DIR
gunzip( DOCBOOK_XSL_TARBALL, tools_directory )
unzip( DOCBOOK_XSL_ZIP, tools_directory )
print " done."

return DOCBOOK_XSL_DIR
Expand Down
11 changes: 6 additions & 5 deletions setup_boostbook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# User configuration
# (MAINTANERS: please, keep in synch with setup_boostbook.py)
DOCBOOK_XSL_VERSION=1.75.2
DOCBOOK_XSL_VERSION=1.79.1
DOCBOOK_DTD_VERSION=4.2
FOP_VERSION=0.94
FOP_JDK_VERSION=1.4
Expand All @@ -19,9 +19,9 @@ HTTP_GET_CMD="curl -O -L"
# No user configuration below this point-------------------------------------

# Get the DocBook XSLT Stylesheets
DOCBOOK_XSL_TARBALL=docbook-xsl-$DOCBOOK_XSL_VERSION.tar.gz
DOCBOOK_XSL_URL=$SOURCEFORGE_DOWNLOAD/docbook-xsl/$DOCBOOK_XSL_VERSION/$DOCBOOK_XSL_TARBALL
if test -f $DOCBOOK_XSL_TARBALL; then
DOCBOOK_XSL_ZIP=docbook-xsl-$DOCBOOK_XSL_VERSION.zip
DOCBOOK_XSL_URL=$SOURCEFORGE_DOWNLOAD/docbook-xsl/$DOCBOOK_XSL_VERSION/$DOCBOOK_XSL_ZIP
if test -f $DOCBOOK_XSL_ZIP; then
echo "Using existing DocBook XSLT Stylesheets (version $DOCBOOK_XSL_VERSION)."
else
echo "Downloading DocBook XSLT Stylesheets version $DOCBOOK_XSL_VERSION..."
Expand All @@ -31,7 +31,8 @@ fi
DOCBOOK_XSL_DIR="$PWD/docbook-xsl-$DOCBOOK_XSL_VERSION"
if test ! -d docbook-xsl-$DOCBOOK_XSL_VERSION; then
echo -n "Expanding DocBook XSLT Stylesheets into $DOCBOOK_XSL_DIR..."
gunzip -cd $DOCBOOK_XSL_TARBALL | tar xf -
# gunzip -cd $DOCBOOK_XSL_TARBALL | tar xf -
unzip $DOCBOOK_XSL_ZIP
echo "done."
fi

Expand Down