AgeCommit message (Collapse)Author
2019-01-21Make compatible with both Py2 and Py3Edwin Mons
The merge of 4.x changes onto master introduced changes to Pyhon scripts that weren't compatible with Python 3. The script is now compatible with both Python 2 and Python 3, and a slightly underimplemented test has been expanded to actually live up to its name. getGitBuildVersion has been refactored completely. It has been simplified to require only one invocation of git describe, unit tests for the parsing have been added, and a way to call getGitBuildVersion from the commandline has been added to (to avoid adding a unit test that would call out to an external tool). has been made compatible with Python3, and some additional logic to prevent emitting b'path/to/docbook/xml' instead of the desired 'path/to/docbook/xml' has been added. Generation of COPYING in Swift/QtUI now uses the upstream version provided with SCons 3, and our custom version has been removed. Unused code in the SwiftenDevelopersGuide SConscript with invalid regular expressions has been removed, and the remaining regular expressions in SConscripts have been fixed. Test-Information Code has been tested on macOS 10.14. Scons now completes a build on a clean tree using either Python 2 or Python 3. Running it on a previouly built tree works with either, as well, mixing versions between invocations is not an issue. Swift unit tests pass with Python 3.7.0. unit tests pass with Python 2.7.15 and 3.7.0. Running with doc=1 works with both Python 2 and Python 3, even if the docbook points to a path with unicode characters in it. Resulting COPYING file has been verified both visually and against a Python2 generated one on master. Resulting XML files for documentation have been inspected. Resulting manual HTML and PDF files have been inspected. Change-Id: I54de909d80b8e35a8c351261ae10ce3537729c84
2019-01-15Merge tag 'swift-4.x' into masterTobias Markmann
* branch 'swift-4.x': Update for Debian Don't crash on missing bookmark result Add missing include for QAbstractItemModel Update Debian changelog Fix convertToWindowsVersion() function to handle more RCs Fix error response handling when requesting VCards Test-Information: ./scons test=all succeeded on macOS 10.14.2. Change-Id: I99d20a8b0e1b0be501fbbe95adebbff15f510184
2018-07-12Fix Python 3 compatibility of our SCons and tooling Python codeTobias Markmann
For the upcoming update to Scons 3, which works with Python 2 and Python 3, this change makes our code compatible with Python 3 so that it still works with Python 2. Test-Information: Tested these changes with SCons 3.0.1 on macOS 10.13.6 with Python 2.7.15 and Python 3.7.0. Change-Id: Idb5207b179a79a0dbe89d7e620d182a7d2f1ca6c
2018-04-05Fix convertToWindowsVersion() function to handle more RCsswift-4.0.2Tobias Markmann
The new version conversion function allows up to 8 patch releases, up to 11 RC releases, up to 7 beta releases, and up to 5 alpha releases. The script fails hard on invalid input, thus failing the build when used. It also allows for checking the release tag in the release process. Test-Information: Added unit tests for some critical properties of the conversion. As previously the minor number of the Windows version triplet was not used, all new versions using this new scheme are considered newer, for the same major version. Change-Id: I53552a72ceaf7fe90f919990bd3d3be45a976c03
2016-04-25Convert hard tabs to four spaces in all our SConscript/*.py filesTobias Markmann
Test-Information: Test that it still builds and unit test pass on OS X 10.11.4. Change-Id: I2eb4a0b707991aee553db36a8cd1ae28b813acab
2015-05-19Consolidate Python and SCons files to tab based indentationTobias Markmann
Test-Information: Verified that SCons still runs on OS X. Change-Id: I7e9b97f90ee5581a691a959b6f2c999d93e0be53
2014-10-13Regress Python requirement to 2.4 againKevin Smith
Test-information: Ran through the configuration step on a machine with only Python 2.4 Change-Id: I3d5ba54395ede875c7f21c2769151fe6d308e760
2014-10-01Port many of Isode's local fixes upstreamKevin Smith
Includes fixes to: Build with new Visual Studio and Boost Avoid error caused when Avahi is present but Qt is not Make declaration of XMPPRosterImpl::addContact consistent with implementation Includes enhancements to: Allow user-configurable mt.exe Allow splitting openssl paths Allow disabling gconf lookup Make idn support optional Allow disabling various library detections Remove use of non-Python2.4 features in sconscripts Test-Information: Builds Change-Id: Iee91ee80291a8bdf87cc169c915e4dad1cc1055b
2014-02-22Make git and wix wrappers in build system more convenient for use by other ↵Kevin Smith
projects Change-Id: I173f42bfe2dde7d18be3d54976649aa1bac13dbf
2012-12-21Now specify a legal patch versionswift-2.0Kevin Smith
Change-Id: I9a3a247945860fac64af664e14db5c09d80e1f8f
2012-12-21Fix for Windows packaging of 2.0Kevin Smith
Change-Id: I73ff8c6e50e9549ebbc82e45bac3477565e3f9cb
2012-11-14Produce Windows installers with versions other than betaswift-2.0rc1Kevin Smith
Change-Id: I91ee9d1509bbd824fdc23ac2313310044065d4a1
2012-11-14Use version numbers for Swift binary so upgrades workKevin Smith
Change-Id: If491b0a62782d568cad132c8c5856aaeb3a3967a
2011-06-20Prioritize version files over git version.Remko Tronçon
2011-04-22Fixed SCons not picking up the build version correctly in tarball build.Remko Tronçon
2010-10-05Pick up version number from file.Remko Tronçon
2010-06-15Fallback correctly on missing project version tag.Remko Tronçon
2010-06-13Use a less ambiguous way of tagging version builds.Remko Tronçon
2010-06-10Fixed quoting of version detection.swift-1.0beta2Remko Tronçon
2010-06-10Fixed version detection script.Remko Tronçon
2010-05-29Simplify Git build version detection.Remko Tronçon
2010-05-29Strip off project name from tagged git build version.Remko Tronçon
2010-05-25Pick up build version from git tag (if present).Remko Tronçon
2010-03-28Moving submodule contents back.Remko Tronçon
2010-03-28Removing submodules.Remko Tronçon
2010-03-28Moved BuildTools to a separate module.Remko Tronçon
2010-03-28Removing BuildTools module.Remko Tronçon
2009-08-30Fix build version generator when Git is not present.Remko Tronçon
The fallback is to return the date as a build version.
2009-08-28Make version tool work on Windows.Remko Tronçon
2009-08-28Add SCons tool to dump build version in a file.Remko Tronçon