Skip to content

Commit

Permalink
Add ios_system and network_ios as submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
@yury
yury committed May 21, 2018
1 parent 103892e commit fcc91e5
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ Frameworks/openssl.framework
*.sym

## Fonts
Resources/Fonts/PragmataPro*
Resources/Fonts/Pragmata*
6 changes: 6 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@
[submodule "Frameworks/PasscodeLock"]
path = Frameworks/PasscodeLock
url = https://github.com/blinksh/SwiftPasscodeLock.git
[submodule "Frameworks/ios_system"]
path = Frameworks/ios_system
url = [email protected]:holzschu/ios_system.git
[submodule "Frameworks/network_ios"]
path = Frameworks/network_ios
url = [email protected]:holzschu/network_ios.git
52 changes: 25 additions & 27 deletions Blink.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
07F670761D05EEE200C0A53C /* SSHCopyIDSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 07F6706E1D05EEE200C0A53C /* SSHCopyIDSession.m */; };
07F670771D05EEE200C0A53C /* SSHSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 07F670701D05EEE200C0A53C /* SSHSession.m */; };
2236A8ED2038972D001CD2AD /* tool_main.c in Sources */ = {isa = PBXBuildFile; fileRef = 2236A8EC2038972C001CD2AD /* tool_main.c */; settings = {COMPILER_FLAGS = "-DHAVE_CONFIG_H -I ../ios_system/curl/curl/include/ -I ../ios_system/curl/curl/lib/ -I ../ios_system/curl/config_iphone/ -DBUILDING_LIBCURL -I Settings/Model/ -I Frameworks/libssh2.framework/Headers/ -DBLINKSHELL -I ../ios_system/"; }; };
2236A8EE203897E6001CD2AD /* curl_ios_static.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2236A8E720389643001CD2AD /* curl_ios_static.framework */; };
22A9494B2067FD5E003A0666 /* files.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 22A949492067FD5E003A0666 /* files.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
22A9494C2067FD5E003A0666 /* tar.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 22A9494A2067FD5E003A0666 /* tar.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
22E1F3352036EE87001FCC5C /* openssl.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 22E1F3332036EE86001FCC5C /* openssl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
Expand Down Expand Up @@ -224,20 +223,20 @@
remoteGlobalIDString = 148993CF1D8F2515000132F7;
remoteInfo = TestHost;
};
2236A8E620389643001CD2AD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2236A8E220389643001CD2AD /* curl_ios_static.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2219DFCF1FD73AF500675252;
remoteInfo = curl_ios_static;
};
D2A3F4DC206909A8006BB305 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 0732F1051D062BF700AB5438 /* MBProgressHUD.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 1777D3DF1D757AF50037C7F1;
remoteInfo = "MBProgressHUD Framework tvOS";
};
D2E4F92D20B2BB4500B30F7B /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = D2E4F92920B2BB4500B30F7B /* curl_ios_static.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 2219DFCF1FD73AF500675252;
remoteInfo = curl_ios_static;
};
EA0BA1A51C0CC57B00719C1A /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = EA0BA1831C0CC57B00719C1A /* Project object */;
Expand Down Expand Up @@ -352,7 +351,6 @@
07F6706E1D05EEE200C0A53C /* SSHCopyIDSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSHCopyIDSession.m; sourceTree = "<group>"; };
07F6706F1D05EEE200C0A53C /* SSHSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSHSession.h; sourceTree = "<group>"; };
07F670701D05EEE200C0A53C /* SSHSession.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSHSession.m; sourceTree = "<group>"; };
2236A8E220389643001CD2AD /* curl_ios_static.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = curl_ios_static.xcodeproj; path = ../ios_system/curl_ios_static.xcodeproj; sourceTree = "<group>"; };
2236A8EC2038972C001CD2AD /* tool_main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = tool_main.c; path = ../../ios_system/curl/curl/src/tool_main.c; sourceTree = "<group>"; };
22A949492067FD5E003A0666 /* files.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = files.framework; sourceTree = "<group>"; };
22A9494A2067FD5E003A0666 /* tar.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = tar.framework; sourceTree = "<group>"; };
Expand Down Expand Up @@ -503,6 +501,7 @@
D2D6D78D20529081003CBEC4 /* SSHSession2.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SSHSession2.m; sourceTree = "<group>"; };
D2E4F91920B0537D00B30F7B /* Migrator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Migrator.h; sourceTree = "<group>"; };
D2E4F91A20B0537D00B30F7B /* Migrator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Migrator.m; sourceTree = "<group>"; };
D2E4F92920B2BB4500B30F7B /* curl_ios_static.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = curl_ios_static.xcodeproj; path = ios_system/curl_ios_static.xcodeproj; sourceTree = "<group>"; };
D2F30EAC205009CD008C5F35 /* base64js.min.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = base64js.min.js; sourceTree = "<group>"; };
D2F330C920A6CB840074ADD7 /* help.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = help.m; sourceTree = "<group>"; };
D2F330CB20A6D98C0074ADD7 /* config.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = config.m; sourceTree = "<group>"; };
Expand All @@ -520,7 +519,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
2236A8EE203897E6001CD2AD /* curl_ios_static.framework in Frameworks */,
0732F12B1D06324B00AB5438 /* libstdc++.tbd in Frameworks */,
0732F1291D06324200AB5438 /* libcurses.tbd in Frameworks */,
0732F1271D06323A00AB5438 /* libz.tbd in Frameworks */,
Expand Down Expand Up @@ -631,6 +629,7 @@
0732F04F1D062BB300AB5438 /* Frameworks */ = {
isa = PBXGroup;
children = (
D2E4F92920B2BB4500B30F7B /* curl_ios_static.xcodeproj */,
D2A3F4F520690C24006BB305 /* awk.framework */,
D2A3F4F320690BE6006BB305 /* ios_system.framework */,
D2A3F4E920690B71006BB305 /* curl_ios.framework */,
Expand Down Expand Up @@ -833,14 +832,6 @@
path = Sessions;
sourceTree = SOURCE_ROOT;
};
2236A8E320389643001CD2AD /* Products */ = {
isa = PBXGroup;
children = (
2236A8E720389643001CD2AD /* curl_ios_static.framework */,
);
name = Products;
sourceTree = "<group>";
};
B75112C71DE4A7680040C693 /* UserConfiguration */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1052,6 +1043,14 @@
path = src;
sourceTree = "<group>";
};
D2E4F92A20B2BB4500B30F7B /* Products */ = {
isa = PBXGroup;
children = (
D2E4F92E20B2BB4500B30F7B /* curl_ios_static.framework */,
);
name = Products;
sourceTree = "<group>";
};
D2F330C520A6C8E20074ADD7 /* Commands */ = {
isa = PBXGroup;
children = (
Expand All @@ -1070,7 +1069,6 @@
EA0BA1821C0CC57B00719C1A = {
isa = PBXGroup;
children = (
2236A8E220389643001CD2AD /* curl_ios_static.xcodeproj */,
C9B2E0031D6B612300B89F69 /* Settings */,
0732F04F1D062BB300AB5438 /* Frameworks */,
0732F0481D062B9A00AB5438 /* Resources */,
Expand Down Expand Up @@ -1197,8 +1195,8 @@
projectDirPath = "";
projectReferences = (
{
ProductGroup = 2236A8E320389643001CD2AD /* Products */;
ProjectRef = 2236A8E220389643001CD2AD /* curl_ios_static.xcodeproj */;
ProductGroup = D2E4F92A20B2BB4500B30F7B /* Products */;
ProjectRef = D2E4F92920B2BB4500B30F7B /* curl_ios_static.xcodeproj */;
},
{
ProductGroup = 0732F1061D062BF700AB5438 /* Products */;
Expand Down Expand Up @@ -1260,18 +1258,18 @@
remoteRef = 0747D63D2018182D00CF8F0C /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
2236A8E720389643001CD2AD /* curl_ios_static.framework */ = {
D2A3F4DD206909A8006BB305 /* MBProgressHUD.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = curl_ios_static.framework;
remoteRef = 2236A8E620389643001CD2AD /* PBXContainerItemProxy */;
path = MBProgressHUD.framework;
remoteRef = D2A3F4DC206909A8006BB305 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
D2A3F4DD206909A8006BB305 /* MBProgressHUD.framework */ = {
D2E4F92E20B2BB4500B30F7B /* curl_ios_static.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = MBProgressHUD.framework;
remoteRef = D2A3F4DC206909A8006BB305 /* PBXContainerItemProxy */;
path = curl_ios_static.framework;
remoteRef = D2E4F92D20B2BB4500B30F7B /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
Expand Down
1 change: 1 addition & 0 deletions Frameworks/ios_system
Submodule ios_system added at 49cef0
1 change: 1 addition & 0 deletions Frameworks/network_ios
Submodule network_ios added at eeda11
5 changes: 1 addition & 4 deletions get_frameworks.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ curl -OL $GHROOT/build-protobuf/releases/download/$PROTOBF_VER/protobuf-$PROTOBF

# We need ios_system for the sources of curl_static too:
(# ios_system
cd "${BASH_SOURCE%/*}/.."
# git clone --branch v${IOS_SYSTEM_VER} https://github.com/holzschu/ios_system
git clone --branch master https://github.com/holzschu/ios_system
cd "ios_system"
cd "${BASH_SOURCE%/*}/Frameworks/ios_system"
sh ./get_sources.sh
)

Expand Down

0 comments on commit fcc91e5

Please sign in to comment.