Skip to content

Commit

Permalink
Xcode 7 & iOS 9 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Felix Schulze committed Nov 20, 2015
1 parent 895d29d commit a8ebcc8
Show file tree
Hide file tree
Showing 113 changed files with 383 additions and 42,876 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ libssh2-for-iOS.xcodeproj/project.xcworkspace/xcuserdata
libssh2-for-iOS.xcodeproj/xcuserdata
lib
*.xccheckout
openssl.framework
include/
gcrypt.framework
*.xcscmblueprint
43 changes: 43 additions & 0 deletions Launch Screen.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="libssh2-for-iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
<rect key="frame" x="20" y="180" width="560" height="43"/>
<animations/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
<constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
<constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" constant="20" symbolic="YES" id="x7j-FC-K8j"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
</document>
30 changes: 11 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ The example uses libssh2 to make an ssh connection to an ssh server. Then you ca
You can build the libssh2 library with openssl or with libgcrypt!

## Requirements:
- Xcode 6.x
- iOS 8.1 SDK
- Xcode 7.1
- Xcode Command Line Tools

## Readme
Expand All @@ -31,20 +30,13 @@ git submodule update
Check the log files in the ```bin``` folder
## Changelog:

**2015-01-11**: OpenSSL 1.0.1k

**2015-01-06**: Support for Xcode 6 and iOS 8.1, OpenSSL 1.0.1j

**2014-03-25**: Support for Xcode 5.1 and iOS 7.1

**2013-09-26**: Support for Xcode 5 and iOS 7

**2013-03-03**: Move OpenSSL to submodule

**2013-03-02**: OpenSSL 1.0.1e

**2013-01-01**: libssh 1.4.3

**2012-05-29**: OpenSSL 1.0.1c + libssh 1.4.2

