summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-12-10Use ar tool from the cross-compiling toolchain when building for Android.Tobias Markmann
Test-Information: Tested with nm tool from cross-compiling toolchain. Before it would report 'Malformed archive' for libSwiften.a. Now it correctly lists all symbols without reporting an error. Change-Id: I3901bb206487a05124986bbdc53f336aed932f5b
2014-11-24Disable file-transfer support for iOS.Tobias Markmann
iOS SDK does not have net/route.h interface as part of its public API. File-transfer requires UPnP/NAT-PMP for a good user experience which in turn require detection of the default gateway/router. Disabiling file-transfer support for iOS until we know a valid way to detect the default gateway/router on iOS. Test-Information: Tested against iPhone/iPhoneSimulator8.1 SDKs. Change-Id: I1303f37c025e8c6309acefcd80b9b30a3ac18fbb
2014-11-24Use the correct compiler/linker on modern iOS SDKs.Tobias Markmann
Test-Information: Tested against iPhone/iPhoneSimulator8.1 SDKs. Change-Id: I8837f653799587edf43885c3632b1f647832f429
2014-11-13Fix build system documentation typo.Tobias Markmann
Test-Infromation: No testing required. Change-Id: I93dbd239f37d3982ddaf939cd903127349e404f3
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-06Allow scons to not require an IDN libraryKevin Smith
This will clearly break all the tests, Swift, Sluift etc., but is useful if someone wants to use Swiften and inject their own IDN provider. Test-information: Compiles with Isode's IDN provider Change-Id: Ia55991054f42f332bf34b653d7b55f64f654820e
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-02-16Don't try to install git hooks when Swift is used as a submodule.Kevin Smith
Change-Id: I7c83c416507635f5bba6411824bd1a540dffc910
2014-01-19Make SCons Qt4 tool work on all non-Windows/OS X platformsRemko Tronçon
Change-Id: Ib59fe1d9d71194f9b34b655ab817811d673c5187
2014-01-03Sluift: Custom console/interpreterRemko Tronçon
- Prints results of each command (if it can be interpreted as an expression) - Stores results of last command in _1, _2, ... - Supports tab completion - Compatible with Lua 5.2 Other changes: - Add support for specifying custom editline library - Don't load sluift into global namespace. Tab completion should be convenient enough. Change-Id: I2a26346469d67c281d09d47cacaa0b267f5ea9f9
2013-12-27Sluift: RefactoringRemko Tronçon
- Rename boot.lua to core.lua - Support Lua 5.2 - Support version prefixes for sluift module - Add Client:process_events Change-Id: I3fa6d06d1dbdf86f65b9f4203bd2ec5b5526b104
2013-11-07Get past the configure stage for iOS-based xcode targetsKevin Smith
Without telling the linker that it's for iOS, you get link errors during configure, like: ld: building for MacOSX, but linking against dylib built for iOS Simulator file '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator7.0.sdk/System/Library/Frameworks/Foundation.framework/Foundation' for architecture i386 Change-Id: I446bc99d5b8a2ba95a441e9ac0b82d6b64ff3d83
2013-11-03Split experimental File Transfer out from History and Whiteboarding.Kevin Smith
Effectively disables whiteboarding and history in default builds so we can avoid having to do a full cleanup of them for 3.0. File transfer remains enabled in default builds as we're intending getting that ready and shipping it. Change-Id: I8c1dcc989f238b58d6d7c426485e7cf582514d8f
2013-10-01Adding support for impromptu MUCs.Tobias Markmann
Change-Id: I363e9d740bbec311454827645f4ea6df8bb60bed License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
2013-09-16Disable Boost Signals warningsRemko Tronçon
Change-Id: I6bb4c81b1f92a5b038ff034a4e03bab997fe8880
2013-09-15Install SluiftRemko Tronçon
Change-Id: Ia08269b51528b4458418939e5478cb320f4ba40d
2013-09-15Use system Lua if presentRemko Tronçon
Change-Id: I665a603b1afa1e24e1b73618e976113a87be2001
2013-08-27PubSub implementation & Sluift refactoring.Remko Tronçon
Change-Id: I04ff7111b73565c00bff6db183451774a633344f
2013-08-22Ignore unknown pragmas.Remko Tronçon
Change-Id: I9a15163da44a964eaa5ce452cb23524ecf10a2c3
2013-08-15Add "-Wno-missing-variable-declarations" (some CPPUnit annoyance) and ↵Tobias Markmann
"-Wno-direct-ivar-access" to our default clang flags. Change-Id: If6f544696128967e0785a5afc86bdd2ca9ea352a License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
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-07-13Added scons2ninja script.Remko Tronçon
This script allows you to use ninja to drive your build, but using SCons in the back to generate the ninja files. Change-Id: I410d80d91f3c2ca6f369169d9b004b531625022f
2013-07-12Add temporary workaround for VS2012 support.Remko Tronçon
Change-Id: Iecd927ceb0c7146af3e7a2b99b6ff0d6cf3b619f
2013-07-09Add settings to make scons build faster.Remko Tronçon
Change-Id: Iaa86883f483f0d852fceeaf5b645395457547428
2013-05-11Silence new CLang warning.Remko Tronçon
Change-Id: Ic3889daf4e08fde38b0e615661696c6b8cb337fb
2013-05-10Xcode SDK location changes.Remko Tronçon
Change-Id: Ib13d3eaa927431e3a10f3b724fbfab96f134c1c8
2013-04-21Fix compilation when 3rdParty/ is not there.Remko Tronçon
Change-Id: I6d86bf7d8dcc750ff69ff08500c9987b3c1de43e
2013-04-19Avoid 'test' phase when parsing SConscripts.Remko Tronçon
Change-Id: I504fa7d33b8cb6572f05ba8478d277ddc7705483
2013-03-30Making stuff build against non-bundled librariesKevin Smith
Change-Id: I2c00de607e204f7d2c474aa9d4c18cde86d575ec
2013-03-15Spell checker implementation using HunspellVlad Voicu
Change-Id: Ia15b6532edf6eef7c45bdfb273e77f65ce998f13 License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details
2013-03-04Qt5 support & warning fixes.Remko Tronçon
Change-Id: I62c7d5ca44c915e36c797c798294b7c34b465514
2013-03-03Remove the async vfs for sqlite, to avoid the crashKevin Smith
Change-Id: I8cda6397048911f48575659ef2f59076d8022f03
2013-03-02Disable some more warnings.Remko Tronçon
Change-Id: I30065deb10749618cdd4a3042e9d494ddc6c063d
2013-02-12Include frameworks in swiften-config.Remko Tronçon
Also remove duplicates from frameworks list. Change-Id: I769d3951677a180c90618dc6ae5b91d028c08e8a
2013-02-11Fix bundled OpenSSL builds.Remko Tronçon
Change-Id: Ic11b04663f324b75d81a18887cbe4c7324823c86
2013-01-13Fix more warnings.Remko Tronçon
Fix sign conversion warnings. Removing heavy unnecessary includes. Change-Id: I992f43065498823098a875badb020c7c84fc4797
2012-12-31Fix more warnings.Remko Tronçon
Change-Id: I0fc27a08adb6aecd5c5775a52b7fe48570ed526a
2012-12-31Remove obsolete CLang & MSVS tools.Remko Tronçon
Change-Id: I5fbe1a44ae95c80eaf11bda466576154633abda8
2012-12-31Add scan-build support.Remko Tronçon
Change-Id: Ife69d84147946b41875792cb90189542c3130bc3
2012-12-30Rearrange warning options.Remko Tronçon
Change-Id: Ibe78f592cc9278e149541ad3e9499bd1fb198671
2012-12-30Enable & fix pedantic CLang warnings.Remko Tronçon
Change-Id: I70109624b4bd7aab9ba679a3eaabc225dd64a03a
2012-12-23Remove distcc settings.Remko Tronçon
Change-Id: I2c5f75aa48429db37d377bb73bb1a8171089dffa
2012-12-23Use CLang by default on Mac OS X.Remko Tronçon
Change-Id: I8be9527d06698785167b4824db1847c2d7b5362b