Revision: 13827
http://sourceforge.net/p/skim-app/code/13827
Author: hofman
Date: 2023-12-04 17:02:52 +0000 (Mon, 04 Dec 2023)
Log Message:
-----------
Don't use precompile headers. Define localization macros in separate header
file, based on macro for bundle identifier defined in config file
Modified Paths:
--------------
trunk/SkimNotes/Configurations/SkimNotes-App.xcconfig
trunk/SkimNotes/Configurations/SkimNotes-Framework.xcconfig
trunk/SkimNotes/Configurations/SkimNotes-Tool.xcconfig
trunk/SkimNotes/Configurations/SkimPDF-Tool.xcconfig
trunk/SkimNotes/NSFileManager_SKNExtensions.m
trunk/SkimNotes/SKNExtendedAttributeManager.m
trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj
Removed Paths:
-------------
trunk/SkimNotes/SkimNotesBase_Prefix.pch
trunk/SkimNotes/SkimNotes_Prefix.pch
trunk/SkimNotes/SkimNotes_Tool_Prefix.pch
trunk/SkimNotes/SkimPDF_Tool_Prefix.pch
Modified: trunk/SkimNotes/Configurations/SkimNotes-App.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-App.xcconfig 2023-12-04
15:47:53 UTC (rev 13826)
+++ trunk/SkimNotes/Configurations/SkimNotes-App.xcconfig 2023-12-04
17:02:52 UTC (rev 13827)
@@ -7,6 +7,3 @@
PRODUCT_BUNDLE_IDENTIFIER = net.sourceforge.skim-app.SkimNotesTest
LD_RUNPATH_SEARCH_PATHS = @loader_path/../Frameworks
-
-GCC_PRECOMPILE_PREFIX_HEADER = YES
-GCC_PREFIX_HEADER =
$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h
Modified: trunk/SkimNotes/Configurations/SkimNotes-Framework.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-Framework.xcconfig 2023-12-04
15:47:53 UTC (rev 13826)
+++ trunk/SkimNotes/Configurations/SkimNotes-Framework.xcconfig 2023-12-04
17:02:52 UTC (rev 13827)
@@ -10,5 +10,4 @@
PRODUCT_NAME = SkimNotes
PRODUCT_BUNDLE_IDENTIFIER = net.sourceforge.skim-app.framework.${PRODUCT_NAME}
-GCC_PRECOMPILE_PREFIX_HEADER = YES
-GCC_PREFIX_HEADER = SkimNotes_Prefix.pch
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited)
SKIMNOTES_BUNDLE_IDENTIFIER=\"$(PRODUCT_BUNDLE_IDENTIFIER)\"
Modified: trunk/SkimNotes/Configurations/SkimNotes-Tool.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-Tool.xcconfig 2023-12-04
15:47:53 UTC (rev 13826)
+++ trunk/SkimNotes/Configurations/SkimNotes-Tool.xcconfig 2023-12-04
17:02:52 UTC (rev 13827)
@@ -3,8 +3,5 @@
INSTALL_PATH = /usr/local/bin
PRODUCT_NAME = skimnotes
-GCC_PRECOMPILE_PREFIX_HEADER = YES
-GCC_PREFIX_HEADER = SkimNotes_Tool_Prefix.pch
-
// the code for the tool is not GC safe, this should not be relevant anyway
GCC_ENABLE_OBJC_GC = unsupported
Modified: trunk/SkimNotes/Configurations/SkimPDF-Tool.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimPDF-Tool.xcconfig 2023-12-04
15:47:53 UTC (rev 13826)
+++ trunk/SkimNotes/Configurations/SkimPDF-Tool.xcconfig 2023-12-04
17:02:52 UTC (rev 13827)
@@ -3,8 +3,5 @@
INSTALL_PATH = /usr/local/bin
PRODUCT_NAME = skimpdf
-GCC_PRECOMPILE_PREFIX_HEADER = YES
-GCC_PREFIX_HEADER = SkimPDF_Tool_Prefix.pch
-
// the code for the tool is not GC safe, this should not be relevant anyway
GCC_ENABLE_OBJC_GC = unsupported
Modified: trunk/SkimNotes/NSFileManager_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/NSFileManager_SKNExtensions.m 2023-12-04 15:47:53 UTC
(rev 13826)
+++ trunk/SkimNotes/NSFileManager_SKNExtensions.m 2023-12-04 17:02:52 UTC
(rev 13827)
@@ -39,6 +39,7 @@
#import "NSFileManager_SKNExtensions.h"
#import "SKNExtendedAttributeManager.h"
#import "SKNUtilities.h"
+#import "SKNLocalizations.h"
@implementation NSFileManager (SKNExtensions)
Modified: trunk/SkimNotes/SKNExtendedAttributeManager.m
===================================================================
--- trunk/SkimNotes/SKNExtendedAttributeManager.m 2023-12-04 15:47:53 UTC
(rev 13826)
+++ trunk/SkimNotes/SKNExtendedAttributeManager.m 2023-12-04 17:02:52 UTC
(rev 13827)
@@ -36,6 +36,7 @@
*/
#import "SKNExtendedAttributeManager.h"
+#import "SKNLocalizations.h"
#include <sys/xattr.h>
#import <bzlib.h>
Modified: trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj
===================================================================
--- trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj 2023-12-04 15:47:53 UTC
(rev 13826)
+++ trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj 2023-12-04 17:02:52 UTC
(rev 13827)
@@ -199,7 +199,6 @@
0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
Foundation.framework; path = /System/Library/Frameworks/Foundation.framework;
sourceTree = "<absolute>"; };
0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
AppKit.framework; path = /System/Library/Frameworks/AppKit.framework;
sourceTree = "<absolute>"; };
1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree
= "<absolute>"; };
- 32DBCF5E0370ADEE00C91783 /* SkimNotes_Prefix.pch */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SkimNotes_Prefix.pch; sourceTree = "<group>"; };
8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path =
Info.plist; sourceTree = "<group>"; };
8DC2EF5B0486A6940098B216 /* SkimNotes.framework */ = {isa =
PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0;
path = SkimNotes.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CE0C361E29A9361D0056897C /* SkimNotes.framework */ = {isa =
PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0;
path = SkimNotes.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -209,7 +208,6 @@
CE14113F1229B64D00C9EBA0 /* skimpdf */ = {isa =
PBXFileReference; explicitFileType = "compiled.mach-o.executable";
includeInIndex = 0; path = skimpdf; sourceTree = BUILT_PRODUCTS_DIR; };
CE1414161229B7A000C9EBA0 /* SkimPDF-Tool.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path =
"SkimPDF-Tool.xcconfig"; sourceTree = "<group>"; };
CE1414221229B80300C9EBA0 /* skimpdf.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= skimpdf.m; sourceTree = "<group>"; };
- CE1414251229B86500C9EBA0 /* SkimPDF_Tool_Prefix.pch */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SkimPDF_Tool_Prefix.pch; sourceTree = "<group>"; };
CE157F2712D4EDC700515B85 /* ja */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ja; path =
ja.lproj/SkimNotes.strings; sourceTree = "<group>"; };
CE1586F329ACB319001ADBCB /* PDFKit.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
PDFKit.framework; path =
System/iOSSupport/System/Library/Frameworks/PDFKit.framework; sourceTree =
SDKROOT; };
CE1632C71582ACC600CFF419 /* zh_CN */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_CN; path =
zh_CN.lproj/SkimNotes.strings; sourceTree = "<group>"; };
@@ -217,7 +215,6 @@
CE17EF850E250E8A00DE06EA /* SkimNotes-Framework.xcconfig */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig;
path = "SkimNotes-Framework.xcconfig"; sourceTree = "<group>"; };
CE17EF880E250E8A00DE06EA /* SkimNotes-Release.xcconfig */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig;
path = "SkimNotes-Release.xcconfig"; sourceTree = "<group>"; };
CE17EF890E250E8A00DE06EA /* SkimNotes-Tool.xcconfig */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path =
"SkimNotes-Tool.xcconfig"; sourceTree = "<group>"; };
- CE17F1BB0E25861700DE06EA /* SkimNotes_Tool_Prefix.pch */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path
= SkimNotes_Tool_Prefix.pch; sourceTree = "<group>"; };
CE1F649B0E34FAC300E07E76 /* Quartz.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
Quartz.framework; path = /System/Library/Frameworks/Quartz.framework;
sourceTree = "<absolute>"; };
CE3776630E2FB47500261604 /* NSFileManager_SKNToolExtensions.h
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; path = NSFileManager_SKNToolExtensions.h; sourceTree =
"<group>"; };
CE3776640E2FB47500261604 /* NSFileManager_SKNToolExtensions.m
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = NSFileManager_SKNToolExtensions.m; sourceTree =
"<group>"; };
@@ -235,10 +232,10 @@
CE83E4251059A831007E3D28 /* ReleaseNotes.rtf */ = {isa =
PBXFileReference; lastKnownFileType = text.rtf; path = ReleaseNotes.rtf;
sourceTree = "<group>"; };
CEA5F53D0E2CED0E00F65088 /* SkimNotesBase.framework */ = {isa =
PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0;
path = SkimNotesBase.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CEA5F5490E2CED6D00F65088 /* SkimNotesBase.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SkimNotesBase.h; sourceTree = "<group>"; };
- CEA5F54C0E2CEDC400F65088 /* SkimNotesBase_Prefix.pch */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path
= SkimNotesBase_Prefix.pch; sourceTree = "<group>"; };
CEA5F5E40E2D0FDB00F65088 /* SkimNotes.hdoc */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path =
SkimNotes.hdoc; sourceTree = "<group>"; };
CEB20D9929A973A400086B9E /* UIKit.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
UIKit.framework; path =
System/iOSSupport/System/Library/Frameworks/UIKit.framework; sourceTree =
SDKROOT; };
CEB540910F261E9D00723C1F /* zh_TW */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = zh_TW; path =
zh_TW.lproj/SkimNotes.strings; sourceTree = "<group>"; };
+ CEB84A342B1E37FC00D93431 /* SKNLocalizations.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
SKNLocalizations.h; sourceTree = "<group>"; };
CEBA2B550E0566B00000B2E6 /* skimnotes */ = {isa =
PBXFileReference; explicitFileType = "compiled.mach-o.executable";
includeInIndex = 0; path = skimnotes; sourceTree = BUILT_PRODUCTS_DIR; };
CEBA2B5A0E0566DF0000B2E6 /* SKNAgentListener.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SKNAgentListener.h; sourceTree = "<group>"; };
CEBA2B5B0E0566DF0000B2E6 /* SKNAgentListener.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SKNAgentListener.m; sourceTree = "<group>"; };
@@ -425,6 +422,7 @@
CEBA2BD40E05826D0000B2E6 /*
NSFileManager_SKNExtensions.m */,
CE37768A0E2FC26100261604 /* SKNUtilities.h */,
CE37768B0E2FC26100261604 /* SKNUtilities.m */,
+ CEB84A342B1E37FC00D93431 /* SKNLocalizations.h
*/,
CEBA2CD60E058CF00000B2E6 /* SkimNotes.h */,
CEA5F5490E2CED6D00F65088 /* SkimNotesBase.h */,
);
@@ -454,10 +452,6 @@
32C88DFF0371C24200C91783 /* Other Sources */ = {
isa = PBXGroup;
children = (
- 32DBCF5E0370ADEE00C91783 /*
SkimNotes_Prefix.pch */,
- CEA5F54C0E2CEDC400F65088 /*
SkimNotesBase_Prefix.pch */,
- CE17F1BB0E25861700DE06EA /*
SkimNotes_Tool_Prefix.pch */,
- CE1414251229B86500C9EBA0 /*
SkimPDF_Tool_Prefix.pch */,
CEA5F5E40E2D0FDB00F65088 /* SkimNotes.hdoc */,
);
name = "Other Sources";
Deleted: trunk/SkimNotes/SkimNotesBase_Prefix.pch
===================================================================
--- trunk/SkimNotes/SkimNotesBase_Prefix.pch 2023-12-04 15:47:53 UTC (rev
13826)
+++ trunk/SkimNotes/SkimNotesBase_Prefix.pch 2023-12-04 17:02:52 UTC (rev
13827)
@@ -1,15 +0,0 @@
-//
-// Prefix header for all source files of the 'SkimNotesBase' target in the
'SkimNotes' project.
-//
-
-#ifdef __OBJC__
- #import <Foundation/Foundation.h>
-#if (defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR) ||
(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
- #import <UIKit/UIKit.h>
- #import <CoreGraphics/CoreGraphics.h>
-#else
- #import <AppKit/AppKit.h>
-#endif
-
- #define SKNLocalizedString(key, comment)
NSLocalizedStringFromTableInBundle(key, @"SkimNotes", [NSBundle
bundleWithIdentifier:@"net.sourceforge.skim-app.framework.SkimNotesBase"],
comment)
-#endif
Deleted: trunk/SkimNotes/SkimNotes_Prefix.pch
===================================================================
--- trunk/SkimNotes/SkimNotes_Prefix.pch 2023-12-04 15:47:53 UTC (rev
13826)
+++ trunk/SkimNotes/SkimNotes_Prefix.pch 2023-12-04 17:02:52 UTC (rev
13827)
@@ -1,15 +0,0 @@
-//
-// Prefix header for all source files of the 'SkimNotes' target in the
'SkimNotes' project.
-//
-
-#ifdef __OBJC__
-#import <Foundation/Foundation.h>
-#if (defined(TARGET_OS_SIMULATOR) && TARGET_OS_SIMULATOR) ||
(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)
-#import <UIKit/UIKit.h>
-#import <CoreGraphics/CoreGraphics.h>
-#else
-#import <AppKit/AppKit.h>
-#endif
-
- #define SKNLocalizedString(key, comment)
NSLocalizedStringFromTableInBundle(key, @"SkimNotes", [NSBundle
bundleWithIdentifier:@"net.sourceforge.skim-app.framework.SkimNotes"], comment)
-#endif
Deleted: trunk/SkimNotes/SkimNotes_Tool_Prefix.pch
===================================================================
--- trunk/SkimNotes/SkimNotes_Tool_Prefix.pch 2023-12-04 15:47:53 UTC (rev
13826)
+++ trunk/SkimNotes/SkimNotes_Tool_Prefix.pch 2023-12-04 17:02:52 UTC (rev
13827)
@@ -1,10 +0,0 @@
-//
-// Prefix header for all source files of the 'skimnotes' target in the
'SkimNotes' project.
-//
-
-#ifdef __OBJC__
- #import <Foundation/Foundation.h>
- #import <AppKit/AppKit.h>
-
- #define SKNLocalizedString(key, comment) key
-#endif
Deleted: trunk/SkimNotes/SkimPDF_Tool_Prefix.pch
===================================================================
--- trunk/SkimNotes/SkimPDF_Tool_Prefix.pch 2023-12-04 15:47:53 UTC (rev
13826)
+++ trunk/SkimNotes/SkimPDF_Tool_Prefix.pch 2023-12-04 17:02:52 UTC (rev
13827)
@@ -1,10 +0,0 @@
-//
-// Prefix header for all source files of the 'skimpdf' target in the
'SkimNotes' project.
-//
-
-#ifdef __OBJC__
- #import <Foundation/Foundation.h>
- #import <AppKit/AppKit.h>
-
- #define SKNLocalizedString(key, comment) key
-#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