**2011-02-08**: OpenSSL 1.0.0d
* 2015-01-11: Support for Xcode 7 and iOS 9.1, OpenSSL 1.0.2d
* 2015-01-11: OpenSSL 1.0.1k
* 2015-01-06: Support for Xcode 6 and iOS 8.1, OpenSSL 1.0.1j
* 2014-03-25: Support for Xcode 5.1 and iOS 7.1
* 2013-09-26: Support for Xcode 5 and iOS 7
* 2013-03-03: Move OpenSSL to submodule
* 2013-03-02: OpenSSL 1.0.1e
* 2013-01-01: libssh 1.4.3
* 2012-05-29: OpenSSL 1.0.1c + libssh 1.4.2
* 2011-02-08: OpenSSL 1.0.0d
150 changes: 150 additions & 0 deletions ViewController.xib
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ViewController" customModule="libssh2_for_iOS" customModuleProvider="target">
<connections>
<outlet property="ipField" destination="qXf-kr-c1r" id="hdX-BW-PxS"/>
<outlet property="passwordField" destination="Ooe-Y9-Hgi" id="Mg2-SZ-SWI"/>
<outlet property="textField" destination="X4l-ui-hWe" id="NZa-Q5-day"/>
<outlet property="textView" destination="YfR-Dg-eFy" id="Y0A-Dg-oKi"/>
<outlet property="userField" destination="jiw-9B-xjg" id="WBX-6e-UX6"/>
<outlet property="view" destination="iN0-l3-epB" id="fCU-Fg-uKn"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="64" width="320" height="416"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="qXf-kr-c1r">
<rect key="frame" x="109" y="52" width="196" height="30"/>
<animations/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dIB-iW-uIL">
<rect key="frame" x="15" y="174" width="290" height="35"/>
<animations/>
<constraints>
<constraint firstAttribute="height" constant="35" id="xrs-hM-adi"/>
</constraints>
<fontDescription key="fontDescription" name="Helvetica-Bold" family="Helvetica" pointSize="15"/>
<state key="normal" title="Execute Command">
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="executeCommaned" destination="-1" eventType="touchUpInside" id="22U-n3-zdy"/>
</connections>
</button>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Command:" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="fJJ-A7-FH0">
<rect key="frame" x="15" y="15" width="84" height="21"/>
<animations/>
<constraints>
<constraint firstAttribute="width" constant="84" id="5Ej-A6-Rqv"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="84" id="DU9-2Q-9LZ"/>
<constraint firstAttribute="height" constant="21" id="rEW-9n-eVL"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="IP:" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="f09-ko-f51">
<rect key="frame" x="15" y="56" width="84" height="21"/>
<animations/>
<constraints>
<constraint firstAttribute="width" constant="84" id="pEq-5b-ysb"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Ooe-Y9-Hgi">
<rect key="frame" x="109" y="134" width="196" height="30"/>
<animations/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<textInputTraits key="textInputTraits" secureTextEntry="YES"/>
</textField>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Password:" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="Jt3-t5-Xxz">
<rect key="frame" x="15" y="138" width="84" height="21"/>
<animations/>
<constraints>
<constraint firstAttribute="width" constant="84" id="W04-G5-Grs"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="whoami" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="X4l-ui-hWe">
<rect key="frame" x="109" y="11" width="196" height="30"/>
<animations/>
<constraints>
<constraint firstAttribute="height" constant="30" id="nAQ-36-oh8"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<textInputTraits key="textInputTraits"/>
</textField>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="jiw-9B-xjg">
<rect key="frame" x="108" y="93" width="197" height="30"/>
<animations/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<textInputTraits key="textInputTraits"/>
</textField>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Username:" lineBreakMode="tailTruncation" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="hKU-FX-aWI">
<rect key="frame" x="15" y="97" width="84" height="21"/>
<animations/>
<constraints>
<constraint firstAttribute="width" constant="84" id="qEd-YY-eik"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YfR-Dg-eFy">
<rect key="frame" x="17" y="225" width="280" height="176"/>
<animations/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<textInputTraits key="textInputTraits"/>
</textView>
</subviews>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="Ooe-Y9-Hgi" firstAttribute="centerY" secondItem="Jt3-t5-Xxz" secondAttribute="centerY" id="1Yf-sF-ZEr"/>
<constraint firstItem="dIB-iW-uIL" firstAttribute="top" secondItem="Ooe-Y9-Hgi" secondAttribute="bottom" constant="10" id="2Hx-w3-uTd"/>
<constraint firstItem="qXf-kr-c1r" firstAttribute="centerX" secondItem="X4l-ui-hWe" secondAttribute="centerX" id="3nE-Le-r6o"/>
<constraint firstItem="hKU-FX-aWI" firstAttribute="top" secondItem="f09-ko-f51" secondAttribute="bottom" constant="20" id="77H-YA-fng"/>
<constraint firstItem="YfR-Dg-eFy" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="17" id="Bho-ys-eh5"/>
<constraint firstItem="Jt3-t5-Xxz" firstAttribute="top" secondItem="hKU-FX-aWI" secondAttribute="bottom" constant="20" id="CFd-w4-PBi"/>
<constraint firstItem="jiw-9B-xjg" firstAttribute="centerY" secondItem="hKU-FX-aWI" secondAttribute="centerY" id="CSc-AS-OPT"/>
<constraint firstItem="qXf-kr-c1r" firstAttribute="centerY" secondItem="f09-ko-f51" secondAttribute="centerY" id="Gf4-jL-wxI"/>
<constraint firstAttribute="trailing" secondItem="dIB-iW-uIL" secondAttribute="trailing" constant="15" id="GiP-fT-zLR"/>
<constraint firstItem="f09-ko-f51" firstAttribute="top" secondItem="fJJ-A7-FH0" secondAttribute="bottom" constant="20" id="HLf-Sg-WMD"/>
<constraint firstItem="f09-ko-f51" firstAttribute="centerX" secondItem="fJJ-A7-FH0" secondAttribute="centerX" id="KZl-X0-u3e"/>
<constraint firstItem="fJJ-A7-FH0" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="15" id="VK6-iO-ipf"/>
<constraint firstItem="fJJ-A7-FH0" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="15" id="WBV-Ow-rNu"/>
<constraint firstItem="Jt3-t5-Xxz" firstAttribute="centerX" secondItem="fJJ-A7-FH0" secondAttribute="centerX" id="WSJ-sJ-lcS"/>
<constraint firstItem="X4l-ui-hWe" firstAttribute="centerY" secondItem="fJJ-A7-FH0" secondAttribute="centerY" id="WYz-yu-1cR"/>
<constraint firstAttribute="trailing" secondItem="X4l-ui-hWe" secondAttribute="trailing" constant="15" id="YpH-SO-OB4"/>
<constraint firstItem="jiw-9B-xjg" firstAttribute="centerX" secondItem="X4l-ui-hWe" secondAttribute="centerX" id="hJ1-vB-x0O"/>
<constraint firstItem="YfR-Dg-eFy" firstAttribute="top" secondItem="dIB-iW-uIL" secondAttribute="bottom" constant="16" id="hbN-Ga-FHU"/>
<constraint firstItem="hKU-FX-aWI" firstAttribute="centerX" secondItem="fJJ-A7-FH0" secondAttribute="centerX" id="iWA-Ph-cBh"/>
<constraint firstItem="dIB-iW-uIL" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="15" id="lDz-yF-Wl0"/>
<constraint firstAttribute="trailing" secondItem="YfR-Dg-eFy" secondAttribute="trailing" constant="23" id="m0O-sk-aNI"/>
<constraint firstItem="Ooe-Y9-Hgi" firstAttribute="centerX" secondItem="X4l-ui-hWe" secondAttribute="centerX" id="nKI-YC-p2f"/>
<constraint firstAttribute="bottom" secondItem="YfR-Dg-eFy" secondAttribute="bottom" constant="15" id="prs-XJ-FKL"/>
<constraint firstAttribute="trailing" secondItem="Ooe-Y9-Hgi" secondAttribute="trailing" constant="15" id="qML-tc-nVY"/>
<constraint firstAttribute="trailing" secondItem="qXf-kr-c1r" secondAttribute="trailing" constant="15" id="stG-id-zhW"/>
<constraint firstItem="X4l-ui-hWe" firstAttribute="leading" secondItem="fJJ-A7-FH0" secondAttribute="trailing" constant="10" id="tno-oz-XYd"/>
<constraint firstAttribute="trailing" secondItem="jiw-9B-xjg" secondAttribute="trailing" constant="15" id="yr9-2T-XVY"/>
</constraints>
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" translucent="NO" prompted="NO"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="748" y="2"/>
</view>
</objects>
</document>
16 changes: 4 additions & 12 deletions build-libssh2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,10 @@ do
export LD=${DEVROOT}/usr/bin/ld
export CC=${DEVELOPER}/usr/bin/gcc
export CXX=${DEVELOPER}/usr/bin/g++
if [[ "${ARCH}" == "i386" || "${ARCH}" == "x86_64" ]];
then
export AR=${DEVELOPER}/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar
export AS=${DEVELOPER}/Toolchains/XcodeDefault.xctoolchain/usr/bin/as
export NM=${DEVELOPER}/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm
export RANLIB=${DEVELOPER}/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib
else
export AR=${DEVROOT}/usr/bin/ar
export AS=${DEVROOT}/usr/bin/as
export NM=${DEVROOT}/usr/bin/nm
export RANLIB=${DEVROOT}/usr/bin/ranlib
fi
export AR=${DEVELOPER}/Toolchains/XcodeDefault.xctoolchain/usr/bin/ar
export AS=${DEVELOPER}/Toolchains/XcodeDefault.xctoolchain/usr/bin/as
export NM=${DEVELOPER}/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm
export RANLIB=${DEVELOPER}/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib
export LDFLAGS="-arch ${ARCH} -pipe -no-cpp-precomp -isysroot ${SDKROOT} -L${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/lib -miphoneos-version-min=7.0"
export CFLAGS="-arch ${ARCH} -pipe -no-cpp-precomp -isysroot ${SDKROOT} -I${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/include -miphoneos-version-min=7.0"
export CPPFLAGS="-arch ${ARCH} -pipe -no-cpp-precomp -isysroot ${SDKROOT} -I${CURRENTPATH}/bin/${PLATFORM}${SDKVERSION}-${ARCH}.sdk/include -miphoneos-version-min=7.0"
Expand Down
Loading

0 comments on commit a8ebcc8

Please sign in to comment.