Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mac elcap #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Mac elcap #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2435480
upgrade mac project to el cap
rmottola Apr 30, 2023
7a82281
guard inclusion of generated config.h
rmottola May 2, 2023
d66a7c5
update mac support
rmottola May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions GWSCoder.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,7 @@ + (void) initialize
NSWarnMLog(@"No separate class for the sloppy parser. All parsers "
@"will be sloppy.");
#else
NSWarnMLog(@"No separate class for the sloppy parser. All parsers "
@"will be strict.");
NSLog(@"No separate class for the sloppy parser. All parsers will be strict.");
#endif
}
}
Expand Down
4 changes: 3 additions & 1 deletion GWSHash.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@
#import <GNUstepBase/NSData+GNUstepBase.h>
#endif

#include "config.h"
#if defined HAVE_CONFIG_H
#include <config.h>
#endif
#include <unistd.h>
#include <fcntl.h>

Expand Down
10 changes: 9 additions & 1 deletion GWSPrivate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,17 @@
//Let's add some very crude substitutions
#define NSDebugFLog(format, args...) NSLog(format, args)
#define NSDebugMLog(format, args...) NSLog(format, args)
#define NSWarnMLog(format, args...) NSLog(format, args)

#ifndef ASSIGN
#if !defined(RETAIN)
#define RETAIN(object) [object retain]
#define RELEASE(object) [object release]
#define AUTORELEASE(object) [object autorelease]
#define ASSIGN(object,value) object = (value)
#define ENTER_POOL {NSAutoreleasePool *_lARP=[NSAutoreleasePool new];
#define LEAVE_POOL [_lARP drain];}
#define CREATE_AUTORELEASE_POOL(X) \
NSAutoreleasePool *X = [NSAutoreleasePool new]
#endif


Expand Down
2 changes: 1 addition & 1 deletion GWSService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@

#if defined(GNUSTEP)
#import <GNUstepBase/NSURL+GNUstepBase.h>
#endif

static NSLock *handleLock = nil;
static NSMutableDictionary *handles = nil;
static unsigned handleCount = 0;
#endif

#define IOTHREADS 8
static BOOL useIOThreads = NO;
Expand Down
2 changes: 2 additions & 0 deletions WSSUsernameToken.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
#import "GWSPrivate.h"
#import "GWSHash.h"
#import "WSSUsernameToken.h"
#if defined HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdlib.h>

#if USE_NETTLE
Expand Down
50 changes: 36 additions & 14 deletions WebServices.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 42;
objectVersion = 46;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -34,7 +34,8 @@
79DC40BE0ED21ED9009451BF /* GWSPort.m in Sources */ = {isa = PBXBuildFile; fileRef = 79DC40B70ED21E79009451BF /* GWSPort.m */; };
79E778FE0D5BB5DE000C97BA /* GWSDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 792C21700D55B94900459A2C /* GWSDocument.m */; };
79E778FF0D5BB5E1000C97BA /* GWSDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = 792C216F0D55B94900459A2C /* GWSDocument.h */; settings = {ATTRIBUTES = (Public, ); }; };
8591FB731A12E2F300923420 /* Performance.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8591FA991A12E27A00923420 /* Performance.framework */; };
858EE77329FA8BB2001851AB /* Performance.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8591FA991A12E27A00923420 /* Performance.framework */; };
858EE77529FA9149001851AB /* libgnutls.30.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 858EE77429FA9149001851AB /* libgnutls.30.dylib */; };
8591FBC71A12E74600923420 /* GWSHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 8591FBC41A12E74600923420 /* GWSHash.h */; settings = {ATTRIBUTES = (Public, ); }; };
8591FBC81A12E74600923420 /* GWSHash.m in Sources */ = {isa = PBXBuildFile; fileRef = 8591FBC51A12E74600923420 /* GWSHash.m */; };
8591FBE61A12E85800923420 /* GWSJSONCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 8591FBE31A12E85800923420 /* GWSJSONCoder.m */; };
Expand Down Expand Up @@ -87,6 +88,7 @@
792C21700D55B94900459A2C /* GWSDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GWSDocument.m; sourceTree = "<group>"; };
79DC40B70ED21E79009451BF /* GWSPort.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GWSPort.m; sourceTree = "<group>"; };
79DC40B80ED21E79009451BF /* GWSPort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWSPort.h; sourceTree = "<group>"; };
858EE77429FA9149001851AB /* libgnutls.30.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgnutls.30.dylib; path = /opt/local/lib/libgnutls.30.dylib; sourceTree = "<absolute>"; };
8591FA991A12E27A00923420 /* Performance.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Performance.framework; path = /Library/Frameworks/Performance.framework; sourceTree = "<absolute>"; };
8591FBC41A12E74600923420 /* GWSHash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GWSHash.h; sourceTree = "<group>"; };
8591FBC51A12E74600923420 /* GWSHash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GWSHash.m; sourceTree = "<group>"; };
Expand All @@ -111,8 +113,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
858EE77529FA9149001851AB /* libgnutls.30.dylib in Frameworks */,
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
8591FB731A12E2F300923420 /* Performance.framework in Frameworks */,
858EE77329FA8BB2001851AB /* Performance.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -144,6 +147,7 @@
0867D69AFE84028FC02AAC07 /* External Frameworks and Libraries */ = {
isa = PBXGroup;
children = (
858EE77429FA9149001851AB /* libgnutls.30.dylib */,
1058C7B0FEA5585E11CA2CBB /* Linked Frameworks */,
1058C7B2FEA5585E11CA2CBB /* Other Frameworks */,
);
Expand Down Expand Up @@ -292,8 +296,10 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
attributes = {
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "WebServices" */;
compatibilityVersion = "Xcode 2.4";
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
Expand Down Expand Up @@ -380,37 +386,53 @@
1DEB91AE08733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(LOCAL_LIBRARY_DIR)/Frameworks",
);
FRAMEWORK_VERSION = A;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = WebServices_Prefix.pch;
HEADER_SEARCH_PATHS = /opt/local/include/;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Frameworks";
LIBRARY_SEARCH_PATHS = (
/opt/local/lib/,
/opt/local/lib,
);
PRODUCT_NAME = WebServices;
WRAPPER_EXTENSION = framework;
ZERO_LINK = YES;
};
name = Debug;
};
1DEB91AF08733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD)";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(LOCAL_LIBRARY_DIR)/Frameworks",
);
FRAMEWORK_VERSION = A;
GCC_ENABLE_EXCEPTIONS = YES;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = WebServices_Prefix.pch;
HEADER_SEARCH_PATHS = /opt/local/include/;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Library/Frameworks";
LIBRARY_SEARCH_PATHS = (
/opt/local/lib/,
/opt/local/lib,
);
PRODUCT_NAME = WebServices;
WRAPPER_EXTENSION = framework;
};
Expand All @@ -419,25 +441,25 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
ARCHS = "$(ARCHS_STANDARD)";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
SDKROOT = macosx;
SYMROOT = "$(PROJECT_DIR)/build";
};
name = Debug;
};
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
ARCHS = "$(ARCHS_STANDARD)";
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
PREBINDING = NO;
SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
SDKROOT = macosx;
SYMROOT = "$(PROJECT_DIR)/build";
};
name = Release;
Expand Down