Swift
summaryrefslogtreecommitdiffstats
path: root/BuildTools/SCons/Tools
AgeCommit message (Collapse)Author
2015-10-16Do not require complete Qt installation when building SwiftenTobias Markmann
Previously, if a base installation of Qt was available but not all Qt modules required by Swift are available Scons would fail configuration. If a basic Qt installation is available SCons will try to configure Swift even if you only want to build Swiften. This commit changes the hard failure in Swift configuration to a warning. This allows only Swiften to be build. In addition, the warning now lists the Qt packages required by Swift. Test-Information: Tested on Arch Linux. Change-Id: I220ea61a7e4af849912e1fb1ae66cbecf5136d29
2015-09-24Always include Qt5 audio plugins for Windows packagesTobias Markmann
At some point during the Qt5 timeline they moved platform dependent audio playback code into a plugin. This fix will ensure that audio plugins are always shipped with out packages. Test-Information: Tested playing sound works on Windows 7 and Windows 8. Change-Id: I8976f1c1fb85d5efaadec5db26adec907a0a9f7b
2015-07-07Use environment variables for addresses used in NetworkTestTobias Markmann
Introducing SWIFT_NETWORK_TEST_IPV4 and SWIFT_NETWORK_TEST_IPV6 for the host addresses used in BoostConnectionTest.cpp. Passing these variables and ASAN/LSAN_OPTIONS for memory leak detection when calling the test from SCons. Test-Information: Tested on Elementary OS with correct available hosts and unavailable hosts. In both cases the behavior is the same as before. Change-Id: I24128c766642c5a2ee273f7c11624525ae33e270
2015-07-07Fix './scons --help' if no Qt installation can be foundTobias Markmann
Test-Information: Tested on Elementary OS 0.2. Change-Id: Ieae4fc2a2c6fdfaaac9895153b09c9504ef71495
2015-06-25Fix qt4.py tool for ArchTobias Markmann
The tool had syntax errors (missing subprocess. in front of PIPE) and SCons errors (missing conf.Finish() calls). Test-Information: Tested on Arch Linux 1.4. Change-Id: Ibab23e1dc776ee9fe96de45221c4fb9659f4a185
2015-06-18Have SCons qt4 tool check for real moc or qtchooserTobias Markmann
Some platforms, e.g. KUbuntu, provide a wrapper around Qt's commands that allow easy switching between different Qt versions. With this change SCons will execute the found moc tool and check whether it works or not. Test-Information: Tested with correctly installed Qt and uninstalled Qt on KUbuntu 14.04. Change-Id: I88f0a36af462e909829c30115aa5481abdcd3ac6
2015-06-14Fix SCons qt4 tool pkg-config detectionTobias Markmann
Correctly use pkg-config to test for Qt, if no qt path is specified in config.py. 'Import(…)' at the top caused an error which was hidden by try/catch at upper layer. Test-Information: Tested on Kubuntu 14.04, with and w/o qt path set and verified that no exception is thrown if Qt is registered at pkg-config. Change-Id: I82800c23e9f75bd5f6b136fe384a70165a92bb45
2015-06-02Fix qt4.py Scons module pkg-config support in case Qt is not presentTobias Markmann
Test-Information: Tested on Elementary OS 0.2.1 with all Qt components uninstalled. Previously it would abort configuration and build. Now it simply builds without Swift and other parts depending on Qt. Change-Id: I84c91985a0ba1fdab98e97f80621cd41e0a7507b
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
2015-05-19Gracefully handle pkg-config when Qt is not installedTobias Markmann
Test-Information: Tested on Elementary OS 0.2.0. Without this patch scons crashed if not all required Qt libs are installed. Now it marks Qt as unavailable and will configure a build without Swift. Change-Id: I5aa28ab8438e4c326d16413deb3a3fa739c94480
2015-05-07Add support for Qt 5.4.1 to build and distribution process on WindowsTobias Markmann
Test-Information: Tested with Qt 5.3.2 and Qt 5.4.1 from qt.io website. Change-Id: Iada3e64e530d8a5b53b8b5c8943bcafbd9bd6c64
2015-05-04Ignore 3rdParty warnings on Linux platforms when using Clang or GCCTobias Markmann
Test-Information: Tested behavior on Elementary OS 0.2.1. Change-Id: Icc0611181fbf7dbe22d6c0c8cb18be9c1cdbc138
2015-04-29Ignore compiler warnings from 3rdParty librariesTobias Markmann
When compiling with Clang or GCC, include 3rdParty libraries as system headers and frameworks (-isystem and -f). Test-Information: Tested with Clang on OS X. Change-Id: I184221ddc4b34d30ee6ba66e202953619b5afd56
2015-04-28Add Qt flags detection using pkg-config on Linux platformsTobias Markmann
Fix qt4.py SCons module to use the specific tools of the correct Qt verison. On non-Windows and non-Darwin platforms SCons will try to detect the correct Qt compiler and linker flags from pkg-config. Added the ability to build Slimber with Qt5. Fixed Qt5 support on Linux when using prebuilt Qt distribution from Qt. This patch adds support for building Swift on Arch Linux, with Qt4 and Qt5. Test-Information: Tested under Mac OS X 10.9.5 and Manjaor Linux (Arch Linux) in Qt4 and Qt5 configuration, and tested Qt5 Linux binary from their website on Arch Linux with the qt variable set in config.py. Change-Id: I2e19ab4aa7a26fdd989e2a12faa51a0f3f89c3ce
2015-03-27Improve Windows MSI installer upgrade experienceTobias Markmann
Previously every time WiX heat.exe ran it generated new GUIDs for all the file components that MSI was going to install. Windows installer deletes components if there is no software/component left that is referencing it. This patch uses the -ag flag instead of the -gg flag for heat.exe so it will generate deterministic GUIDs based on the filename and other things instead of completely random new one on each run. In addition we schedule the upgrade to run after the new version has been installed. This way old files are first replaced with the new ones, shortcuts remain and are not deleted, pinned shortcuts remain usable. Afterwards MSI uninstalls the old version, specifically the components that are not reference anymore. Test-Information: Tested (a) two version upgrade with this patch and (b) an upgrade from a version without this patch to a version with this patch. a) The upgrade works as expected. MSI installs the new version and then uninstalls the old version. The pinned shortcut stays alive and works. b) In this case during the deinstallation files of the new installation are deleted, since there are two components with different GUIDs which however use the same filenames. Running a repair on this installation, or first deinstalling the old version and then the new one manually fixes this. Change-Id: I842a288d837962e77efaa15b17d3877e923c7e49
2015-02-12Fix missing to return some dependencies in windeployqt-based ↵Tobias Markmann
createWindowsBundle implementation Test-Information: Did a clear rebuild with dist=1 and confirmed that it now starts the WiX process after all dependencies are copied over. Change-Id: Icbb9ec127b0d56e10f2620790f0fc6b6a29d5aa5
2015-02-06Use windeployqt.exe if available and Win distribution documentation fixTobias Markmann
If windeployqt.exe is available for Qt5, it will be used to detect which Qt DLLs to put in the Windows distribution and its dependencies correctly. Added a note to our Windows building documentation about the VS redistributable. Test-Information: Tested building a MSI package on Windows 8.1 Pro with Qt 5.3.2 32-bit msvc2013_opengl which successfully installs and runs. Change-Id: I786da40d6467f1de8e64bfae275f8363ac1d5ba8
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
2014-01-19Make SCons Qt4 tool work on all non-Windows/OS X platformsRemko Tronçon
Change-Id: Ib59fe1d9d71194f9b34b655ab817811d673c5187
2013-08-14Adjust Android test deployment path.Tobias Markmann
Change-Id: I3791b31beb7a968901b33722a18771185e7aa61e License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-08-13Adding basic support for Android and Unbound (No IPv6 yet).Tobias Markmann
Change-Id: I1d74324515b20e0dc3d0ef4aa2f556fea7b4bee3 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.s
2013-08-09Include accessibility plugin in Windows packagesKevin Smith
Change-Id: I9bff93b9bd9d81cec4143d0ba35a1045077e1e82
2013-08-08Package necessary plugins for qt5 on WindowsKevin Smith
Change-Id: Icfcf31668a3bcba687885aab0e548a8b42c30773
2013-07-15Fixed Qt5 compilation on Windows.Remko Tronçon
Change-Id: I2d4de311e7d8c6909f6a35dbb650380e2b0b1da9
2013-03-04Qt5 support & warning fixes.Remko Tronçon
Change-Id: I62c7d5ca44c915e36c797c798294b7c34b465514
2012-12-22Replace MergeFlags calls by UseFlags calls.Remko Tronçon
Change-Id: If7193006987fd86d102e5e17aac426ef1a6ccd83
2012-11-13Silence WiX tools.Remko Tronçon
Change-Id: I478e228f5c1ff082bebcc62e6e13a30d6c902c07
2012-10-07Fixed & cleaned up some of the WiX stuff.Remko Tronçon
2012-09-17Support for building swiften as a DLLRemko Tronçon
Added missing SWIFTEN_API declarations. Changed test infrastructure to extend path before running tests.
2012-07-15Provide replace_pragma_once flag.Remko Tronçon
2012-06-23Fixed .qrc dependencies not being tracked.Remko Tronçon
Resolves: #1134
2012-06-12Create amalgamation of COPYING file.Remko Tronçon
2012-02-28Add workaround for Qt MOC bug.Remko Tronçon
Details about the workaround & bug can be found here: https://bugreports.qt-project.org/browse/QTBUG-22829 Resolves: #1067
2011-12-24Removing debug print.Remko Tronçon
2011-11-26Initial support for WiX installer.Kevin Smith
dist=1 on Windows now generates .msi instead, as long as wix_bindir is set to the path of \bin\ for WiX. nsis is no longer used
2011-08-13Merge branch 'swift-1.x'Remko Tronçon
* swift-1.x: Fixed Qt SCons tool on Linux 3.0 systems.
2011-08-13Fixed Qt SCons tool on Linux 3.0 systems.Remko Tronçon
Resolves: #961
2011-04-22Merge branch 'swift-1.x'Remko Tronçon
* swift-1.x: Fixed SCons not picking up the build version correctly in tarball build.
2011-04-22Fixed SCons not picking up the build version correctly in tarball build.Remko Tronçon
2011-04-18Added RFC5122 XMPP URI parsing and basic handling.Remko Tronçon
URI Handling currently only works on Mac OS X.
2011-04-09Fixed NSIS translation script dependency.Remko Tronçon
2011-02-26Moving tests around.Remko Tronçon
2011-02-20Make Swift translatable.Remko Tronçon
2011-02-19Make Swift translatable.Remko Tronçon
2011-01-22Link against debug version of Qt on windows.Remko Tronçon
2010-12-15Ensure Swift name is displayed in Windows systray.Remko Tronçon
Resolves: #515
2010-11-28Replace slightly-too-magic MergeFlags by our own UseFlags.Remko Tronçon
2010-10-10Conditionally build documentation.Remko Tronçon
2010-09-12Ignore .qrc in sloc counts.Remko Tronçon