diff --git a/Assets.xcassets/AppIcon-GA2.appiconset/1024.png b/Assets.xcassets/AppIcon-GA2.appiconset/1024.png new file mode 100644 index 0000000..9afa7f4 Binary files /dev/null and b/Assets.xcassets/AppIcon-GA2.appiconset/1024.png differ diff --git a/Assets.xcassets/AppIcon-GA2.appiconset/128.png b/Assets.xcassets/AppIcon-GA2.appiconset/128.png new file mode 100644 index 0000000..d58c125 Binary files /dev/null and b/Assets.xcassets/AppIcon-GA2.appiconset/128.png differ diff --git a/Assets.xcassets/AppIcon-GA2.appiconset/16.png b/Assets.xcassets/AppIcon-GA2.appiconset/16.png new file mode 100644 index 0000000..76c6dde Binary files /dev/null and b/Assets.xcassets/AppIcon-GA2.appiconset/16.png differ diff --git a/Assets.xcassets/AppIcon-GA2.appiconset/256-1.png b/Assets.xcassets/AppIcon-GA2.appiconset/256-1.png new file mode 100644 index 0000000..84ee400 Binary files /dev/null and b/Assets.xcassets/AppIcon-GA2.appiconset/256-1.png differ diff --git a/Assets.xcassets/AppIcon-GA2.appiconset/256.png b/Assets.xcassets/AppIcon-GA2.appiconset/256.png new file mode 100644 index 0000000..84ee400 Binary files /dev/null and b/Assets.xcassets/AppIcon-GA2.appiconset/256.png differ diff --git a/Assets.xcassets/AppIcon-GA2.appiconset/32-1.png b/Assets.xcassets/AppIcon-GA2.appiconset/32-1.png new file mode 100644 index 0000000..2005c93 Binary files /dev/null and b/Assets.xcassets/AppIcon-GA2.appiconset/32-1.png differ diff --git a/Assets.xcassets/AppIcon-GA2.appiconset/32.png b/Assets.xcassets/AppIcon-GA2.appiconset/32.png new file mode 100644 index 0000000..2005c93 Binary files /dev/null and b/Assets.xcassets/AppIcon-GA2.appiconset/32.png differ diff --git a/Assets.xcassets/AppIcon-GA2.appiconset/512-1.png b/Assets.xcassets/AppIcon-GA2.appiconset/512-1.png new file mode 100644 index 0000000..c84e864 Binary files /dev/null and b/Assets.xcassets/AppIcon-GA2.appiconset/512-1.png differ diff --git a/Assets.xcassets/AppIcon-GA2.appiconset/512.png b/Assets.xcassets/AppIcon-GA2.appiconset/512.png new file mode 100644 index 0000000..c84e864 Binary files /dev/null and b/Assets.xcassets/AppIcon-GA2.appiconset/512.png differ diff --git a/Assets.xcassets/AppIcon-GA2.appiconset/64.png b/Assets.xcassets/AppIcon-GA2.appiconset/64.png new file mode 100644 index 0000000..9776453 Binary files /dev/null and b/Assets.xcassets/AppIcon-GA2.appiconset/64.png differ diff --git a/Docsis Toolkit/Assets.xcassets/AppIcon.appiconset/Contents.json b/Assets.xcassets/AppIcon-GA2.appiconset/Contents.json similarity index 74% rename from Docsis Toolkit/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Assets.xcassets/AppIcon-GA2.appiconset/Contents.json index 2db2b1c..377279b 100644 --- a/Docsis Toolkit/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Assets.xcassets/AppIcon-GA2.appiconset/Contents.json @@ -1,53 +1,63 @@ { "images" : [ { - "idiom" : "mac", "size" : "16x16", + "idiom" : "mac", + "filename" : "16.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "16x16", + "idiom" : "mac", + "filename" : "32.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "32x32", + "idiom" : "mac", + "filename" : "32-1.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "32x32", + "idiom" : "mac", + "filename" : "64.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "128x128", + "idiom" : "mac", + "filename" : "128.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "128x128", + "idiom" : "mac", + "filename" : "256.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "256x256", + "idiom" : "mac", + "filename" : "256-1.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "256x256", + "idiom" : "mac", + "filename" : "512.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "512x512", + "idiom" : "mac", + "filename" : "512-1.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "512x512", + "idiom" : "mac", + "filename" : "1024.png", "scale" : "2x" } ], diff --git a/Assets.xcassets/AppIcon-L4.appiconset/Contents.json b/Assets.xcassets/AppIcon-L4.appiconset/Contents.json new file mode 100644 index 0000000..b0929be --- /dev/null +++ b/Assets.xcassets/AppIcon-L4.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "modem-7.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "modem-8.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "modem-6.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "modem-5.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "modem-3.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "modem-4.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "modem-2.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "modem.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "modem-1.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "modem-9.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Assets.xcassets/AppIcon-L4.appiconset/modem-1.png b/Assets.xcassets/AppIcon-L4.appiconset/modem-1.png new file mode 100644 index 0000000..8774a41 Binary files /dev/null and b/Assets.xcassets/AppIcon-L4.appiconset/modem-1.png differ diff --git a/Assets.xcassets/AppIcon-L4.appiconset/modem-2.png b/Assets.xcassets/AppIcon-L4.appiconset/modem-2.png new file mode 100644 index 0000000..5fc07c4 Binary files /dev/null and b/Assets.xcassets/AppIcon-L4.appiconset/modem-2.png differ diff --git a/Assets.xcassets/AppIcon-L4.appiconset/modem-3.png b/Assets.xcassets/AppIcon-L4.appiconset/modem-3.png new file mode 100644 index 0000000..ec767b9 Binary files /dev/null and b/Assets.xcassets/AppIcon-L4.appiconset/modem-3.png differ diff --git a/Assets.xcassets/AppIcon-L4.appiconset/modem-4.png b/Assets.xcassets/AppIcon-L4.appiconset/modem-4.png new file mode 100644 index 0000000..5fc07c4 Binary files /dev/null and b/Assets.xcassets/AppIcon-L4.appiconset/modem-4.png differ diff --git a/Assets.xcassets/AppIcon-L4.appiconset/modem-5.png b/Assets.xcassets/AppIcon-L4.appiconset/modem-5.png new file mode 100644 index 0000000..c0c5281 Binary files /dev/null and b/Assets.xcassets/AppIcon-L4.appiconset/modem-5.png differ diff --git a/Assets.xcassets/AppIcon-L4.appiconset/modem-6.png b/Assets.xcassets/AppIcon-L4.appiconset/modem-6.png new file mode 100644 index 0000000..b1b1cec Binary files /dev/null and b/Assets.xcassets/AppIcon-L4.appiconset/modem-6.png differ diff --git a/Assets.xcassets/AppIcon-L4.appiconset/modem-7.png b/Assets.xcassets/AppIcon-L4.appiconset/modem-7.png new file mode 100644 index 0000000..0e148e2 Binary files /dev/null and b/Assets.xcassets/AppIcon-L4.appiconset/modem-7.png differ diff --git a/Assets.xcassets/AppIcon-L4.appiconset/modem-8.png b/Assets.xcassets/AppIcon-L4.appiconset/modem-8.png new file mode 100644 index 0000000..b1b1cec Binary files /dev/null and b/Assets.xcassets/AppIcon-L4.appiconset/modem-8.png differ diff --git a/Assets.xcassets/AppIcon-L4.appiconset/modem-9.png b/Assets.xcassets/AppIcon-L4.appiconset/modem-9.png new file mode 100644 index 0000000..90256a2 Binary files /dev/null and b/Assets.xcassets/AppIcon-L4.appiconset/modem-9.png differ diff --git a/Assets.xcassets/AppIcon-L4.appiconset/modem.png b/Assets.xcassets/AppIcon-L4.appiconset/modem.png new file mode 100644 index 0000000..8774a41 Binary files /dev/null and b/Assets.xcassets/AppIcon-L4.appiconset/modem.png differ diff --git a/Assets.xcassets/Contents.json b/Assets.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Docsis Toolkit.xcodeproj/project.pbxproj b/Docsis Toolkit.xcodeproj/project.pbxproj index 8768012..7cea3d2 100644 --- a/Docsis Toolkit.xcodeproj/project.pbxproj +++ b/Docsis Toolkit.xcodeproj/project.pbxproj @@ -7,23 +7,39 @@ objects = { /* Begin PBXBuildFile section */ - E2218C861EF2D2B5004298F6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2218C851EF2D2B5004298F6 /* AppDelegate.swift */; }; - E2218C881EF2D2B5004298F6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2218C871EF2D2B5004298F6 /* ViewController.swift */; }; - E2218C8A1EF2D2B5004298F6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2218C891EF2D2B5004298F6 /* Assets.xcassets */; }; - E2218C8D1EF2D2B5004298F6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E2218C8B1EF2D2B5004298F6 /* Main.storyboard */; }; + E2218C9B1EF2D345004298F6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2218C9A1EF2D345004298F6 /* AppDelegate.swift */; }; + E2218C9D1EF2D345004298F6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2218C9C1EF2D345004298F6 /* ViewController.swift */; }; + E2218CA91EF2D37B004298F6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2218CA81EF2D37B004298F6 /* Assets.xcassets */; }; + E2218CDE1EF2D461004298F6 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E2218CDC1EF2D461004298F6 /* MainMenu.xib */; }; + E2218CDF1EF2D461004298F6 /* SettingsWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = E2218CDD1EF2D461004298F6 /* SettingsWindowController.xib */; }; + E2218CE31EF2D54A004298F6 /* buildnum.ver in Resources */ = {isa = PBXBuildFile; fileRef = E2218CE11EF2D54A004298F6 /* buildnum.ver */; }; + E2218CE41EF2D54A004298F6 /* BumpBuildNumber.py in Resources */ = {isa = PBXBuildFile; fileRef = E2218CE21EF2D54A004298F6 /* BumpBuildNumber.py */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + E2218CE91EF2D601004298F6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = E2218C7A1EF2D2B5004298F6 /* Project object */; + proxyType = 1; + remoteGlobalIDString = E2218CE51EF2D577004298F6; + remoteInfo = "Bump Logger4"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ - E2218C821EF2D2B5004298F6 /* Docsis Toolkit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Docsis Toolkit.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - E2218C851EF2D2B5004298F6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - E2218C871EF2D2B5004298F6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - E2218C891EF2D2B5004298F6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - E2218C8C1EF2D2B5004298F6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - E2218C8E1EF2D2B5004298F6 /* 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 = ""; }; + E2218C9C1EF2D345004298F6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + E2218CA31EF2D345004298F6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + E2218CA81EF2D37B004298F6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + E2218CDC1EF2D461004298F6 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = ""; }; + E2218CDD1EF2D461004298F6 /* SettingsWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsWindowController.xib; sourceTree = ""; }; + E2218CE11EF2D54A004298F6 /* buildnum.ver */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = buildnum.ver; sourceTree = ""; }; + E2218CE21EF2D54A004298F6 /* BumpBuildNumber.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = BumpBuildNumber.py; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - E2218C7F1EF2D2B5004298F6 /* Frameworks */ = { + E2218C951EF2D345004298F6 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -36,7 +52,8 @@ E2218C791EF2D2B5004298F6 = { isa = PBXGroup; children = ( - E2218C841EF2D2B5004298F6 /* Docsis Toolkit */, + E2218CA71EF2D35B004298F6 /* Shared Resources */, + E2218C991EF2D345004298F6 /* Logger4 */, E2218C831EF2D2B5004298F6 /* Products */, ); sourceTree = ""; @@ -44,41 +61,93 @@ E2218C831EF2D2B5004298F6 /* Products */ = { isa = PBXGroup; children = ( - E2218C821EF2D2B5004298F6 /* Docsis Toolkit.app */, + E2218C981EF2D345004298F6 /* Logger4.app */, ); name = Products; sourceTree = ""; }; - E2218C841EF2D2B5004298F6 /* Docsis Toolkit */ = { + E2218C991EF2D345004298F6 /* Logger4 */ = { isa = PBXGroup; children = ( - E2218C851EF2D2B5004298F6 /* AppDelegate.swift */, - E2218C871EF2D2B5004298F6 /* ViewController.swift */, - E2218C891EF2D2B5004298F6 /* Assets.xcassets */, - E2218C8B1EF2D2B5004298F6 /* Main.storyboard */, - E2218C8E1EF2D2B5004298F6 /* Info.plist */, + E2218CDA1EF2D43A004298F6 /* Support Files */, + E2218C9A1EF2D345004298F6 /* AppDelegate.swift */, + E2218C9C1EF2D345004298F6 /* ViewController.swift */, + E2218CA31EF2D345004298F6 /* Info.plist */, ); - path = "Docsis Toolkit"; + path = Logger4; + sourceTree = ""; + }; + E2218CA71EF2D35B004298F6 /* Shared Resources */ = { + isa = PBXGroup; + children = ( + E2218CA81EF2D37B004298F6 /* Assets.xcassets */, + ); + name = "Shared Resources"; + sourceTree = ""; + }; + E2218CDA1EF2D43A004298F6 /* Support Files */ = { + isa = PBXGroup; + children = ( + E2218CE01EF2D53D004298F6 /* Versioning */, + E2218CDB1EF2D443004298F6 /* UI */, + ); + name = "Support Files"; + sourceTree = ""; + }; + E2218CDB1EF2D443004298F6 /* UI */ = { + isa = PBXGroup; + children = ( + E2218CDC1EF2D461004298F6 /* MainMenu.xib */, + E2218CDD1EF2D461004298F6 /* SettingsWindowController.xib */, + ); + name = UI; + sourceTree = ""; + }; + E2218CE01EF2D53D004298F6 /* Versioning */ = { + isa = PBXGroup; + children = ( + E2218CE11EF2D54A004298F6 /* buildnum.ver */, + E2218CE21EF2D54A004298F6 /* BumpBuildNumber.py */, + ); + name = Versioning; sourceTree = ""; }; /* End PBXGroup section */ -/* Begin PBXNativeTarget section */ - E2218C811EF2D2B5004298F6 /* Docsis Toolkit */ = { - isa = PBXNativeTarget; - buildConfigurationList = E2218C911EF2D2B5004298F6 /* Build configuration list for PBXNativeTarget "Docsis Toolkit" */; +/* Begin PBXLegacyTarget section */ + E2218CE51EF2D577004298F6 /* Bump Logger4 */ = { + isa = PBXLegacyTarget; + buildArgumentsString = "$PROJECT_DIR/Logger4/BumpBuildNumber.py $PROJECT_DIR/Logger4/buildnum.ver $PROJECT_DIR/Logger3/Info.plist"; + buildConfigurationList = E2218CE61EF2D577004298F6 /* Build configuration list for PBXLegacyTarget "Bump Logger4" */; buildPhases = ( - E2218C7E1EF2D2B5004298F6 /* Sources */, - E2218C7F1EF2D2B5004298F6 /* Frameworks */, - E2218C801EF2D2B5004298F6 /* Resources */, + ); + buildToolPath = /usr/bin/python; + buildWorkingDirectory = $PROJECT_DIR/Logger4; + dependencies = ( + ); + name = "Bump Logger4"; + passBuildSettingsInEnvironment = 1; + productName = "Bump Logger4"; + }; +/* End PBXLegacyTarget section */ + +/* Begin PBXNativeTarget section */ + E2218C971EF2D345004298F6 /* Logger4 */ = { + isa = PBXNativeTarget; + buildConfigurationList = E2218CA41EF2D345004298F6 /* Build configuration list for PBXNativeTarget "Logger4" */; + buildPhases = ( + E2218C941EF2D345004298F6 /* Sources */, + E2218C951EF2D345004298F6 /* Frameworks */, + E2218C961EF2D345004298F6 /* Resources */, ); buildRules = ( ); dependencies = ( + E2218CEA1EF2D601004298F6 /* PBXTargetDependency */, ); - name = "Docsis Toolkit"; - productName = "Docsis Toolkit"; - productReference = E2218C821EF2D2B5004298F6 /* Docsis Toolkit.app */; + name = Logger4; + productName = Logger4; + productReference = E2218C981EF2D345004298F6 /* Logger4.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -91,7 +160,12 @@ LastUpgradeCheck = 0830; ORGANIZATIONNAME = "Kilian Hofmann"; TargetAttributes = { - E2218C811EF2D2B5004298F6 = { + E2218C971EF2D345004298F6 = { + CreatedOnToolsVersion = 8.3.3; + DevelopmentTeam = 795KPDV76S; + ProvisioningStyle = Automatic; + }; + E2218CE51EF2D577004298F6 = { CreatedOnToolsVersion = 8.3.3; DevelopmentTeam = 795KPDV76S; ProvisioningStyle = Automatic; @@ -111,45 +185,46 @@ projectDirPath = ""; projectRoot = ""; targets = ( - E2218C811EF2D2B5004298F6 /* Docsis Toolkit */, + E2218C971EF2D345004298F6 /* Logger4 */, + E2218CE51EF2D577004298F6 /* Bump Logger4 */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - E2218C801EF2D2B5004298F6 /* Resources */ = { + E2218C961EF2D345004298F6 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - E2218C8A1EF2D2B5004298F6 /* Assets.xcassets in Resources */, - E2218C8D1EF2D2B5004298F6 /* Main.storyboard in Resources */, + E2218CA91EF2D37B004298F6 /* Assets.xcassets in Resources */, + E2218CDF1EF2D461004298F6 /* SettingsWindowController.xib in Resources */, + E2218CDE1EF2D461004298F6 /* MainMenu.xib in Resources */, + E2218CE31EF2D54A004298F6 /* buildnum.ver in Resources */, + E2218CE41EF2D54A004298F6 /* BumpBuildNumber.py in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - E2218C7E1EF2D2B5004298F6 /* Sources */ = { + E2218C941EF2D345004298F6 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E2218C881EF2D2B5004298F6 /* ViewController.swift in Sources */, - E2218C861EF2D2B5004298F6 /* AppDelegate.swift in Sources */, + E2218C9D1EF2D345004298F6 /* ViewController.swift in Sources */, + E2218C9B1EF2D345004298F6 /* AppDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXVariantGroup section */ - E2218C8B1EF2D2B5004298F6 /* Main.storyboard */ = { - isa = PBXVariantGroup; - children = ( - E2218C8C1EF2D2B5004298F6 /* Base */, - ); - name = Main.storyboard; - sourceTree = ""; +/* Begin PBXTargetDependency section */ + E2218CEA1EF2D601004298F6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = E2218CE51EF2D577004298F6 /* Bump Logger4 */; + targetProxy = E2218CE91EF2D601004298F6 /* PBXContainerItemProxy */; }; -/* End PBXVariantGroup section */ +/* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ E2218C8F1EF2D2B5004298F6 /* Debug */ = { @@ -244,34 +319,63 @@ }; name = Release; }; - E2218C921EF2D2B5004298F6 /* Debug */ = { + E2218CA51EF2D345004298F6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-L4"; + CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 795KPDV76S; - INFOPLIST_FILE = "Docsis Toolkit/Info.plist"; + INFOPLIST_FILE = Logger4/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.weebly.alikja.Docsis-Toolkit"; + PRODUCT_BUNDLE_IDENTIFIER = com.weebly.alikja.Logger4; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 3.0; }; name = Debug; }; - E2218C931EF2D2B5004298F6 /* Release */ = { + E2218CA61EF2D345004298F6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-L4"; + CODE_SIGN_IDENTITY = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = 795KPDV76S; - INFOPLIST_FILE = "Docsis Toolkit/Info.plist"; + INFOPLIST_FILE = Logger4/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.weebly.alikja.Docsis-Toolkit"; + PRODUCT_BUNDLE_IDENTIFIER = com.weebly.alikja.Logger4; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 3.0; }; name = Release; }; + E2218CE71EF2D577004298F6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEBUGGING_SYMBOLS = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + DEVELOPMENT_TEAM = 795KPDV76S; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + E2218CE81EF2D577004298F6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = 795KPDV76S; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -284,11 +388,19 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E2218C911EF2D2B5004298F6 /* Build configuration list for PBXNativeTarget "Docsis Toolkit" */ = { + E2218CA41EF2D345004298F6 /* Build configuration list for PBXNativeTarget "Logger4" */ = { isa = XCConfigurationList; buildConfigurations = ( - E2218C921EF2D2B5004298F6 /* Debug */, - E2218C931EF2D2B5004298F6 /* Release */, + E2218CA51EF2D345004298F6 /* Debug */, + E2218CA61EF2D345004298F6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + E2218CE61EF2D577004298F6 /* Build configuration list for PBXLegacyTarget "Bump Logger4" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E2218CE71EF2D577004298F6 /* Debug */, + E2218CE81EF2D577004298F6 /* Release */, ); defaultConfigurationIsVisible = 0; }; diff --git a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Docsis Toolkit.xcscheme b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme similarity index 81% rename from Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Docsis Toolkit.xcscheme rename to Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme index 4942040..d6237de 100644 --- a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Docsis Toolkit.xcscheme +++ b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme @@ -14,9 +14,9 @@ buildForAnalyzing = "YES"> @@ -32,9 +32,9 @@ @@ -55,9 +55,9 @@ runnableDebuggingMode = "0"> @@ -74,9 +74,9 @@ runnableDebuggingMode = "0"> diff --git a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/xcschememanagement.plist b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/xcschememanagement.plist index 83e6c58..38cbb54 100644 --- a/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,7 +4,7 @@ SchemeUserState - Docsis Toolkit.xcscheme + Logger4.xcscheme orderHint 0 @@ -17,6 +17,16 @@ primary + E2218C971EF2D345004298F6 + + primary + + + E2218CE51EF2D577004298F6 + + primary + + diff --git a/Docsis Toolkit/Base.lproj/Main.storyboard b/Docsis Toolkit/Base.lproj/Main.storyboard deleted file mode 100644 index 93eb748..0000000 --- a/Docsis Toolkit/Base.lproj/Main.storyboard +++ /dev/null @@ -1,693 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Default - - - - - - - Left to Right - - - - - - - Right to Left - - - - - - - - - - - Default - - - - - - - Left to Right - - - - - - - Right to Left - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Docsis Toolkit/AppDelegate.swift b/Logger4/AppDelegate.swift similarity index 96% rename from Docsis Toolkit/AppDelegate.swift rename to Logger4/AppDelegate.swift index 0734133..8fe8625 100644 --- a/Docsis Toolkit/AppDelegate.swift +++ b/Logger4/AppDelegate.swift @@ -1,6 +1,6 @@ // // AppDelegate.swift -// Docsis Toolkit +// Logger4 // // Created by Kilian Hofmann on 15.06.17. // Copyright © 2017 Kilian Hofmann. All rights reserved. diff --git a/Logger4/BumpBuildNumber.py b/Logger4/BumpBuildNumber.py new file mode 100644 index 0000000..94adde8 --- /dev/null +++ b/Logger4/BumpBuildNumber.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python +# +# Bump build number in Info.plist files if a source file have changed. +# +# usage: bump_buildnum.py buildnum.ver Info.plist [ ... Info.plist ] +# +# andy@trojanfoe.com, 2014. +# + +import sys, os, subprocess, re + +def read_verfile(name): + version = None + build = None + verfile = open(name, "r") + for line in verfile: + match = re.match(r"^version\s+(\S+)", line) + if match: + version = match.group(1).rstrip() + match = re.match(r"^build\s+(\S+)", line) + if match: + build = int(match.group(1).rstrip()) + verfile.close() + return (version, build) + +def write_verfile(name, version, build): + verfile = open(name, "w") + verfile.write("version {0}\n".format(version)) + verfile.write("build {0}\n".format(build)) + verfile.close() + return True + +def set_plist_version(plistname, version, build): + if not os.path.exists(plistname): + print("{0} does not exist".format(plistname)) + return False + + plistbuddy = '/usr/libexec/Plistbuddy' + if not os.path.exists(plistbuddy): + print("{0} does not exist".format(plistbuddy)) + return False + + cmdline = [plistbuddy, + "-c", "Set CFBundleShortVersionString {0}".format(version), + "-c", "Set CFBundleVersion {0}".format(build), + plistname] + if subprocess.call(cmdline) != 0: + print("Failed to update {0}".format(plistname)) + return False + + print("Updated {0} with v{1} ({2})".format(plistname, version, build)) + return True + +def should_bump(vername, dirname): + verstat = os.stat(vername) + allnames = [] + for dirname, dirnames, filenames in os.walk(dirname): + for filename in filenames: + allnames.append(os.path.join(dirname, filename)) + + for filename in allnames: + filestat = os.stat(filename) + if filestat.st_mtime > verstat.st_mtime: + print("{0} is newer than {1}".format(filename, vername)) + return True + + return False + +def upver(vername): + (version, build) = read_verfile(vername) + if version == None or build == None: + print("Failed to read version/build from {0}".format(vername)) + return False + + # Bump the version number if any files in the same directory as the version file + # have changed, including sub-directories. + srcdir = os.path.dirname(vername) + bump = should_bump(vername, srcdir) + + if bump: + build += 1 + print("Incremented to build {0}".format(build)) + write_verfile(vername, version, build) + print("Written {0}".format(vername)) + else: + print("Staying at build {0}".format(build)) + + return (version, build) + +if __name__ == "__main__": + if os.environ.has_key('ACTION') and os.environ['ACTION'] == 'clean': + print("{0}: Not running while cleaning".format(sys.argv[0])) + sys.exit(0) + + if len(sys.argv) < 3: + print("Usage: {0} buildnum.ver Info.plist [... Info.plist]".format(sys.argv[0])) + sys.exit(1) + vername = sys.argv[1] + + (version_orig, build_orig) = read_verfile(vername) + + (version, build) = upver(vername) + if version == None or build == None: + sys.exit(2) + + if (version_orig, build_orig) < (version, build): + for i in range(2, len(sys.argv)): + plistname = sys.argv[i] + set_plist_version(plistname, version, build) + + sys.exit(0) \ No newline at end of file diff --git a/Docsis Toolkit/Info.plist b/Logger4/Info.plist similarity index 72% rename from Docsis Toolkit/Info.plist rename to Logger4/Info.plist index 2153aed..29bbd05 100644 --- a/Docsis Toolkit/Info.plist +++ b/Logger4/Info.plist @@ -6,8 +6,6 @@ en CFBundleExecutable $(EXECUTABLE_NAME) - CFBundleIconFile - CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion @@ -22,10 +20,17 @@ 1 LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) + LSUIElement + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + NSHumanReadableCopyright - Copyright © 2017 Kilian Hofmann. All rights reserved. - NSMainStoryboardFile - Main + Copyright © 2016 Kilian Hofmann. All rights reserved. Icons made by Freepik from www.flaticon.com is licensed by CC 3.0 BY + NSMainNibFile + MainMenu NSPrincipalClass NSApplication diff --git a/Logger4/MainMenu.xib b/Logger4/MainMenu.xib new file mode 100644 index 0000000..9717440 --- /dev/null +++ b/Logger4/MainMenu.xib @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Logger4/SettingsWindowController.xib b/Logger4/SettingsWindowController.xib new file mode 100644 index 0000000..6fc0040 --- /dev/null +++ b/Logger4/SettingsWindowController.xib @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Docsis Toolkit/ViewController.swift b/Logger4/ViewController.swift similarity index 95% rename from Docsis Toolkit/ViewController.swift rename to Logger4/ViewController.swift index 9808028..1901cf8 100644 --- a/Docsis Toolkit/ViewController.swift +++ b/Logger4/ViewController.swift @@ -1,6 +1,6 @@ // // ViewController.swift -// Docsis Toolkit +// Logger4 // // Created by Kilian Hofmann on 15.06.17. // Copyright © 2017 Kilian Hofmann. All rights reserved. diff --git a/Logger4/buildnum.ver b/Logger4/buildnum.ver new file mode 100644 index 0000000..14927ff --- /dev/null +++ b/Logger4/buildnum.ver @@ -0,0 +1,2 @@ +version 4.0 +build 1