Swiftdiff options
| -rw-r--r-- | Documentation/BuildingOnWindows.txt | 21 | ||||
| -rwxr-xr-x | Swift/Packaging/Debian/package.sh | 6 |
2 files changed, 23 insertions, 4 deletions
diff --git a/Documentation/BuildingOnWindows.txt b/Documentation/BuildingOnWindows.txt index fe2080c..1e5a6e1 100644 --- a/Documentation/BuildingOnWindows.txt +++ b/Documentation/BuildingOnWindows.txt @@ -1,14 +1,16 @@ Prerequisites ------------ - Microsoft Visual C++ Express Edition -- Python +- Python (2.5 <= version < 3) - OpenSSL + * OpenSSL is optional - without it the Windows platform crypto will be used * Download and extract the Windows binary version of OpenSSL from http://www.slproweb.com/products/Win32OpenSSL.html - Qt Open Source Edition (optional; not needed for Swiften) Building Qt for Microsoft Visual C++ ------------------------------------ +- These steps are optional - the pre-packaged Qt is fine - From the 'Visual C++' 'Programs' group, launch the Visual C++ command prompt - Go to the dir where you installed Qt - Configure Qt: @@ -22,7 +24,7 @@ Building Swift - Go to the Swift source dir - Create a file 'config.py' with the following contents, reflecting your local setup: - openssl = "path\to\openssl" + openssl = "path\to\openssl" #optional qt = "path\to\qt" - Run 'scons' - To build only a subdir, add the path as a target to scons. E.g., for Swift: @@ -35,3 +37,18 @@ Running tests for running the unit tests, or scons test=all for running all tests. + +Packaging Swift +--------------- +For packaging use: +- Microsoft Visual C++ Express 2008 +- No OpenSSL +- WiX +- config.py should contain: + qt = "c:\\qt\\4.7.4" + vcredist = "c:\\Program Files\\Common Files\\Merge Modules" + debug = 1 + optimize = 1 + wix_bindir = "c:\\program files\\Windows Installer XML v3.5\\bin" +- run + scons dist=1 diff --git a/Swift/Packaging/Debian/package.sh b/Swift/Packaging/Debian/package.sh index ab21db5..8fb1237 100755 --- a/Swift/Packaging/Debian/package.sh +++ b/Swift/Packaging/Debian/package.sh @@ -59,8 +59,10 @@ else # Fork local Boost UUID copy # FIXME: This shouldn't be necessary, but SCons isn't picking up the generated headers for compilation - #mkdir -p $DIRNAME/3rdParty/Boost/uuid/boost - #cp -r $DIRNAME/3rdParty/Boost/src/boost/uuid $DIRNAME/3rdParty/Boost/uuid/boost + if [ ! -z "$SWIFT_COPY_UUID" ]; then + mkdir -p $DIRNAME/3rdParty/Boost/uuid/boost + cp -r $DIRNAME/3rdParty/Boost/src/boost/uuid $DIRNAME/3rdParty/Boost/uuid/boost + fi # Create orig tarball tar czf $TARBALLBARE $DIRNAME |