From 4d98958b778ae4010ce938fa79f700d6a75a2722 Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Wed, 5 Aug 2020 14:44:34 +0200
Subject: [PATCH] iOS: Re-share workspace schemes and fix packaging

---
 .../contents.xcworkspacedata                  |  4 +-
 .../xcschemes/mozilla_voice_stt.xcscheme      | 77 +++++++++++++++++++
 .../xcschemes/mozilla_voice_stt_test.xcscheme |  0
 taskcluster/ios-package.sh                    |  6 +-
 4 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 native_client/swift/mozilla_voice_stt.xcworkspace/xcshareddata/xcschemes/mozilla_voice_stt.xcscheme
 rename native_client/swift/{mozilla_voice_stt_test.xcodeproj => mozilla_voice_stt.xcworkspace}/xcshareddata/xcschemes/mozilla_voice_stt_test.xcscheme (100%)

diff --git a/native_client/swift/mozilla_voice_stt.xcworkspace/contents.xcworkspacedata b/native_client/swift/mozilla_voice_stt.xcworkspace/contents.xcworkspacedata
index 7c634c62..06bf5ff9 100644
--- a/native_client/swift/mozilla_voice_stt.xcworkspace/contents.xcworkspacedata
+++ b/native_client/swift/mozilla_voice_stt.xcworkspace/contents.xcworkspacedata
@@ -2,9 +2,9 @@
 <Workspace
    version = "1.0">
    <FileRef
-      location = "group:/Users/reubenmorais/Development/DeepSpeech/native_client/swift/mozilla_voice_stt.xcodeproj">
+      location = "group:mozilla_voice_stt.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:/Users/reubenmorais/Development/DeepSpeech/native_client/swift/mozilla_voice_stt_test.xcodeproj">
+      location = "group:mozilla_voice_stt_test.xcodeproj">
    </FileRef>
 </Workspace>
diff --git a/native_client/swift/mozilla_voice_stt.xcworkspace/xcshareddata/xcschemes/mozilla_voice_stt.xcscheme b/native_client/swift/mozilla_voice_stt.xcworkspace/xcshareddata/xcschemes/mozilla_voice_stt.xcscheme
new file mode 100644
index 00000000..ba254547
--- /dev/null
+++ b/native_client/swift/mozilla_voice_stt.xcworkspace/xcshareddata/xcschemes/mozilla_voice_stt.xcscheme
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1160"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "505B136024960D550007DADA"
+               BuildableName = "mozilla_voice_stt.framework"
+               BlueprintName = "mozilla_voice_stt"
+               ReferencedContainer = "container:mozilla_voice_stt.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "505B136924960D550007DADA"
+               BuildableName = "mozilla_voice_sttTests.xctest"
+               BlueprintName = "mozilla_voice_sttTests"
+               ReferencedContainer = "container:mozilla_voice_stt.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </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">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "505B136024960D550007DADA"
+            BuildableName = "mozilla_voice_stt.framework"
+            BlueprintName = "mozilla_voice_stt"
+            ReferencedContainer = "container:mozilla_voice_stt.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/native_client/swift/mozilla_voice_stt_test.xcodeproj/xcshareddata/xcschemes/mozilla_voice_stt_test.xcscheme b/native_client/swift/mozilla_voice_stt.xcworkspace/xcshareddata/xcschemes/mozilla_voice_stt_test.xcscheme
similarity index 100%
rename from native_client/swift/mozilla_voice_stt_test.xcodeproj/xcshareddata/xcschemes/mozilla_voice_stt_test.xcscheme
rename to native_client/swift/mozilla_voice_stt.xcworkspace/xcshareddata/xcschemes/mozilla_voice_stt_test.xcscheme
diff --git a/taskcluster/ios-package.sh b/taskcluster/ios-package.sh
index d46e3ceb..14803155 100755
--- a/taskcluster/ios-package.sh
+++ b/taskcluster/ios-package.sh
@@ -17,14 +17,14 @@ package_libdeepspeech_as_zip "libmozilla_voice_stt.zip"
 case $arch in
 "--x86_64")
   release_folder="Release-iphonesimulator"
-  artifact_name="deepspeech_ios.framework.x86_64.tar.xz"
+  artifact_name="mozilla_voice_stt.framework.x86_64.tar.xz"
   ;;
 "--arm64")
   release_folder="Release-iphoneos"
-  artifact_name="deepspeech_ios.framework.arm64.tar.xz"
+  artifact_name="mozilla_voice_stt.framework.arm64.tar.xz"
 ;;
 esac
 
 ${TAR} -cf - \
-       -C ${DS_ROOT_TASK}/DeepSpeech/ds/native_client/swift/DerivedData/Build/Products/${release_folder}/ deepspeech_ios.framework \
+       -C ${DS_ROOT_TASK}/DeepSpeech/ds/native_client/swift/DerivedData/Build/Products/${release_folder}/ mozilla_voice_stt.framework \
        | ${XZ} > "${TASKCLUSTER_ARTIFACTS}/${artifact_name}"
\ No newline at end of file