Skip to content
This repository was archived by the owner on Feb 1, 2025. It is now read-only.

Commit 895f1d6

Browse files
Removed unused macros
just removed some non needed macros
1 parent b43f730 commit 895f1d6

File tree

4 files changed

+2
-42
lines changed

4 files changed

+2
-42
lines changed

TINU.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@
836836
PRODUCT_NAME = "$(TARGET_NAME)";
837837
PROVISIONING_PROFILE = "";
838838
PROVISIONING_PROFILE_SPECIFIER = "";
839-
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG useEFIReplacement skipChooseCustomization TINU installManager";
839+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG useEFIReplacement skipChooseCustomization TINU";
840840
SWIFT_COMPILATION_MODE = wholemodule;
841841
SWIFT_ENFORCE_EXCLUSIVE_ACCESS = on;
842842
SWIFT_OBJC_BRIDGING_HEADER = "";

TINU/AppDelegate.swift

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
4242

4343

4444
if CreateinstallmediaSmallManager.shared.sharedIsCreationInProgress{
45-
// if !dialogYesNoWarning(question: "Installer creation in progress in progess", text: "The installer creation is inprogress do you want to quit?", style: .warning){
46-
#if installManager
4745
if let s = InstallMediaCreationManager.shared.stopWithAsk(){
4846
if s{
4947
msgBoxWarning("Error while trying to quit", "There was an error while trying to quit from the app: \n\nFailed to stop " + sharedExecutableName + " process")
@@ -52,22 +50,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
5250
}else{
5351
return NSApplicationTerminateReply.terminateCancel
5452
}
55-
#else
56-
if let i = sharedWindow.contentViewController as? InstallingViewController{
57-
58-
if let s = i.stopWithAsk(){
59-
if s{
60-
msgBoxWarning("Error while trying to quit", "There was an error while trying to quit from the app: \n\nFailed to stop " + sharedExecutableName + " process")
61-
return NSApplicationTerminateReply.terminateCancel
62-
}
63-
}else{
64-
return NSApplicationTerminateReply.terminateCancel
65-
}
66-
}
67-
#endif
68-
//}else{
69-
//return NSApplicationTerminateReply.terminateCancel
70-
//}
7153
}
7254

7355
erasePassword()
@@ -165,25 +147,13 @@ class AppDelegate: NSObject, NSApplicationDelegate {
165147
// Insert code here to tear down your application
166148

167149
if CreateinstallmediaSmallManager.shared.sharedIsCreationInProgress{
168-
#if installManager
169150
if let s = InstallMediaCreationManager.shared.stop(){
170151
if s{
171152
msgBoxWarning("Error while trying to quit", "There was an error while trying to qui from the app: \n\nFailed to stop " + sharedExecutableName + " process")
172153
}
173154
}else{
174155
msgBoxWarning("Error while trying to quit", "There was an error while trying to qui from the app: \n\nFailed to stop " + sharedExecutableName + " process")
175156
}
176-
#else
177-
if let i = sharedWindow.contentViewController as? InstallingViewController{
178-
if let s = i.stop(){
179-
if s{
180-
msgBoxWarning("Error while trying to quit", "There was an error while trying to qui from the app: \n\nFailed to stop " + sharedExecutableName + " process")
181-
}
182-
}else{
183-
msgBoxWarning("Error while trying to quit", "There was an error while trying to qui from the app: \n\nFailed to stop " + sharedExecutableName + " process")
184-
}
185-
}
186-
#endif
187157
}
188158
}
189159

TINU/MacrosReference.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ To enable each macro you need to go into the build settings section of the proje
4141
This tells to compile the "TINU only" code
4242

4343
- isTool
44-
This tells if code i being compiled by tinu or by a tool which uses tinu code
45-
46-
- installManager
47-
Uses a new separate module for media creation/macOS installation proces
48-
44+
This tells if code is being compiled by tinu or by a tool which uses tinu code
4945
*/
5046

5147
#if demo

TINU/MainWindowController.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,7 @@ public class mainWindowController: GenericWindowController {
4141
if CreateinstallmediaSmallManager.shared.sharedIsCreationInProgress{
4242
//if !dialogYesNoWarning(question: "Stop the process?", text: "Do you want to abort the Installer cration process?", style: .informational){
4343

44-
#if installManager
4544
return InstallMediaCreationManager.shared.stopWithAsk()
46-
#else
47-
if let w = self.contentViewController as? InstallingViewController{
48-
return w.stopWithAsk()
49-
}
50-
#endif
5145
//}
5246
}
5347

0 commit comments

Comments
 (0)