Skip to content

Commit

Permalink
Updated Xcode project, added sleep command
Browse files Browse the repository at this point in the history
  • Loading branch information
@N-Holzschuch
N-Holzschuch committed Dec 30, 2020
1 parent 30e072a commit e340465
Show file tree
Hide file tree
Showing 11 changed files with 570 additions and 301 deletions.
7 changes: 7 additions & 0 deletions Resources/commandDictionary.plist
View file
Expand Up @@ -821,5 +821,12 @@
<string></string>
<string>file</string>
</array>
<key>sleep</key>
<array>
<string>shell.framework/shell</string>
<string>sleep_main</string>
<string></string>
<string>none</string>
</array>
</dict>
</plist>
7 changes: 7 additions & 0 deletions Resources_mini/commandDictionary.plist
View file
Expand Up @@ -716,5 +716,12 @@
<string></string>
<string>file</string>
</array>
<key>sleep</key>
<array>
<string>shell.framework/shell</string>
<string>sleep_main</string>
<string></string>
<string>none</string>
</array>
</dict>
</plist>
603 changes: 313 additions & 290 deletions a-Shell.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

15 changes: 12 additions & 3 deletions a-Shell.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Expand Up @@ -10,12 +10,21 @@
"version": null
}
},
{
"package": "ImageMagick",
"repositoryURL": "https://github.com/holzschu/ImageMagick.git",
"state": {
"branch": "master",
"revision": "8a93ef53e0d91a9ea24aa743fa2f47b6492d5b16",
"version": null
}
},
{
"package": "ios_system",
"repositoryURL": "https://github.com/holzschu/ios_system.git",
"state": {
"branch": "master",
"revision": "d46917950b625264f590d312bdb3ca71ca032d71",
"revision": "8955eab3ace5cd42614ff1e1f0d4de133e62036f",
"version": null
}
},
Expand Down Expand Up @@ -51,7 +60,7 @@
"repositoryURL": "https://github.com/holzschu/lua_ios.git",
"state": {
"branch": "master",
"revision": "ffca90f3a2fbc712ced5db851e79f7a41fb38a6f",
"revision": "07c2fa4f653816998df8fddef45dcfc62b4e4dfb",
"version": null
}
},
Expand All @@ -60,7 +69,7 @@
"repositoryURL": "https://github.com/holzschu/network_ios.git",
"state": {
"branch": "master",
"revision": "70ca050e69b4ca84eedd2fe9658529ec29a9630c",
"revision": "7323059e065f4449fca9dc1fd5d52d0e0c5afadc",
"version": null
}
},
Expand Down
Binary file modified ...deproj/project.xcworkspace/xcuserdata/holzschu.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
1 change: 1 addition & 0 deletions a-Shell.xcodeproj/xcshareddata/xcschemes/a-Shell.xcscheme
View file
Expand Up @@ -41,6 +41,7 @@
debugDocumentVersioning = "YES"
debugXPCServices = "NO"
debugServiceExtension = "internal"
enableGPUValidationMode = "1"
allowLocationSimulation = "NO"
viewDebuggingEnabled = "No"
queueDebuggingEnabled = "No"
Expand Down
192 changes: 192 additions & 0 deletions a-Shell.xcodeproj/xcuserdata/holzschu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file
Expand Up @@ -165,5 +165,197 @@
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "AFA4F913-2FCB-48B2-ADF1-9D5A217A9D20"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "a-Shell/AppDelegate.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "356"
endingLineNumber = "356"
landmarkName = "applicationWillTerminate(_:)"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "64847E49-58D2-4E02-B339-4B3FD05E9D86"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../ios_system/ios_system.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "2086"
endingLineNumber = "2086"
landmarkName = "ios_system(inputCmd)"
landmarkType = "9">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "BAE9F2B7-4061-4EB4-86A6-3BF8C5C28EB1"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../llvm/lib/Support/raw_ostream.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "641"
endingLineNumber = "641"
landmarkName = "raw_fd_ostream::~raw_fd_ostream()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "2F890395-537A-45C3-B3C6-9A792AEFE693"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../llvm/lib/Support/raw_ostream.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "623"
endingLineNumber = "623"
landmarkName = "raw_fd_ostream::~raw_fd_ostream()"
landmarkType = "7">
<Locations>
<Location
uuid = "2F890395-537A-45C3-B3C6-9A792AEFE693 - d0f14fbaab147da9"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "llvm::raw_fd_ostream::~raw_fd_ostream()"
moduleName = "libLLVM"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/holzschu/src/Xcode_iPad/llvm/lib/Support/raw_ostream.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "623"
endingLineNumber = "623"
offsetFromSymbolStart = "80">
</Location>
<Location
uuid = "2F890395-537A-45C3-B3C6-9A792AEFE693 - d0f14fbaab147da9"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "llvm::raw_fd_ostream::~raw_fd_ostream()"
moduleName = "libLLVM"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/holzschu/src/Xcode_iPad/llvm/lib/Support/raw_ostream.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "623"
endingLineNumber = "623"
offsetFromSymbolStart = "88">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "4BDB9850-AA35-4A1F-A529-DDC0156EA0E9"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../llvm/lib/Support/CommandLine.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "317"
endingLineNumber = "317"
landmarkName = "hasOptions()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "7BD4DD19-ED08-476E-9E4A-5E8CFFA9DF6F"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../llvm/lib/Support/CommandLine.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "316"
endingLineNumber = "316"
landmarkName = "hasOptions()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "9BAF1177-917B-46E3-BA02-BFA254349CD0"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../llvm/lib/Support/CommandLine.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1255"
endingLineNumber = "1255"
landmarkName = "CommandLineParser::ResetAllOptionOccurrences()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "F7A74137-EC7F-4249-B2F5-32FFE74C0171"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../llvm/lib/Support/CommandLine.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "394"
endingLineNumber = "394"
landmarkName = "reset()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B24ED121-14B6-4188-AE09-810543B744B6"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../llvm/lib/Support/CommandLine.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "2496"
endingLineNumber = "2496"
landmarkName = "cl::ResetCommandLineParser()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "7A1F85F9-EAC5-4479-8C95-9E34BCEA18F7"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "../llvm/lib/Support/CommandLine.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "2499"
endingLineNumber = "2499"
landmarkName = "cl::ResetAllOptionOccurrences()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
25 changes: 25 additions & 0 deletions a-Shell.xcodeproj/xcuserdata/holzschu.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Expand Up @@ -4,6 +4,16 @@
<dict>
<key>SchemeUserState</key>
<dict>
<key>a-Shell copy.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>a-Shell mini.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>a-Shell-Intents.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
Expand All @@ -14,6 +24,16 @@
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>a-Shell-mini-Intents.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>a-Shell-mini-IntentsUI.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>a-Shell.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
Expand All @@ -27,6 +47,11 @@
<key>primary</key>
<true/>
</dict>
<key>229D2471257931E4004A78AC</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
4 changes: 2 additions & 2 deletions a-Shell/AppDelegate+TeX.swift
View file
Expand Up @@ -267,7 +267,7 @@ extension AppDelegate {
}

