This commit is contained in:
Peter 2019-08-23 11:26:32 +04:00
parent 7093541bff
commit b98c10ebe6
9 changed files with 71 additions and 210 deletions

View File

@ -263,6 +263,19 @@
<key>explicitFileType</key>
<string>wrapper.framework</string>
</dict>
<key>1DD70E296A34811900000000</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>name</key>
<string>MtProtoKitFramework.framework</string>
<key>path</key>
<string>MtProtoKitFramework.framework</string>
<key>sourceTree</key>
<string>BUILT_PRODUCTS_DIR</string>
<key>explicitFileType</key>
<string>wrapper.framework</string>
</dict>
<key>1DD70E297ADFB9F200000000</key>
<dict>
<key>isa</key>
@ -287,6 +300,7 @@
<key>children</key>
<array>
<string>1DD70E29FC2E5C0800000000</string>
<string>1DD70E296A34811900000000</string>
<string>1DD70E297ADFB9F200000000</string>
</array>
</dict>
@ -370,6 +384,13 @@
<key>fileRef</key>
<string>1DD70E29FC2E5C0800000000</string>
</dict>
<key>E7A30F046A34811900000000</key>
<dict>
<key>isa</key>
<string>PBXBuildFile</string>
<key>fileRef</key>
<string>1DD70E296A34811900000000</string>
</dict>
<key>E7A30F047ADFB9F200000000</key>
<dict>
<key>isa</key>
@ -384,6 +405,7 @@
<key>files</key>
<array>
<string>E7A30F04FC2E5C0800000000</string>
<string>E7A30F046A34811900000000</string>
<string>E7A30F047ADFB9F200000000</string>
</array>
</dict>
@ -402,6 +424,21 @@
</array>
</dict>
</dict>
<key>E7A30F046A34811900000001</key>
<dict>
<key>isa</key>
<string>PBXBuildFile</string>
<key>fileRef</key>
<string>1DD70E296A34811900000000</string>
<key>settings</key>
<dict>
<key>ATTRIBUTES</key>
<array>
<string>CodeSignOnCopy</string>
<string>RemoveHeadersOnCopy</string>
</array>
</dict>
</dict>
<key>FAF5FAC90000000000000000</key>
<dict>
<key>isa</key>
@ -409,6 +446,7 @@
<key>files</key>
<array>
<string>E7A30F04FC2E5C0800000001</string>
<string>E7A30F046A34811900000001</string>
</array>
<key>dstSubfolderSpec</key>
<integer>10</integer>

View File

@ -1 +1 @@
{"required-targets":[],"xcconfig-paths":["buck-out/gen/App/App-Debug.xcconfig","buck-out/gen/App/App-Profile.xcconfig","buck-out/gen/App/App-Release.xcconfig","buck-out/gen/App/AppLibrary-Debug.xcconfig","buck-out/gen/App/AppLibrary-Profile.xcconfig","buck-out/gen/App/AppLibrary-Release.xcconfig","buck-out/gen/submodules/Emoji/EmojiFramework#iphonesimulator-x86_64-Debug.xcconfig","buck-out/gen/submodules/Emoji/EmojiFramework#iphonesimulator-x86_64-Profile.xcconfig","buck-out/gen/submodules/Emoji/EmojiFramework#iphonesimulator-x86_64-Release.xcconfig"],"copy-in-xcode":[]}
{"required-targets":["//submodules/MtProtoKit:openssl_libs"],"xcconfig-paths":["buck-out/gen/App/App-Debug.xcconfig","buck-out/gen/App/App-Profile.xcconfig","buck-out/gen/App/App-Release.xcconfig","buck-out/gen/App/AppLibrary-Debug.xcconfig","buck-out/gen/App/AppLibrary-Profile.xcconfig","buck-out/gen/App/AppLibrary-Release.xcconfig","buck-out/gen/submodules/Emoji/EmojiFramework-Debug.xcconfig","buck-out/gen/submodules/Emoji/EmojiFramework-Profile.xcconfig","buck-out/gen/submodules/Emoji/EmojiFramework-Release.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKitFramework-Debug.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKitFramework-Profile.xcconfig","buck-out/gen/submodules/MtProtoKit/MtProtoKitFramework-Release.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Debug.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Profile.xcconfig","buck-out/gen/submodules/MtProtoKit/openssl-Release.xcconfig"],"copy-in-xcode":[]}

