From 8c93d1e5d1b0c2f0e2ab3c6578d24234d672a087 Mon Sep 17 00:00:00 2001 From: Kilian Hofmann Date: Wed, 21 Jun 2017 23:56:10 +0200 Subject: [PATCH] Converter clean not document based --- Converter/AppDelegate.swift | 9 +- Converter/Base.lproj/Main.storyboard | 686 +++++++++++++++--- Converter/Document.swift | 71 -- Converter/Info.plist | 21 - Converter/ViewController.swift | 105 +-- Docsis Toolkit.xcodeproj/project.pbxproj | 231 +++--- .../xcschemes/xcschememanagement.plist | 5 + 7 files changed, 706 insertions(+), 422 deletions(-) delete mode 100644 Converter/Document.swift diff --git a/Converter/AppDelegate.swift b/Converter/AppDelegate.swift index c570244..b94ce1f 100644 --- a/Converter/AppDelegate.swift +++ b/Converter/AppDelegate.swift @@ -2,7 +2,7 @@ // AppDelegate.swift // Converter // -// Created by Kilian Hofmann on 20.06.17. +// Created by Kilian Hofmann on 21.06.17. // Copyright © 2017 Kilian Hofmann. All rights reserved. // @@ -11,7 +11,7 @@ import Cocoa @NSApplicationMain class AppDelegate: NSObject, NSApplicationDelegate { - var isConverting: Bool = false + func applicationDidFinishLaunching(_ aNotification: Notification) { // Insert code here to initialize your application @@ -21,9 +21,6 @@ class AppDelegate: NSObject, NSApplicationDelegate { // Insert code here to tear down your application } - func applicationShouldTerminate(_ sender: NSApplication) -> NSApplicationTerminateReply { - guard isConverting else { return NSApplicationTerminateReply.terminateNow } - return NSApplicationTerminateReply.terminateCancel - } + } diff --git a/Converter/Base.lproj/Main.storyboard b/Converter/Base.lproj/Main.storyboard index 9e5a625..0d6bd6a 100644 --- a/Converter/Base.lproj/Main.storyboard +++ b/Converter/Base.lproj/Main.storyboard @@ -1,9 +1,7 @@ - - + + - - - + @@ -23,6 +21,13 @@ + + + + + + + @@ -53,11 +58,555 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -86,13 +635,25 @@ + + + + + + + + + + + + - + @@ -100,126 +661,33 @@ - - - + + + - + - + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + diff --git a/Converter/Document.swift b/Converter/Document.swift deleted file mode 100644 index 78a15ae..0000000 --- a/Converter/Document.swift +++ /dev/null @@ -1,71 +0,0 @@ -// -// Document.swift -// Converter -// -// Created by Kilian Hofmann on 20.06.17. -// Copyright © 2017 Kilian Hofmann. All rights reserved. -// - -import Cocoa - -class Document: NSDocument { - - var file: FileWrapper! - - override class func autosavesInPlace() -> Bool { - return false - } - - override func makeWindowControllers() { - // Returns the Storyboard that contains your Document window. - let storyboard = NSStoryboard(name: "Main", bundle: nil) - let windowController = storyboard.instantiateController(withIdentifier: "Document Window Controller") as! NSWindowController - self.addWindowController(windowController) - windowController.window?.delegate = self - - var Files: [String : [String : FileWrapper]] = [:] - - var months: Int = (file.fileWrappers?.count)! - if (file.fileWrappers?.contains(where: {$0.0 == ".DS_Store" }))! { - months -= 1 - } - (windowControllers.first?.contentViewController as! ViewController).months.stringValue = "\(months)" - var days: Int = 0 - var files: Int = 0 - for months in file.fileWrappers! { - guard months.value.isDirectory else { continue } - days += (months.value.fileWrappers?.count)! - if (months.value.fileWrappers?.contains(where: {$0.0 == ".DS_Store" }))! { - days -= 1 - } - for days in months.value.fileWrappers! { - guard days.value.isDirectory else { continue } - files += (days.value.fileWrappers?.count)! - if (days.value.fileWrappers?.contains(where: {$0.0 == ".DS_Store" }))! { - files -= 1 - } - if (days.value.fileWrappers?.contains(where: {$0.0 == "Content.plist" }))! { - files -= 1 - } - Files[months.key] = (months.value.fileWrappers!) - } - } - (windowControllers.first?.contentViewController as! ViewController).days.stringValue = "\(days)" - (windowControllers.first?.contentViewController as! ViewController).files.stringValue = "\(files)" - (windowControllers.first?.contentViewController as! ViewController).fileWrappers = Files - (windowControllers.first?.contentViewController as! ViewController).filesTotal = files -} - - override func read(from fileWrapper: FileWrapper, ofType typeName: String) throws { - file = fileWrapper - } -} - -extension Document: NSWindowDelegate { - - func windowShouldClose(_ sender: Any) -> Bool { - guard (NSApp.delegate as! AppDelegate).isConverting else { return true } - return false - } -} - diff --git a/Converter/Info.plist b/Converter/Info.plist index fb40b76..2153aed 100644 --- a/Converter/Info.plist +++ b/Converter/Info.plist @@ -4,27 +4,6 @@ CFBundleDevelopmentRegion en - CFBundleDocumentTypes - - - CFBundleTypeExtensions - - docsisplist2 - - CFBundleTypeIconFile - - CFBundleTypeName - DocumentType - CFBundleTypeOSTypes - - ???? - - CFBundleTypeRole - Viewer - NSDocumentClass - $(PRODUCT_MODULE_NAME).Document - - CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIconFile diff --git a/Converter/ViewController.swift b/Converter/ViewController.swift index b8e61f6..24221e5 100644 --- a/Converter/ViewController.swift +++ b/Converter/ViewController.swift @@ -2,113 +2,26 @@ // ViewController.swift // Converter // -// Created by Kilian Hofmann on 20.06.17. +// Created by Kilian Hofmann on 21.06.17. // Copyright © 2017 Kilian Hofmann. All rights reserved. // import Cocoa class ViewController: NSViewController { - - @IBOutlet var months: NSTextField! - @IBOutlet var days: NSTextField! - @IBOutlet var files: NSTextField! - @IBOutlet var progress: NSTextField! - @IBOutlet var convert: NSButton! - @IBOutlet var inPath: NSTextField! - - var fileWrappers: [String : [String : FileWrapper]]! - var filesDone: Int = 0 - var filesTotal: Int = 0 - + override func viewDidLoad() { super.viewDidLoad() - + // Do any additional setup after loading the view. } - - @IBAction func convert(sender: NSButton) { - convert.isEnabled = false - (NSApp.delegate as! AppDelegate).isConverting = true - progress.stringValue = "File \(self.filesDone) of \(self.filesTotal)" - - let opQueue: OperationQueue = OperationQueue() - let fileQueue: OperationQueue = OperationQueue() - fileQueue.maxConcurrentOperationCount = 4 - - let myActivity = ProcessInfo.processInfo.beginActivity(options: .userInitiated, reason: "Converting") - opQueue.addOperation { - defer { - fileQueue.waitUntilAllOperationsAreFinished() - ProcessInfo.processInfo.endActivity(myActivity) - OperationQueue.main.addOperation { - self.convert.isEnabled = true - (NSApp.delegate as! AppDelegate).isConverting = false - } - } - - let inP: String = self.inPath.stringValue - - for month in 1...12 { - for day in 1...31 { - let path: String = inP + String(format: "/%02d", month) + String(format: "/%02d", day) - do { - let directory = try FileWrapper(url: URL(fileURLWithPath: path), options: .immediate) - for file in directory.fileWrappers! { - if file.key == "KDLog.txt" { - let pathOut = path.appending("/" + file.key.replacingOccurrences(of: ".txt", with: ".hex")).replacingOccurrences(of: ".docsisplist2", with: "C.docsisplist2") - //print(path.appending(file.key) + " to " + pathOut) - self.makeSubDir(path: pathOut.replacingOccurrences(of: file.key.replacingOccurrences(of: ".txt", with: ".hex"), with: "")) - FileOperations.convertLoss(log: path.appending("/" + file.key), toFile: pathOut) - OperationQueue.main.addOperation { - self.filesDone += 1 - self.progress.stringValue = "File \(self.filesDone) of \(self.filesTotal)" - } - } else if file.key.contains("Upstream") { - let pathOut = path.appending("/" + file.key.replacingOccurrences(of: ".csv", with: ".hex")).replacingOccurrences(of: ".docsisplist2", with: "C.docsisplist2") - //print(path.appending(file.key) + " to " + pathOut) - self.makeSubDir(path: pathOut.replacingOccurrences(of: file.key.replacingOccurrences(of: ".csv", with: ".hex"), with: "")) - FileOperations.convertUpstream(log: path.appending("/" + file.key), toFile: pathOut) - OperationQueue.main.addOperation { - self.filesDone += 1 - self.progress.stringValue = "File \(self.filesDone) of \(self.filesTotal)" - } - } else if file.key.contains("Downstream") { - let pathOut = path.appending("/" + file.key.replacingOccurrences(of: ".csv", with: ".hex")).replacingOccurrences(of: ".docsisplist2", with: "C.docsisplist2") - //print(path.appending(file.key) + " to " + pathOut) - self.makeSubDir(path: pathOut.replacingOccurrences(of: file.key.replacingOccurrences(of: ".csv", with: ".hex"), with: "")) - FileOperations.convertDownstream(log: path.appending("/" + file.key), toFile: pathOut) - OperationQueue.main.addOperation { - self.filesDone += 1 - self.progress.stringValue = "File \(self.filesDone) of \(self.filesTotal)" - } - } - } - } catch _ { continue } - } - } - } - } - - func makeSubDir(path: String) { - // Check if directory exists, create or exit - let fileManager = FileManager.default - var directory: ObjCBool = ObjCBool(false) - let exists: Bool = fileManager.fileExists(atPath: (path as NSString).expandingTildeInPath, isDirectory: &directory) - if exists && directory.boolValue { - } else if exists { - NSLog("FILE WITH NAME KDLog EXISTS, REMOVE IT") - exit(1); - } - else { - do { - try fileManager.createDirectory(atPath: (path as NSString).expandingTildeInPath, withIntermediateDirectories: true, attributes: nil) - } - catch let error as NSError { - NSLog("ERROR ON DIRECTORY CREATION: \(error.localizedDescription)") - exit(1); - } + + override var representedObject: Any? { + didSet { + // Update the view, if already loaded. } } + + } diff --git a/Docsis Toolkit.xcodeproj/project.pbxproj b/Docsis Toolkit.xcodeproj/project.pbxproj index 28a23a2..9ae82ed 100644 --- a/Docsis Toolkit.xcodeproj/project.pbxproj +++ b/Docsis Toolkit.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + E220BF9F1EFB22D400DF5A97 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E220BF9E1EFB22D400DF5A97 /* AppDelegate.swift */; }; + E220BFA11EFB22D400DF5A97 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E220BFA01EFB22D400DF5A97 /* ViewController.swift */; }; + E220BFA31EFB22D400DF5A97 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E220BFA21EFB22D400DF5A97 /* Assets.xcassets */; }; + E220BFA61EFB22D400DF5A97 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E220BFA41EFB22D400DF5A97 /* Main.storyboard */; }; E2218C9B1EF2D345004298F6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2218C9A1EF2D345004298F6 /* AppDelegate.swift */; }; E2218CA91EF2D37B004298F6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2218CA81EF2D37B004298F6 /* Assets.xcassets */; }; E2218CDE1EF2D461004298F6 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E2218CDC1EF2D461004298F6 /* MainMenu.xib */; }; @@ -44,12 +48,6 @@ E26246491EF6688400EAA4A6 /* PDFItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E26246481EF6688400EAA4A6 /* PDFItemViewController.swift */; }; E27A9DB51EF995C1000BC7A3 /* FrequencyGraph.swift in Sources */ = {isa = PBXBuildFile; fileRef = E27A9DB41EF995C1000BC7A3 /* FrequencyGraph.swift */; }; E27A9DB91EF99C20000BC7A3 /* FlippedView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E27A9DB81EF99C20000BC7A3 /* FlippedView.swift */; }; - E27A9DC11EF9B7FD000BC7A3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E27A9DC01EF9B7FD000BC7A3 /* AppDelegate.swift */; }; - E27A9DC31EF9B7FD000BC7A3 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E27A9DC21EF9B7FD000BC7A3 /* ViewController.swift */; }; - E27A9DC51EF9B7FD000BC7A3 /* Document.swift in Sources */ = {isa = PBXBuildFile; fileRef = E27A9DC41EF9B7FD000BC7A3 /* Document.swift */; }; - E27A9DC71EF9B7FD000BC7A3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E27A9DC61EF9B7FD000BC7A3 /* Assets.xcassets */; }; - E27A9DCA1EF9B7FD000BC7A3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E27A9DC81EF9B7FD000BC7A3 /* Main.storyboard */; }; - E27A9DCF1EF9D0E3000BC7A3 /* FileOperations.swift in Sources */ = {isa = PBXBuildFile; fileRef = E23E2C611EF7FE530009D376 /* FileOperations.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -70,6 +68,12 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + E220BF9C1EFB22D400DF5A97 /* Converter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Converter.app; sourceTree = BUILT_PRODUCTS_DIR; }; + E220BF9E1EFB22D400DF5A97 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + E220BFA01EFB22D400DF5A97 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + E220BFA21EFB22D400DF5A97 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + E220BFA51EFB22D400DF5A97 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + E220BFA71EFB22D500DF5A97 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E2218C981EF2D345004298F6 /* Logger4.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Logger4.app; sourceTree = BUILT_PRODUCTS_DIR; }; E2218C9A1EF2D345004298F6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; E2218CA31EF2D345004298F6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -115,16 +119,16 @@ E26246481EF6688400EAA4A6 /* PDFItemViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PDFItemViewController.swift; sourceTree = ""; }; E27A9DB41EF995C1000BC7A3 /* FrequencyGraph.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FrequencyGraph.swift; sourceTree = ""; }; E27A9DB81EF99C20000BC7A3 /* FlippedView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlippedView.swift; sourceTree = ""; }; - E27A9DBE1EF9B7FD000BC7A3 /* Converter.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Converter.app; sourceTree = BUILT_PRODUCTS_DIR; }; - E27A9DC01EF9B7FD000BC7A3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - E27A9DC21EF9B7FD000BC7A3 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - E27A9DC41EF9B7FD000BC7A3 /* Document.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Document.swift; sourceTree = ""; }; - E27A9DC61EF9B7FD000BC7A3 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - E27A9DC91EF9B7FD000BC7A3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - E27A9DCB1EF9B7FD000BC7A3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + E220BF991EFB22D400DF5A97 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; E2218C951EF2D345004298F6 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -140,23 +144,28 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - E27A9DBB1EF9B7FD000BC7A3 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + E220BF9D1EFB22D400DF5A97 /* Converter */ = { + isa = PBXGroup; + children = ( + E220BF9E1EFB22D400DF5A97 /* AppDelegate.swift */, + E220BFA01EFB22D400DF5A97 /* ViewController.swift */, + E220BFA21EFB22D400DF5A97 /* Assets.xcassets */, + E220BFA41EFB22D400DF5A97 /* Main.storyboard */, + E220BFA71EFB22D500DF5A97 /* Info.plist */, + ); + path = Converter; + sourceTree = ""; + }; E2218C791EF2D2B5004298F6 = { isa = PBXGroup; children = ( E2218CA71EF2D35B004298F6 /* Shared Resources */, E2218C991EF2D345004298F6 /* Logger4 */, E2218D2A1EF3271F004298F6 /* Graphic Analysis 2 */, - E27A9DBF1EF9B7FD000BC7A3 /* Converter */, + E220BF9D1EFB22D400DF5A97 /* Converter */, E2218C831EF2D2B5004298F6 /* Products */, E2218D651EF463B4004298F6 /* Frameworks */, ); @@ -167,7 +176,7 @@ children = ( E2218C981EF2D345004298F6 /* Logger4.app */, E2218D291EF3271F004298F6 /* Graphic Analysis 2.app */, - E27A9DBE1EF9B7FD000BC7A3 /* Converter.app */, + E220BF9C1EFB22D400DF5A97 /* Converter.app */, ); name = Products; sourceTree = ""; @@ -420,19 +429,6 @@ name = Swift; sourceTree = ""; }; - E27A9DBF1EF9B7FD000BC7A3 /* Converter */ = { - isa = PBXGroup; - children = ( - E27A9DC01EF9B7FD000BC7A3 /* AppDelegate.swift */, - E27A9DC21EF9B7FD000BC7A3 /* ViewController.swift */, - E27A9DC41EF9B7FD000BC7A3 /* Document.swift */, - E27A9DC61EF9B7FD000BC7A3 /* Assets.xcassets */, - E27A9DC81EF9B7FD000BC7A3 /* Main.storyboard */, - E27A9DCB1EF9B7FD000BC7A3 /* Info.plist */, - ); - path = Converter; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXLegacyTarget section */ @@ -467,6 +463,23 @@ /* End PBXLegacyTarget section */ /* Begin PBXNativeTarget section */ + E220BF9B1EFB22D400DF5A97 /* Converter */ = { + isa = PBXNativeTarget; + buildConfigurationList = E220BFA81EFB22D500DF5A97 /* Build configuration list for PBXNativeTarget "Converter" */; + buildPhases = ( + E220BF981EFB22D400DF5A97 /* Sources */, + E220BF991EFB22D400DF5A97 /* Frameworks */, + E220BF9A1EFB22D400DF5A97 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Converter; + productName = Converter; + productReference = E220BF9C1EFB22D400DF5A97 /* Converter.app */; + productType = "com.apple.product-type.application"; + }; E2218C971EF2D345004298F6 /* Logger4 */ = { isa = PBXNativeTarget; buildConfigurationList = E2218CA41EF2D345004298F6 /* Build configuration list for PBXNativeTarget "Logger4" */; @@ -503,23 +516,6 @@ productReference = E2218D291EF3271F004298F6 /* Graphic Analysis 2.app */; productType = "com.apple.product-type.application"; }; - E27A9DBD1EF9B7FD000BC7A3 /* Converter */ = { - isa = PBXNativeTarget; - buildConfigurationList = E27A9DCC1EF9B7FD000BC7A3 /* Build configuration list for PBXNativeTarget "Converter" */; - buildPhases = ( - E27A9DBA1EF9B7FD000BC7A3 /* Sources */, - E27A9DBB1EF9B7FD000BC7A3 /* Frameworks */, - E27A9DBC1EF9B7FD000BC7A3 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Converter; - productName = Converter; - productReference = E27A9DBE1EF9B7FD000BC7A3 /* Converter.app */; - productType = "com.apple.product-type.application"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -530,6 +526,11 @@ LastUpgradeCheck = 0830; ORGANIZATIONNAME = "Kilian Hofmann"; TargetAttributes = { + E220BF9B1EFB22D400DF5A97 = { + CreatedOnToolsVersion = 8.3.3; + DevelopmentTeam = 795KPDV76S; + ProvisioningStyle = Automatic; + }; E2218C971EF2D345004298F6 = { CreatedOnToolsVersion = 8.3.3; DevelopmentTeam = 795KPDV76S; @@ -551,11 +552,6 @@ DevelopmentTeam = 795KPDV76S; ProvisioningStyle = Automatic; }; - E27A9DBD1EF9B7FD000BC7A3 = { - CreatedOnToolsVersion = 8.3.3; - DevelopmentTeam = 795KPDV76S; - ProvisioningStyle = Automatic; - }; }; }; buildConfigurationList = E2218C7D1EF2D2B5004298F6 /* Build configuration list for PBXProject "Docsis Toolkit" */; @@ -575,12 +571,21 @@ E2218CE51EF2D577004298F6 /* Bump Logger4 */, E2218D281EF3271F004298F6 /* Graphic Analysis 2 */, E2218D3D1EF32803004298F6 /* Bump Graphic Analysis 2 */, - E27A9DBD1EF9B7FD000BC7A3 /* Converter */, + E220BF9B1EFB22D400DF5A97 /* Converter */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ + E220BF9A1EFB22D400DF5A97 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E220BFA31EFB22D400DF5A97 /* Assets.xcassets in Resources */, + E220BFA61EFB22D400DF5A97 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; E2218C961EF2D345004298F6 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -609,18 +614,18 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - E27A9DBC1EF9B7FD000BC7A3 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E27A9DC71EF9B7FD000BC7A3 /* Assets.xcassets in Resources */, - E27A9DCA1EF9B7FD000BC7A3 /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + E220BF981EFB22D400DF5A97 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + E220BFA11EFB22D400DF5A97 /* ViewController.swift in Sources */, + E220BF9F1EFB22D400DF5A97 /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; E2218C941EF2D345004298F6 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -657,17 +662,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - E27A9DBA1EF9B7FD000BC7A3 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - E27A9DCF1EF9D0E3000BC7A3 /* FileOperations.swift in Sources */, - E27A9DC31EF9B7FD000BC7A3 /* ViewController.swift in Sources */, - E27A9DC11EF9B7FD000BC7A3 /* AppDelegate.swift in Sources */, - E27A9DC51EF9B7FD000BC7A3 /* Document.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -684,10 +678,10 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - E27A9DC81EF9B7FD000BC7A3 /* Main.storyboard */ = { + E220BFA41EFB22D400DF5A97 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( - E27A9DC91EF9B7FD000BC7A3 /* Base */, + E220BFA51EFB22D400DF5A97 /* Base */, ); name = Main.storyboard; sourceTree = ""; @@ -695,6 +689,36 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + E220BFA91EFB22D500DF5A97 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = 795KPDV76S; + INFOPLIST_FILE = Converter/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.12; + PRODUCT_BUNDLE_IDENTIFIER = com.weebly.alikja.Converter; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 3.0; + }; + name = Debug; + }; + E220BFAA1EFB22D500DF5A97 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = 795KPDV76S; + INFOPLIST_FILE = Converter/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.12; + PRODUCT_BUNDLE_IDENTIFIER = com.weebly.alikja.Converter; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 3.0; + }; + name = Release; + }; E2218C8F1EF2D2B5004298F6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -911,39 +935,17 @@ }; name = Release; }; - E27A9DCD1EF9B7FD000BC7A3 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 795KPDV76S; - INFOPLIST_FILE = Converter/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.12; - PRODUCT_BUNDLE_IDENTIFIER = com.weebly.alikja.Converter; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; - }; - name = Debug; - }; - E27A9DCE1EF9B7FD000BC7A3 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 795KPDV76S; - INFOPLIST_FILE = Converter/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.12; - PRODUCT_BUNDLE_IDENTIFIER = com.weebly.alikja.Converter; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + E220BFA81EFB22D500DF5A97 /* Build configuration list for PBXNativeTarget "Converter" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E220BFA91EFB22D500DF5A97 /* Debug */, + E220BFAA1EFB22D500DF5A97 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; E2218C7D1EF2D2B5004298F6 /* Build configuration list for PBXProject "Docsis Toolkit" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -989,15 +991,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E27A9DCC1EF9B7FD000BC7A3 /* Build configuration list for PBXNativeTarget "Converter" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E27A9DCD1EF9B7FD000BC7A3 /* Debug */, - E27A9DCE1EF9B7FD000BC7A3 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = E2218C7A1EF2D2B5004298F6 /* Project object */; diff --git a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/xcschememanagement.plist b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/xcschememanagement.plist index 09c08d4..9d3b179 100644 --- a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/xcschememanagement.plist @@ -27,6 +27,11 @@ SuppressBuildableAutocreation + E220BF9B1EFB22D400DF5A97 + + primary + + E2218C811EF2D2B5004298F6 primary