func disableTeX() {
if (appVersion == "a-Shell mini") {
if (appVersion == "a-Shell-mini") {
return
}
// return ; // for debugging TeX
Expand Down Expand Up @@ -395,7 +395,7 @@ extension AppDelegate {
}

func disableOpentype() {
if (appVersion == "a-Shell mini") {
if (appVersion == "a-Shell-mini") {
return
}
// return ; // for debugging TeX
Expand Down
10 changes: 5 additions & 5 deletions a-Shell/AppDelegate.swift
View file
Expand Up @@ -29,7 +29,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var libraryFilesUpToDate = true
let moveFilesQueue = DispatchQueue(label: "moveFiles", qos: .utility) // low priority

// Which version of the app are we running? a-Shell, a-Shell mini, a-Shell pro...?
// Which version of the app are we running? a-Shell, a-Shell-mini, a-Shell-pro...? (no spaces in name)
var appVersion: String? {
// Bundle.main.infoDictionary?["CFBundleDisplayName"] = a-Shell
// Bundle.main.infoDictionary?["CFBundleIdentifier"] = AsheKube.a-Shell
Expand Down Expand Up @@ -236,7 +236,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// Override point for customization after application launch.
NSLog("Application didFinishLaunchingWithOptions \(launchOptions)")
// Store variables in User Defaults:
if (appVersion != "a-Shell mini") {
if (appVersion != "a-Shell-mini") {
UserDefaults.standard.register(defaults: ["TeXEnabled" : false])
UserDefaults.standard.register(defaults: ["TeXOpenType" : false])
}
Expand All @@ -260,7 +260,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// for debugging TeX issues:
// addCommandList(Bundle.main.path(forResource: "texCommandsDictionary", ofType: "plist"))
// addCommandList(Bundle.main.path(forResource: "luatexCommandsDictionary", ofType: "plist"))
if (appVersion != "a-Shell mini") {
if (appVersion != "a-Shell-mini") {
activateFakeTeXCommands()
if (UserDefaults.standard.bool(forKey: "TeXEnabled")) {
downloadTeX();
Expand Down Expand Up @@ -293,7 +293,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
create: true)
// Do we have the wasi C SDK in place?
versionUpToDate = !versionNumberIncreased()
if (appVersion != "a-Shell mini") {
if (appVersion != "a-Shell-mini") {
if (!versionUpToDate || needToUpdateCFiles()) {
createCSDK()
}
Expand Down Expand Up @@ -431,7 +431,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
@objc func settingsChanged() {
// UserDefaults.didChangeNotification is called every time the window becomes active
// We only act if things have really changed.
if (appVersion != "a-Shell mini") {
if (appVersion != "a-Shell-mini") {
// Don't look at TeX settings if running a-Shell mini
let userSettingsTeX = UserDefaults.standard.bool(forKey: "TeXEnabled")
// something changed with TeX settings
Expand Down

0 comments on commit e340465

Please sign in to comment.