View File

@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><Workspace version="1.0"><FileRef location="container:App.xcodeproj"/><Group location="container:" name="submodules"><FileRef location="container:../submodules/Emoji/Emoji.xcodeproj"/></Group></Workspace>
<?xml version="1.0" encoding="UTF-8" standalone="no"?><Workspace version="1.0"><FileRef location="container:App.xcodeproj"/><Group location="container:" name="submodules"><FileRef location="container:../submodules/Emoji/Emoji.xcodeproj"/><FileRef location="container:../submodules/MtProtoKit/MtProtoKit.xcodeproj"/></Group></Workspace>

View File

@ -1,110 +1 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "9999"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04EC43AA77A00000000"
BuildableName = "libAppLibrary.a"
BlueprintName = "AppLibrary"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E20924D2000000000"
BuildableName = "EmojiFramework.framework"
BlueprintName = "EmojiFramework#iphonesimulator-x86_64"
ReferencedContainer = "container:../submodules/Emoji/Emoji.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E0001020100000000"
BuildableName = "App.app"
BlueprintName = "App"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E0001020100000000"
BuildableName = "App.app"
BlueprintName = "App"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E0001020100000000"
BuildableName = "App.app"
BlueprintName = "App"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
<?xml version="1.0" encoding="UTF-8" standalone="no"?><Scheme LastUpgradeVersion="9999" version="1.7"><BuildAction buildImplicitDependencies="YES" parallelizeBuildables="YES"><BuildActionEntries><BuildActionEntry buildForAnalyzing="YES" buildForArchiving="YES" buildForProfiling="YES" buildForRunning="YES" buildForTesting="YES"><BuildableReference BlueprintIdentifier="E66DC04E35694C7800000000" BlueprintName="EmojiFramework" BuildableIdentifier="primary" BuildableName="EmojiFramework.framework" ReferencedContainer="container:../submodules/Emoji/Emoji.xcodeproj"/></BuildActionEntry><BuildActionEntry buildForAnalyzing="YES" buildForArchiving="YES" buildForProfiling="YES" buildForRunning="YES" buildForTesting="YES"><BuildableReference BlueprintIdentifier="E66DC04EB4B57B8200000000" BlueprintName="openssl" BuildableIdentifier="primary" BuildableName="libopenssl.a" ReferencedContainer="container:../submodules/MtProtoKit/MtProtoKit.xcodeproj"/></BuildActionEntry><BuildActionEntry buildForAnalyzing="YES" buildForArchiving="YES" buildForProfiling="YES" buildForRunning="YES" buildForTesting="YES"><BuildableReference BlueprintIdentifier="E66DC04EEBF662C900000000" BlueprintName="MtProtoKitFramework" BuildableIdentifier="primary" BuildableName="MtProtoKitFramework.framework" ReferencedContainer="container:../submodules/MtProtoKit/MtProtoKit.xcodeproj"/></BuildActionEntry><BuildActionEntry buildForAnalyzing="YES" buildForArchiving="YES" buildForProfiling="YES" buildForRunning="YES" buildForTesting="YES"><BuildableReference BlueprintIdentifier="E66DC04EC43AA77A00000000" BlueprintName="AppLibrary" BuildableIdentifier="primary" BuildableName="libAppLibrary.a" ReferencedContainer="container:App.xcodeproj"/></BuildActionEntry><BuildActionEntry buildForAnalyzing="YES" buildForArchiving="YES" buildForProfiling="YES" buildForRunning="YES" buildForTesting="YES"><BuildableReference BlueprintIdentifier="E66DC04E0001020100000000" BlueprintName="App" BuildableIdentifier="primary" BuildableName="App.app" ReferencedContainer="container:App.xcodeproj"/></BuildActionEntry></BuildActionEntries></BuildAction><TestAction buildConfiguration="Debug" shouldUseLaunchSchemeArgsEnv="YES"><Testables/></TestAction><LaunchAction buildConfiguration="Debug" launchStyle="0"><BuildableProductRunnable><BuildableReference BlueprintIdentifier="E66DC04E0001020100000000" BlueprintName="App" BuildableIdentifier="primary" BuildableName="App.app" ReferencedContainer="container:App.xcodeproj"/></BuildableProductRunnable></LaunchAction><ProfileAction buildConfiguration="Release" shouldUseLaunchSchemeArgsEnv="YES"><BuildableProductRunnable><BuildableReference BlueprintIdentifier="E66DC04E0001020100000000" BlueprintName="App" BuildableIdentifier="primary" BuildableName="App.app" ReferencedContainer="container:App.xcodeproj"/></BuildableProductRunnable></ProfileAction><AnalyzeAction buildConfiguration="Debug"/><ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"/></Scheme>

