Commit Graph

412 Commits

Author SHA1 Message Date
Felix Schulze 0b6aaa865a Merge pull request #117 from x2on/framework-bitcode-check
Add check for bitcode
2016-09-18 21:43:44 +02:00
Felix Schulze 1d27fe814e Merge branch 'master' into framework-bitcode-check 2016-09-18 20:08:32 +02:00
Felix Schulze 0562fc6c61 Add check for bitcode 2016-09-18 20:07:59 +02:00
Felix Schulze ac9f3c2202 Update README.md 2016-09-18 19:57:36 +02:00
Felix Schulze 48e6942d79 Merge pull request #116 from oneton/1.0.2-command-line
Specify build configuration with command line parameters
2016-09-18 19:53:27 +02:00
Anton Tieleman 1d9c392864 Review comments
- Maintain fixed default version in script
- Add --cleanup option for concious cleanup before building and remove directory-check
- Remove (for now) option to build latest version
2016-09-18 17:34:44 +02:00
Anton Tieleman 98738414bb Command line options for Travis build.
Added no parallel due to PR #115
2016-09-18 16:15:39 +02:00
Anton Tieleman 1967594392 Specify build configuration with command line parameters
- Added help message
- Command line arguments processing
- Retrieve latest version from 1.0.2 branch in case no version is specified
- Use script location as working dir
- Add summary of build options
- Clean up directories before build
2016-09-18 16:14:11 +02:00
Felix Schulze 24500d89b9 Merge pull request #115 from oneton/1.0.2-configure
Build loop: minimise file edits (use Configure options instead) and minor style changes
2016-09-18 15:07:08 +02:00
Anton Tieleman 477160b2c9 Build loop updates
- Increase script 'safety' by checking for undefined variables
- Add comments, remove unused variables
- Align name of SOURCEDIR var with other vars
- Add compiler arguments and defines to LOCAL_CONFIG_OPTIONS where possible
- Remove change to ui_openssl.c since sig_atomic_t is now defined in the iOS SDK (also checked for 7.1) and removing it shows a compiler warning (ui_openssl.c:410:17: warning: type specifier missing, defaults to 'int' [-Wimplicit-int])
- Only add -isysroot option to Darwin builds since it is part of the compiler arguments for the iphoneos-cross target
2016-09-18 13:27:10 +02:00
Felix Schulze c6c8e89682 Update README.md 2016-09-18 13:00:12 +02:00
Felix Schulze 7f0df77c75 Merge pull request #114 from oneton/1.0.2-parallel
Parallel build (make -j)
2016-09-18 12:53:51 +02:00
oneton 12a7473d1f Merge branch 'master' into 1.0.2-parallel 2016-09-18 12:41:12 +02:00
Anton Tieleman c704379151 Parallel build (make -j) 2016-09-18 12:15:15 +02:00
Felix Schulze 9b9f854978 Merge pull request #113 from x2on/ios10
Add support for Xcode 8 / iOS 10.0
2016-09-18 12:13:46 +02:00
Felix Schulze 08bc739629 Merge branch 'master' into ios10 2016-09-18 11:53:56 +02:00
Felix Schulze 62887a94a7 Merge pull request #111 from oneton/1.0.2-build-subset
Allow build of subset of possible architectures
2016-09-18 11:53:50 +02:00
Felix Schulze f6ca3bdf95 Use xcodebuild instead of xctool (waiting for https://github.com/facebook/xctool/issues/704) 2016-09-18 11:34:48 +02:00
Anton Tieleman 87982691e2 Move ARCHS to config section and add documentation 2016-09-18 11:28:27 +02:00
Anton Tieleman 40f636f7f9 Merge changes from upstream/master 2016-09-18 11:26:46 +02:00
Felix Schulze 150cdd04e5 Fix tvOS target 2016-09-18 11:02:10 +02:00
Felix Schulze c460cee3a0 Add support for Xcode 8 / iOS 10.0 2016-09-18 10:59:49 +02:00
Felix Schulze a6d60c7f39 Merge pull request #112 from oneton/1.0.2-error-handling
Fix error handling for non-verbose mode, add verbose-on-error
2016-09-18 10:31:18 +02:00
Anton Tieleman 74c4341f71 Fix error handling for non-verbose mode, add verbose-on-error
- Error handling was broken since spinner() did not return the status of the command that was executed.
- New option verbose-on-error to limit output, but still log in case of errors (for Travis builds)
- Check for errors during make depend
- Also log to file for verbose builds
- Remove make clean since the full build directory is removed anyway
- Make spinner cursor less nervous
2016-09-18 00:34:08 +02:00
Anton Tieleman 0f2afa24af Allow build of subset of archs: make lipo arguments dynamic and copy include files from first built ARCH 2016-09-17 14:54:55 +02:00
Felix Schulze 762bbc82d4 Merge pull request #110 from zeroimpl/bitcode-for-ios10
Enable bitcode for iOS 10 SDK and beyond
2016-09-12 09:06:57 +02:00
zeroimpl db5a35acae Enable bitcode for iOS 10 SDK and beyond 2016-09-11 23:15:23 -04:00
Felix Schulze 07d20320c6 Merge pull request #107 from oneton/travis-image
Travis image to SVG / fix typos
2016-08-13 08:34:27 +02:00
Anton Tieleman df0a33c762 Fix a few typos 2016-08-12 22:36:01 +02:00
Anton Tieleman dabd38fcd4 Update Travis image to SVG 2016-08-12 22:31:08 +02:00
Felix Schulze 1bf5c5680e Fix deprecate warnings 2016-08-09 21:01:08 +02:00
Felix Schulze db7f060696 Merge pull request #105 from x2on/xcode-7.3
Xcode 7.3 support, iOS 9.3
2016-08-09 20:47:48 +02:00
Felix Schulze fe8b1464db Xcode 7.3 support, iOS 9.3 2016-08-09 18:47:06 +02:00
Felix Schulze 588fd9bea5 Update README.md 2016-08-09 13:41:54 +02:00
Felix Schulze 7a1731cf0e Update LICENSE 2016-08-09 13:33:58 +02:00
Felix Schulze 196532b505 Add LICENSE 2016-08-09 13:31:40 +02:00
Felix Schulze 39bdb5e26e Merge pull request #99 from mconintet/patch-1
Fix file path
2016-08-08 21:40:55 +02:00
Felix Schulze f37f6b0781 Merge pull request #104 from martijnlaan/patch-1
Fix changelog date for OpenSSL 1.0.2h support.
2016-08-08 21:39:46 +02:00
Martijn Laan 264827083a Fix changelog date for OpenSSL 1.0.2h support. 2016-07-19 08:28:15 +02:00
mconintet 59a52a1678 Fix file path
File path is not right if use this project as submodule like case in this project https://github.com/x2on/libssh2-for-iOS
2016-05-19 12:17:22 +08:00
Felix Schulze a022b847b1 Merge pull request #98 from stehin/master
OpenSSL 1.0.2h
2016-05-06 16:15:16 +02:00
Stephen Hinton d96ec6da27 XCode -> Xcode 2016-05-04 12:18:06 -05:00
Stephen Hinton e50a25b5dd OpenSSL 1.0.2h 2016-05-04 12:11:59 -05:00
Felix Schulze ec684e0edf Merge pull request #95 from SteffenL/fix/get-openssl-from-github
Fixed broken download/extraction of old OpenSSL archives
2016-04-29 14:58:09 +02:00
Felix Schulze e39853b1d9 Merge pull request #93 from revolter/patch-1
Update README.md
2016-03-08 20:54:21 +01:00
Steffen André Langnes e154f51cd4 Fixed broken download/extraction of OpenSSL archives by getting them from GitHub.
The reason for this is that old archived versions of OpenSSL do not exist any more in the original location.
2016-03-08 18:51:06 +01:00
Felix Schulze c26602c9af Merge pull request #94 from zhzenghui/master
update openssl version
2016-03-02 08:51:10 +01:00
zhzenghui 38b30de71b update openssl version
1.0.2f is remove
2016-03-02 11:02:18 +08:00
Iulian Onofrei 94f26b6f57 Update README.md
Added hyperlink for issue 28
2016-02-15 17:20:46 +02:00
Felix Schulze d87bb5aaf2 Merge pull request #90 from x2on/openssl-1.0.2f
OpenSSL 1.0.2f
2016-01-31 21:23:30 +01:00