Kilian/DOCSIS-Toolkit
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rewrite for cleaner

Browse Source
This commit is contained in:
Kilian Hofmann
2017-06-15 16:50:30 +02:00
parent 3557ebf6e2
commit 8486978860
34 changed files with 638 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docsis Toolkit.xcodeproj/project.pbxproj
+170 -58
View File
@@ -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 = "<group>"; };
E2218C871EF2D2B5004298F6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
E2218C891EF2D2B5004298F6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
E2218C8C1EF2D2B5004298F6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
E2218C8E1EF2D2B5004298F6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
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 = "<group>"; };
E2218C9C1EF2D345004298F6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
E2218CA31EF2D345004298F6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E2218CA81EF2D37B004298F6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
E2218CDC1EF2D461004298F6 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
E2218CDD1EF2D461004298F6 /* SettingsWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsWindowController.xib; sourceTree = "<group>"; };
E2218CE11EF2D54A004298F6 /* buildnum.ver */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = buildnum.ver; sourceTree = "<group>"; };
E2218CE21EF2D54A004298F6 /* BumpBuildNumber.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = BumpBuildNumber.py; sourceTree = "<group>"; };
/* 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 = "<group>";
@@ -44,41 +61,93 @@
E2218C831EF2D2B5004298F6 /* Products */ = {
isa = PBXGroup;
children = (
E2218C821EF2D2B5004298F6 /* Docsis Toolkit.app */,
E2218C981EF2D345004298F6 /* Logger4.app */,
);
name = Products;
sourceTree = "<group>";
};
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 = "<group>";
};
E2218CA71EF2D35B004298F6 /* Shared Resources */ = {
isa = PBXGroup;
children = (
E2218CA81EF2D37B004298F6 /* Assets.xcassets */,
);
name = "Shared Resources";
sourceTree = "<group>";
};
E2218CDA1EF2D43A004298F6 /* Support Files */ = {
isa = PBXGroup;
children = (
E2218CE01EF2D53D004298F6 /* Versioning */,
E2218CDB1EF2D443004298F6 /* UI */,
);
name = "Support Files";
sourceTree = "<group>";
};
E2218CDB1EF2D443004298F6 /* UI */ = {
isa = PBXGroup;
children = (
E2218CDC1EF2D461004298F6 /* MainMenu.xib */,
E2218CDD1EF2D461004298F6 /* SettingsWindowController.xib */,
);
name = UI;
sourceTree = "<group>";
};
E2218CE01EF2D53D004298F6 /* Versioning */ = {
isa = PBXGroup;
children = (
E2218CE11EF2D54A004298F6 /* buildnum.ver */,
E2218CE21EF2D54A004298F6 /* BumpBuildNumber.py */,
);
name = Versioning;
sourceTree = "<group>";
};
/* 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 = "<group>";
/* 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;
};
Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Docsis Toolkit.xcscheme → Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme
+12 -12
View File
@@ -14,9 +14,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E2218C811EF2D2B5004298F6"
BuildableName = "Docsis Toolkit.app"
BlueprintName = "Docsis Toolkit"
BlueprintIdentifier = "E2218C971EF2D345004298F6"
BuildableName = "Logger4.app"
BlueprintName = "Logger4"
ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
</BuildableReference>
</BuildActionEntry>
@@ -32,9 +32,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E2218C811EF2D2B5004298F6"
BuildableName = "Docsis Toolkit.app"
BlueprintName = "Docsis Toolkit"
BlueprintIdentifier = "E2218C971EF2D345004298F6"
BuildableName = "Logger4.app"
BlueprintName = "Logger4"
ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
</BuildableReference>
</MacroExpansion>
@@ -55,9 +55,9 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E2218C811EF2D2B5004298F6"
BuildableName = "Docsis Toolkit.app"
BlueprintName = "Docsis Toolkit"
BlueprintIdentifier = "E2218C971EF2D345004298F6"
BuildableName = "Logger4.app"
BlueprintName = "Logger4"
ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
@@ -74,9 +74,9 @@
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "E2218C811EF2D2B5004298F6"
BuildableName = "Docsis Toolkit.app"
BlueprintName = "Docsis Toolkit"
BlueprintIdentifier = "E2218C971EF2D345004298F6"
BuildableName = "Logger4.app"
BlueprintName = "Logger4"
ReferencedContainer = "container:Docsis Toolkit.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/xcschememanagement.plist
+11 -1
View File
@@ -4,7 +4,7 @@
<dict>
<key>SchemeUserState</key>
<dict>
<key>Docsis Toolkit.xcscheme</key>
<key>Logger4.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
@@ -17,6 +17,16 @@
<key>primary</key>
<true/>
</dict>
<key>E2218C971EF2D345004298F6</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>E2218CE51EF2D577004298F6</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>