View File

@ -20,7 +20,7 @@ ui_tests = [
static_library_dependencies = [
]
framework_dependencies = [
#'//submodules/MtProtoKit:MtProtoKit',
'//submodules/MtProtoKit:MtProtoKit',
'//submodules/Emoji:Emoji',
]

View File

@ -1,6 +1,6 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
//#import <MtProtoKit/MTProto.h>
#import <MtProtoKit/MTProto.h>
@interface AppDelegate : NSObject <UIApplicationDelegate>
@ -21,7 +21,7 @@
@end
int main(int argc, const char **argv) {
//MTProto *mtProto = [[MTProto alloc] init];
MTProto *mtProto = [[MTProto alloc] init];
@autoreleasepool {
return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
}

View File

@ -40,9 +40,10 @@ def apple_lib(
if framework:
if native.read_config("custom", "mode") == "project":
native.apple_library(
name = name,
name = name + "",
srcs = srcs,
header_namespace = name,
#module_name = name,
headers = headers,
exported_headers = exported_headers,
deps = deps,
@ -60,6 +61,7 @@ def apple_lib(
)
native.apple_bundle(
name = name + "Framework",
#module_name = name,
visibility = visibility,
binary = ":" + name + "#shared",
extension = "framework",
@ -84,7 +86,7 @@ def apple_lib(
swift_compiler_flags = swift_compiler_flags,
preferred_linkage = "shared",
link_style = "static",
linker_flags = ["-Wl,-install_name,@rpath/%sFramework.framework/%sFramework" % (name, name)],
linker_flags = ["-Wl,-install_name,@rpath/%s.dylib" % (name)],
)
native.apple_bundle(
name = name + "Framework",
@ -223,7 +225,7 @@ def framework_bundle_dependencies(names):
result = []
if native.read_config("custom", "mode") == "project":
for name in names:
result.append(name + "Framework")
#result.append(name + "#shared")
pass
else:
for name in names:

View File

@ -11,40 +11,40 @@
<string>46</string>
<key>objects</key>
<dict>
<key>1DD70E292187879500000000</key>
<key>1DD70E29DC16ED3D00000000</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>name</key>
<string>EmojiFramework#iphonesimulator-x86_64-Debug.xcconfig</string>
<string>EmojiFramework-Debug.xcconfig</string>
<key>path</key>
<string>../../buck-out/gen/submodules/Emoji/EmojiFramework#iphonesimulator-x86_64-Debug.xcconfig</string>
<string>../../buck-out/gen/submodules/Emoji/EmojiFramework-Debug.xcconfig</string>
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
<key>explicitFileType</key>
<string>text.xcconfig</string>
</dict>
<key>1DD70E29C2E68DBF00000000</key>
<key>1DD70E291733296700000000</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>name</key>
<string>EmojiFramework#iphonesimulator-x86_64-Profile.xcconfig</string>
<string>EmojiFramework-Profile.xcconfig</string>
<key>path</key>
<string>../../buck-out/gen/submodules/Emoji/EmojiFramework#iphonesimulator-x86_64-Profile.xcconfig</string>
<string>../../buck-out/gen/submodules/Emoji/EmojiFramework-Profile.xcconfig</string>
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
<key>explicitFileType</key>
<string>text.xcconfig</string>
</dict>
<key>1DD70E29367D392100000000</key>
<key>1DD70E298AC9D4C900000000</key>
<dict>
<key>isa</key>
<string>PBXFileReference</string>
<key>name</key>
<string>EmojiFramework#iphonesimulator-x86_64-Release.xcconfig</string>
<string>EmojiFramework-Release.xcconfig</string>
<key>path</key>
<string>../../buck-out/gen/submodules/Emoji/EmojiFramework#iphonesimulator-x86_64-Release.xcconfig</string>
<string>../../buck-out/gen/submodules/Emoji/EmojiFramework-Release.xcconfig</string>
<key>sourceTree</key>
<string>SOURCE_ROOT</string>
<key>explicitFileType</key>
@ -60,9 +60,9 @@
<string><![CDATA[<group>]]></string>
<key>children</key>
<array>
<string>1DD70E292187879500000000</string>
<string>1DD70E29C2E68DBF00000000</string>
<string>1DD70E29367D392100000000</string>
<string>1DD70E29DC16ED3D00000000</string>
<string>1DD70E291733296700000000</string>
<string>1DD70E298AC9D4C900000000</string>
</array>
</dict>
<key>B401C979B781F65D00000000</key>
@ -129,12 +129,12 @@
<string>1DD70E2906C06BEE00000000</string>
</array>
</dict>
<key>B401C97920924D2000000000</key>
<key>B401C97935694C7800000000</key>
<dict>
<key>isa</key>
<string>PBXGroup</string>
<key>name</key>
<string>EmojiFramework#iphonesimulator-x86_64</string>
<string>EmojiFramework</string>
<key>sourceTree</key>
<string><![CDATA[<group>]]></string>
<key>children</key>
@ -234,7 +234,7 @@
<key>children</key>
<array>
<string>B401C979B781F65D00000000</string>
<string>B401C97920924D2000000000</string>
<string>B401C97935694C7800000000</string>
<string>B401C97968022A5500000000</string>
<string>B401C979C806358400000000</string>
</array>
@ -297,7 +297,7 @@
<dict>
</dict>
<key>baseConfigurationReference</key>
<string>1DD70E292187879500000000</string>
<string>1DD70E29DC16ED3D00000000</string>
</dict>
<key>4952437350C7218900000000</key>
<dict>
@ -309,7 +309,7 @@
<dict>
</dict>
<key>baseConfigurationReference</key>
<string>1DD70E29C2E68DBF00000000</string>
<string>1DD70E291733296700000000</string>
</dict>
<key>49524373A439BFE700000000</key>
<dict>
@ -321,7 +321,7 @@
<dict>
</dict>
<key>baseConfigurationReference</key>
<string>1DD70E29367D392100000000</string>
<string>1DD70E298AC9D4C900000000</string>
</dict>
<key>218C37090000000000000000</key>
<dict>
@ -336,12 +336,12 @@
<key>defaultConfigurationIsVisible</key>
<false/>
</dict>
<key>E66DC04E20924D2000000000</key>
<key>E66DC04E35694C7800000000</key>
<dict>
<key>isa</key>
<string>PBXNativeTarget</string>
<key>name</key>
<string>EmojiFramework#iphonesimulator-x86_64</string>
<string>EmojiFramework</string>
<key>productName</key>
<string>EmojiFramework</string>
<key>productReference</key>
@ -410,7 +410,7 @@
<string>B401C979EFB6AC4600000000</string>
<key>targets</key>
<array>
<string>E66DC04E20924D2000000000</string>
<string>E66DC04E35694C7800000000</string>
</array>
<key>buildConfigurationList</key>
<string>218C37090000000000000001</string>

View File

@ -1,71 +1 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "9999"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E20924D2000000000"
BuildableName = "EmojiFramework.framework"
BlueprintName = "EmojiFramework#iphonesimulator-x86_64"
ReferencedContainer = "container:Emoji.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E20924D2000000000"
BuildableName = "EmojiFramework.framework"
BlueprintName = "EmojiFramework#iphonesimulator-x86_64"
ReferencedContainer = "container:Emoji.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
<?xml version="1.0" encoding="UTF-8" standalone="no"?><Scheme LastUpgradeVersion="9999" version="1.7"><BuildAction buildImplicitDependencies="YES" parallelizeBuildables="YES"><BuildActionEntries><BuildActionEntry buildForAnalyzing="YES" buildForArchiving="YES" buildForProfiling="YES" buildForRunning="YES" buildForTesting="YES"><BuildableReference BlueprintIdentifier="E66DC04E35694C7800000000" BlueprintName="EmojiFramework" BuildableIdentifier="primary" BuildableName="EmojiFramework.framework" ReferencedContainer="container:Emoji.xcodeproj"/></BuildActionEntry></BuildActionEntries></BuildAction><TestAction buildConfiguration="Debug" shouldUseLaunchSchemeArgsEnv="YES"><Testables/></TestAction><LaunchAction buildConfiguration="Debug"/><ProfileAction buildConfiguration="Release"/><AnalyzeAction buildConfiguration="Debug"/><ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"/></Scheme>