Revision: 5630
http://skim-app.svn.sourceforge.net/skim-app/?rev=5630&view=rev
Author: hofman
Date: 2009-09-02 20:29:17 +0000 (Wed, 02 Sep 2009)
Log Message:
-----------
Make skimnotes EA manager thread safe.
Build x86_64 arch of skimnotes framework and tool in release config.
Modified Paths:
--------------
trunk/SkimNotes/Configurations/SkimNotes-Common.xcconfig
trunk/SkimNotes/Configurations/SkimNotes-Framework.xcconfig
trunk/SkimNotes/Configurations/SkimNotes-Release-GCSupport.xcconfig
trunk/SkimNotes/Configurations/SkimNotes-Release.xcconfig
trunk/SkimNotes/Info.plist
trunk/SkimNotes/SKNExtendedAttributeManager.m
trunk/SkimNotes/SkimNotes.rtf
trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj
Removed Paths:
-------------
trunk/SkimNotes/Configurations/SkimNotes-Release-64Bit.xcconfig
Modified: trunk/SkimNotes/Configurations/SkimNotes-Common.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-Common.xcconfig 2009-09-02
19:35:05 UTC (rev 5629)
+++ trunk/SkimNotes/Configurations/SkimNotes-Common.xcconfig 2009-09-02
20:29:17 UTC (rev 5630)
@@ -3,7 +3,10 @@
SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk
DEBUG_INFORMATION_FORMAT = dwarf
-MACOSX_DEPLOYMENT_TARGET = 10.4
+MACOSX_DEPLOYMENT_TARGET[arch=ppc] = 10.4
+MACOSX_DEPLOYMENT_TARGET[arch=i386] = 10.4
+MACOSX_DEPLOYMENT_TARGET[arch=ppc64] = 10.5
+MACOSX_DEPLOYMENT_TARGET[arch=x86_64] = 10.5
COPY_PHASE_STRIP = YES
STRIP_INSTALLED_PRODUCT = YES
Modified: trunk/SkimNotes/Configurations/SkimNotes-Framework.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-Framework.xcconfig 2009-09-02
19:35:05 UTC (rev 5629)
+++ trunk/SkimNotes/Configurations/SkimNotes-Framework.xcconfig 2009-09-02
20:29:17 UTC (rev 5630)
@@ -3,7 +3,7 @@
INSTALL_PATH = @executable_path/../Frameworks
DYLIB_COMPATIBILITY_VERSION = 1.1
-DYLIB_CURRENT_VERSION = 1.1.8
+DYLIB_CURRENT_VERSION = 1.1.9
FRAMEWORK_VERSION = A
INFOPLIST_FILE = Info.plist
Deleted: trunk/SkimNotes/Configurations/SkimNotes-Release-64Bit.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-Release-64Bit.xcconfig
2009-09-02 19:35:05 UTC (rev 5629)
+++ trunk/SkimNotes/Configurations/SkimNotes-Release-64Bit.xcconfig
2009-09-02 20:29:17 UTC (rev 5630)
@@ -1,6 +0,0 @@
-// Common to all tools for release with 64-Bit support
-
-#include "SkimNotes-Release.xcconfig"
-
-ARCHS = ppc i386 x86_64
-MACOSX_DEPLOYMENT_TARGET = 10.5
Modified: trunk/SkimNotes/Configurations/SkimNotes-Release-GCSupport.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-Release-GCSupport.xcconfig
2009-09-02 19:35:05 UTC (rev 5629)
+++ trunk/SkimNotes/Configurations/SkimNotes-Release-GCSupport.xcconfig
2009-09-02 20:29:17 UTC (rev 5630)
@@ -1,5 +1,6 @@
-// Common to all targets for Release with GC and 64 Bits support
+// Common to all targets for Release with GC support
-#include "SkimNotes-Release-64Bit.xcconfig"
+#include "SkimNotes-Release.xcconfig"
+MACOSX_DEPLOYMENT_TARGET = 10.5
GCC_ENABLE_OBJC_GC = supported
Modified: trunk/SkimNotes/Configurations/SkimNotes-Release.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-Release.xcconfig 2009-09-02
19:35:05 UTC (rev 5629)
+++ trunk/SkimNotes/Configurations/SkimNotes-Release.xcconfig 2009-09-02
20:29:17 UTC (rev 5630)
@@ -2,7 +2,7 @@
#include "SkimNotes-Common.xcconfig"
-ARCHS = ppc i386
+ARCHS = ppc i386 x86_64
DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
COPY_PHASE_STRIP = YES
STRIP_INSTALLED_PRODUCT = YES
Modified: trunk/SkimNotes/Info.plist
===================================================================
--- trunk/SkimNotes/Info.plist 2009-09-02 19:35:05 UTC (rev 5629)
+++ trunk/SkimNotes/Info.plist 2009-09-02 20:29:17 UTC (rev 5630)
@@ -19,7 +19,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.1.8</string>
+ <string>1.1.9</string>
<key>NSHumanReadableCopyright</key>
<string>© Christiaan M. Hofman, 2008-2009</string>
<key>NSPrincipalClass</key>
Modified: trunk/SkimNotes/SKNExtendedAttributeManager.m
===================================================================
--- trunk/SkimNotes/SKNExtendedAttributeManager.m 2009-09-02 19:35:05 UTC
(rev 5629)
+++ trunk/SkimNotes/SKNExtendedAttributeManager.m 2009-09-02 20:29:17 UTC
(rev 5630)
@@ -69,16 +69,24 @@
+ (id)sharedManager;
{
- if (sharedManager == nil)
- sharedManager = [[[self class] alloc] init];
- return sharedManager;
+ id manager;
+ @synchronized(self) {
+ if (sharedManager == nil)
+ sharedManager = [[[self class] alloc] init];
+ manager = sharedManager;
+ }
+ return manager;
}
+ (id)sharedNoSplitManager;
{
- if (sharedNoSplitManager == nil)
- sharedNoSplitManager = [[[self class] alloc] initWithPrefix:nil];
- return sharedNoSplitManager;
+ id manager;
+ @synchronized(self) {
+ if (sharedNoSplitManager == nil)
+ sharedNoSplitManager = [[[self class] alloc] initWithPrefix:nil];
+ manager = sharedNoSplitManager;
+ }
+ return manager;
}
- (id)init;
Modified: trunk/SkimNotes/SkimNotes.rtf
===================================================================
--- trunk/SkimNotes/SkimNotes.rtf 2009-09-02 19:35:05 UTC (rev 5629)
+++ trunk/SkimNotes/SkimNotes.rtf 2009-09-02 20:29:17 UTC (rev 5630)
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf350
+{\rtf1\ansi\ansicpg1252\cocoartf1038
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0
Courier;\f2\fnil\fcharset0 Monaco;
}
{\colortbl;\red255\green255\blue255;\red118\green15\blue80;}
@@ -107,16 +107,16 @@
\b\fs36 \cf0 Notes on Building the Framework
\fs24 \
\
-Garbage Collection and 64-Bits
+64-Bits and Garbage Collection
\b0 \
\
-The built versions of the SkimNotes framework and skimnotes tool included in
the release are built using the Release configuration. This means that Garbage
Collection (GC) and 64-bits are not supported. The Xcode project has a build
configuration called "Release (GC dual-mode)" that builds the framework with GC
supported (not required) and includes a 64-bit binary for Intel. The framework
should be safe for GC and 64-bits when build with this configuration, but you
should be aware that it has not been tested in these environment. The
framework built with this configuration requires Mac OSX 10.5.\
+The release configuration will build executables for 32-bit universal and
64-bit Intel, but without support for Garbage Collection (GC). The built
versions of the SkimNotes framework and skimnotes tool included in the release
are built using the Release configuration.\
\
+The Xcode project has a build configuration called "Release (GC dual-mode)"
that builds the framework with GC supported (not required). The framework
should be safe for GC when build with this configuration, but you should be
aware that it has not been tested in these environment. The framework built
with this configuration requires Mac OSX 10.5.\
+\
The tool will never use GC, even when built using the "Release (GC dual-mode)"
build configuration.\
\
-If you want to support 64-bits but not GC, you could create a new build
configuration (at the project level) duplicated from Release, but based on the
"SkimNotes-Release-64Bit" configuration (choose this in the popup at the bottom
of the Build section of the project Info window).\
-\
-If you need the Release build configuration to build with GC and 64-bits
support, open the Info window for the whole project, go to the Build tab,
select Release in the Configuration popup, and then select
"SkimNotes-Release-GCSupport" in the "Based On" popup at the bottom.\
+If you need the Release build configuration to build with GC support, open the
Info window for the whole project, go to the Build tab, select Release in the
Configuration popup, and then select "SkimNotes-Release-GCSupport" in the
"Based On" popup at the bottom.\
\b \
SkimNotes Framework Documentation
Modified: trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj
===================================================================
--- trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj 2009-09-02 19:35:05 UTC
(rev 5629)
+++ trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj 2009-09-02 20:29:17 UTC
(rev 5630)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 44;
objects = {
/* Begin PBXAggregateTarget section */
@@ -149,7 +149,6 @@
8DC2EF5B0486A6940098B216 /* SkimNotes.framework */ = {isa =
PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0;
path = SkimNotes.framework; sourceTree = BUILT_PRODUCTS_DIR; };
CE17EF840E250E8A00DE06EA /* SkimNotes-Debug.xcconfig */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path =
"SkimNotes-Debug.xcconfig"; sourceTree = "<group>"; };
CE17EF850E250E8A00DE06EA /* SkimNotes-Framework.xcconfig */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig;
path = "SkimNotes-Framework.xcconfig"; sourceTree = "<group>"; };
- CE17EF860E250E8A00DE06EA /* SkimNotes-Release-64Bit.xcconfig */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig;
path = "SkimNotes-Release-64Bit.xcconfig"; sourceTree = "<group>"; };
CE17EF870E250E8A00DE06EA /*
SkimNotes-Release-GCSupport.xcconfig */ = {isa = PBXFileReference; fileEncoding
= 4; lastKnownFileType = text.xcconfig; path =
"SkimNotes-Release-GCSupport.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>"; };
@@ -375,7 +374,6 @@
CE5280B10E41C137000F9CAC /*
SkimNotes-Common.xcconfig */,
CE17EF840E250E8A00DE06EA /*
SkimNotes-Debug.xcconfig */,
CE17EF880E250E8A00DE06EA /*
SkimNotes-Release.xcconfig */,
- CE17EF860E250E8A00DE06EA /*
SkimNotes-Release-64Bit.xcconfig */,
CE17EF870E250E8A00DE06EA /*
SkimNotes-Release-GCSupport.xcconfig */,
CE17EF850E250E8A00DE06EA /*
SkimNotes-Framework.xcconfig */,
CE17EF890E250E8A00DE06EA /*
SkimNotes-Tool.xcconfig */,
@@ -517,7 +515,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 1DEB91B108733DA50010E9CD /*
Build configuration list for PBXProject "SkimNotes" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.0";
hasScannedForEncodings = 1;
knownRegions = (
English,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit