Swiftdiff options
| -rw-r--r-- | BuildTools/DocBook/SCons/DocBook.py | 10 | ||||
| -rw-r--r-- | BuildTools/SCons/SConstruct | 14 | ||||
| -rw-r--r-- | Swift/Packaging/Debian/debian/control | 2 | ||||
| -rwxr-xr-x | Swift/Packaging/Debian/debian/rules | 2 | ||||
| -rwxr-xr-x | Swift/Packaging/Debian/package.sh | 1 |
5 files changed, 25 insertions, 4 deletions
diff --git a/BuildTools/DocBook/SCons/DocBook.py b/BuildTools/DocBook/SCons/DocBook.py index eb6473a..be3d4f6 100644 --- a/BuildTools/DocBook/SCons/DocBook.py +++ b/BuildTools/DocBook/SCons/DocBook.py @@ -10,8 +10,14 @@ def generate(env) : docbook_dir = "#/BuildTools/DocBook" docbook_xsl_style_dir = env.Dir(docbook_dir + "/Stylesheets").abspath docbook_xml_catalog = env.File("catalog.xml").abspath - docbook_xml_dir = env.Dir("#/3rdParty/DocBook/XML").abspath - docbook_xsl_dir = env.Dir("#/3rdParty/DocBook/XSL").abspath + if "DOCBOOK_XML_DIR" in env : + docbook_xml_dir = env.Dir("$DOCBOOK_XML_DIR").abspath + else : + docbook_xml_dir = env.Dir("#/3rdParty/DocBook/XML").abspath + if "DOCBOOK_XSL_DIR" in env : + docbook_xsl_dir = env.Dir("$DOCBOOK_XSL_DIR").abspath + else : + docbook_xsl_dir = env.Dir("#/3rdParty/DocBook/XSL").abspath fop_fonts_dir = env.Dir(docbook_dir + "/Fonts").abspath # Generates a catalog from paths to external tools diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index c3ad8d1..0a76ddf 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -29,6 +29,8 @@ if os.name == "nt" : vars.Add(PackageVariable("bonjour", "Bonjour SDK location", "yes")) vars.Add(PackageVariable("openssl", "OpenSSL location", "yes")) vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept)) +vars.Add(PathVariable("docbook_xml", "DocBook XML", None, PathVariable.PathAccept)) +vars.Add(PathVariable("docbook_xsl", "DocBook XSL", None, PathVariable.PathAccept)) ################################################################################ # Set up default build & configure environment @@ -404,6 +406,18 @@ elif env.get("bonjour", False) : env["BONJOUR_FLAGS"]["LIBS"] = ["dnssd"] bonjour_conf.Finish() + +################################################################################ +# DocBook setup +################################################################################ + +if env.get("docbook_xml") : + env["DOCBOOK_XML_DIR"] = env["docbook_xml"] +if env.get("docbook_xsl") : + env["DOCBOOK_XSL_DIR"] = env["docbook_xsl"] +print env["DOCBOOK_XSL_DIR"] + + ################################################################################ # Set up git hooks ################################################################################ diff --git a/Swift/Packaging/Debian/debian/control b/Swift/Packaging/Debian/debian/control index 217c4e7..dcec66b 100644 --- a/Swift/Packaging/Debian/debian/control +++ b/Swift/Packaging/Debian/debian/control @@ -2,7 +2,7 @@ Source: swift Section: x11 Priority: optional Maintainer: Remko Tronçon <dev@el-tramo.be> -Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt4-dev (>= 4.5.0), libexpat1-dev (>= 2.0.1), lintian (>= 2.2.5), libxss-dev (>= 1.2.0), libboost-dev (>= 1.34.1), libboost-filesystem-dev (>= 1.34.1), libboost-program-options-dev (>= 1.34.1), libboost-regex-dev (>= 1.34.1), libboost-signals-dev (>= 1.34.1), libboost-system-dev (>= 1.34.1), libboost-thread-dev (>= 1.34.1), libboost-date-time-dev (>= 1.34.1), libidn11-dev (>= 1.10) +Build-Depends: debhelper (>= 7), scons (>= 1.2.0), libssl-dev (>= 0.9.8g), libqt4-dev (>= 4.5.0), libexpat1-dev (>= 2.0.1), lintian (>= 2.2.5), libxss-dev (>= 1.2.0), libboost-dev (>= 1.34.1), libboost-filesystem-dev (>= 1.34.1), libboost-program-options-dev (>= 1.34.1), libboost-regex-dev (>= 1.34.1), libboost-signals-dev (>= 1.34.1), libboost-system-dev (>= 1.34.1), libboost-thread-dev (>= 1.34.1), libboost-date-time-dev (>= 1.34.1), libidn11-dev (>= 1.10), docbook-xsl (>= 1.75.0), docbook-xml (>= 4.5), xsltproc, libxml2-utils Standards-Version: 3.8.4 Homepage: http://swift.im diff --git a/Swift/Packaging/Debian/debian/rules b/Swift/Packaging/Debian/debian/rules index 3ddac8a..84dfc3c 100755 --- a/Swift/Packaging/Debian/debian/rules +++ b/Swift/Packaging/Debian/debian/rules @@ -13,7 +13,7 @@ install: build dh_testroot dh_prep dh_installdirs - scons qt=/usr/share/qt4 SWIFT_INSTALLDIR=$(CURDIR)/debian/swift/usr $(CURDIR) + scons qt=/usr/share/qt4 docbook_xsl=/usr/share/xml/docbook/stylesheet/docbook-xsl docbook_xml=/usr/share/xml/docbook/schema/dtd/4.5 SWIFT_INSTALLDIR=$(CURDIR)/debian/swift/usr $(CURDIR) binary-indep: install binary-arch: install diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh index 5bcade8..f1704f4 100755 --- a/Swift/Packaging/Debian/package.sh +++ b/Swift/Packaging/Debian/package.sh @@ -19,6 +19,7 @@ rm -rf $DIRNAME git clone ../../../.git $DIRNAME find $DIRNAME/3rdParty/Boost/src -type f | grep -v uuid | xargs rm -f find $DIRNAME/3rdParty/SCons -delete +find $DIRNAME/3rdParty/DocBook -delete ln -s Swift/Packaging/Debian/debian $DIRNAME/debian ../../../BuildTools/UpdateDebianChangelog.py $DIRNAME/debian/changelog $DEBIAN_VERSION |