This commit is contained in:
Peter 2019-08-25 17:06:43 +04:00
parent 5e79d700cb
commit dcfb6ddd9c
6 changed files with 127 additions and 14 deletions

View File

@ -1 +1,85 @@
<?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="E66DC04E0001020100000000" BlueprintName="App" BuildableIdentifier="primary" BuildableName="App.app" ReferencedContainer="container:App.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></BuildActionEntries></BuildAction><TestAction buildConfiguration="Debug" shouldUseLaunchSchemeArgsEnv="YES"><Testables/></TestAction><LaunchAction buildConfiguration="Debug"/><ProfileAction buildConfiguration="Release"/><AnalyzeAction buildConfiguration="Debug"/><ArchiveAction buildConfiguration="Release" revealArchiveInOrganizer="YES"/></Scheme>
<?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 = "E66DC04E0001020100000000"
BuildableName = ".app"
BlueprintName = "App"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04EC43AA77A00000000"
BuildableName = "lib.a"
BlueprintName = "AppLibrary"
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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E0001020100000000"
BuildableName = ".app"
BlueprintName = "App"
ReferencedContainer = "container:App.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>

View File

@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E6969DF6200000000"
BuildableName = "libEmoji.dylib"
BuildableName = ".dylib"
BlueprintName = "Emoji#shared"
ReferencedContainer = "container:../submodules/Emoji/Emoji.xcodeproj">
</BuildableReference>
@ -29,7 +29,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04EB4B57B8200000000"
BuildableName = "libopenssl.a"
BuildableName = "lib.a"
BlueprintName = "openssl"
ReferencedContainer = "container:../submodules/MtProtoKit/MtProtoKit.xcodeproj">
</BuildableReference>
@ -43,7 +43,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E123A55F300000000"
BuildableName = "libMtProtoKit.dylib"
BuildableName = ".dylib"
BlueprintName = "MtProtoKit#shared"
ReferencedContainer = "container:../submodules/MtProtoKit/MtProtoKit.xcodeproj">
</BuildableReference>
@ -57,7 +57,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04EC43AA77A00000000"
BuildableName = "libAppLibrary.a"
BuildableName = "lib.a"
BlueprintName = "AppLibrary"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
@ -71,7 +71,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E0001020100000000"
BuildableName = "App.app"
BuildableName = ".app"
BlueprintName = "App"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
@ -103,7 +103,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E0001020100000000"
BuildableName = "App.app"
BuildableName = ".app"
BlueprintName = "App"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
@ -122,7 +122,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E0001020100000000"
BuildableName = "App.app"
BuildableName = ".app"
BlueprintName = "App"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>

View File

@ -9,7 +9,7 @@ public final class AppDelegate: NSObject, UIApplicationDelegate {
override init() {
super.init()
print("OK".isSingleEmoji)
print("OK6".isSingleEmoji)
}
public func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {

View File

@ -59,7 +59,6 @@ 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/lib%s.dylib" % (name)],
)
else:
@ -68,6 +67,7 @@ def apple_lib(
srcs = srcs,
header_namespace = name,
module_name = name,
soname = "lib" + name + ".dylib",
headers = headers,
exported_headers = exported_headers,
deps = deps,
@ -82,9 +82,17 @@ 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/lib%s.dylib" % (name)],
)
native.apple_bundle(
name = name + "Framework",
visibility = visibility,
binary = ":" + name + "#shared",
extension = "framework",
info_plist = "Info.plist",
info_plist_substitutions = info_plist_substitutions(name),
)
else:
native.apple_library(
name = name,
@ -92,6 +100,9 @@ def apple_lib(
headers = headers,
exported_headers = exported_headers,
deps = deps,
exported_deps = exported_deps,
extra_xcode_files = extra_xcode_files,
frameworks = frameworks,
visibility = visibility,
swift_version = swift_version,
configs = library_configs(),
@ -220,6 +231,6 @@ def framework_bundle_dependencies(names):
pass
else:
for name in names:
#result.append(name + "Framework")
result.append(name + "#shared")
pass
return result

18
get_dsym.sh Normal file
View File

@ -0,0 +1,18 @@
#!/bin/sh
rm -rf "DSYM-out"
mkdir -p "DSYM-out"
PLATFORM="iphonesimulator-x86_64"
for DEPENDENCY in $(buck query "kind('apple_library|apple_binary', deps('//App:App#$PLATFORM', 1))"); do
case "$DEPENDENCY" in
*"#"*)
;;
*)
DEPENDENCY="$DEPENDENCY#$PLATFORM"
;;
esac
DSYM_PATH="buck-out/gen/$(echo "$DEPENDENCY" | sed -e "s/#/#apple-dsym,/" | sed -e "s#^//##" | sed -e "s#:#/#").dSYM"
cp -f -r "$DSYM_PATH" "DSYM-out/"
done

View File

@ -15,7 +15,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E6969DF6200000000"
BuildableName = "libEmoji.dylib"
BuildableName = ".dylib"
BlueprintName = "Emoji#shared"
ReferencedContainer = "container:Emoji.xcodeproj">
</BuildableReference>
@ -46,7 +46,7 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E66DC04E6969DF6200000000"
BuildableName = "libEmoji.dylib"
BuildableName = ".dylib"
BlueprintName = "Emoji#shared"
ReferencedContainer = "container:Emoji.xcodeproj">
</BuildableReference>