compiles with GNUstep, doesn't link yet

Author: mpw

GNUmakefile

@@ -4,9 +4,10 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 LIBRARY_NAME = libMPWXmlKit
 
+OBJCFLAGS += -Wno-import -fobjc-runtime=gnustep
+
 libMPWXmlKit_HEADER_FILES = \
 MPWSaxProtocol.h\
-MPWXMLAttributeGenerator.h\
 MPWXmlAppleProplistGenerator.h\
 MPWXmlAppleProplistReader.h\
 MPWXmlArchiver.h\
@@ -41,23 +42,20 @@ libMPWXmlKit_HEADER_FILES_DIR = .
 libMPWXmlKit_HEADER_FILES_INSTALL_DIR = /MPWXmlKit
 
 libMPWXmlKit_OBJC_FILES = \
-MPWXMLAttributeGenerator.m MPWXmlAppleProplistGenerator.m\
-MPWXmlAppleProplistReader.m\
-MPWXmlArchiver.m MPWXmlAttribute.m MPWXmlAttributes.m\
-MPWXmlCloseTag.m MPWXmlDomParser.m MPWXmlElement.m\
-MPWXmlEntityReference.m MPWXmlGeneratorStream.m\
+ MPWXmlAppleProplistGenerator.m\
+MPWXmlArchiver.m MPWXmlAttributes.m\
+MPWXmlGeneratorStream.m\
 MPWXmlParser.m \
 MPWXmlProplistGenerator.m MPWXmlSaxScanner.m\
 MPWXmlScanner.m \
-MPWXmlStartTag.m\
-MPWXmlTag.m MPWXmlTag2ElementProcessor.m\
 MPWXmlUnarchiver.m MPWXmlWrapperArchiver.m\
 MPWXmlWrapperUnarchiver.m\
 
+
 libMPWXmlKit_LIBRARIES_DEPEND_UPON += \
 -lMPWFoundation -lgnustep-base -lobjc
 
-libMPWXmlKit_INCLUDE_DIRS += -I. -I..
+libMPWXmlKit_INCLUDE_DIRS += -I. -I.. -I../MPWFoundation/.headers/
 libMPWXmlKit_OBJCFLAGS += -Wno-import
 libMPWXmlKit_CFLAGS += -Wno-import
 

MPWFoundation_support/MPWFastInvocation.m

@@ -179,11 +179,11 @@ -(void)dealloc
 
 @end
 
-@interface MPWConvenientInvocation : NSInvocation {}
+@interface NSInvocation(convenience)
 -resultOfInvoking;
 @end
 
-@implementation MPWConvenientInvocation
+@implementation NSInvocation(convenience)
 
 -resultOfInvoking
 {
@@ -322,7 +322,7 @@ +(void)testCachedInvocationFasterThanMessaging
 }
 MPWRusage* fastTime=[MPWRusage timeRelativeTo:fastStart];
 double ratio = (double)[slowTime userMicroseconds] / (double)[fastTime userMicroseconds];
-NSLog(@"cached invocation (%d) vs. plain message send (%d): %g x faster than normal message send",(int)[fastTime userMicroseconds],(int)[slowTime userMicroseconds],ratio);
+NSLog(@"cached invocation (%d) vs. plain message send (%d): %g x speed of normal message send",(int)[fastTime userMicroseconds],(int)[slowTime userMicroseconds],ratio);
 NSAssert2( ratio > 0.2 ,@"ratio of cached fast invocation to normal message send %g < %g",
 ratio,0.2);
 }

MPWXmlArchiver.m

@@ -211,7 +211,7 @@ -(void)encodeValueOfObjCType:(const char *)itemType at:(const void*)address with
  case 'I':
  valueType=@"valuetype='i'";
 // content = [NSString stringWithFormat:@"%D",*(unsigned int*)address];
- sprintf(charcontent, "%D",*(unsigned int*)address);
+ sprintf(charcontent, "%u",*(unsigned int*)address);
 
  break;
  case 'q':
@@ -228,7 +228,7 @@ -(void)encodeValueOfObjCType:(const char *)itemType at:(const void*)address with
  case 'S':
  valueType=@"valuetype='S'";
 // content = [NSString stringWithFormat:@"%D",*(unsigned short*)address];
- sprintf(charcontent, "%D",*(unsigned short*)address);
+ sprintf(charcontent, "%u",*(unsigned short*)address);
  break;
  case 'f':
  valueType=@"valuetype='f'";

MPWXmlParser.m

@@ -123,7 +123,11 @@ -(BOOL)attributeName:(const char*)nameStart length:(long)nameLen value:(const ch
 id name = MAKEDATA( nameStart, nameLen );
 id value=nil;
 if ( autotranslateUTF8 && highBit) {
+#ifdef GS_API_LATEST
+ value = [[[NSString alloc] initWithBytes:valueStart length:valueLen encoding:NSUTF8StringEncoding] autorelease];
+#else
  value = [(id)CFStringCreateWithBytes(NULL, (const unsigned char*)valueStart, valueLen, kCFStringEncodingUTF8, NO) autorelease];
+#endif
 }
 if (! value ) {
 value = MAKEDATA( valueStart, valueLen );

ObjectiveXML.xcodeproj/project.pbxproj

@@ -955,6 +955,7 @@
 1F2DB6B40AB0C52C00DA2427 /* entity_runon.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = entity_runon.txt; sourceTree = "<group>"; };
 1F2DB6C70AB0C65700DA2427 /* close_tag_not_closed.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = close_tag_not_closed.html; sourceTree = "<group>"; };
 1F2DB6C80AB0C65700DA2427 /* close_tag_not_closed.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = close_tag_not_closed.txt; sourceTree = "<group>"; };
+1F2F5B3421EF426C00AB0858 /* GNUmakefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GNUmakefile; sourceTree = "<group>"; };
 1F3466670E09BB04001FBB20 /* nested.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = nested.xml; sourceTree = "<group>"; };
 1F3519A90E05766900A730BF /* revision3-diggnation-quicktime.rss */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "revision3-diggnation-quicktime.rss"; sourceTree = "<group>"; };
 1F36076D0AC9CD51007B4CA2 /* meta_attributes.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = meta_attributes.html; sourceTree = "<group>"; };
@@ -1403,6 +1404,7 @@
 07DF1A4300668979C35ADD82 /* Supporting Files */ = {
 isa = PBXGroup;
 children = (
+1F2F5B3421EF426C00AB0858 /* GNUmakefile */,
 1FB43C5B10BFBCA700490AA6 /* dllmain.m */,
 07DF1A4700668979C35ADD82 /* m.template */,
 07DF1A4800668979C35ADD82 /* h.template */,

makeheaderdir

@@ -0,0 +1,5 @@
+#!/bin/sh
+mkdir -p .headers
+cd .headers
+apply 'ln -s %1' `find .. -type f -name '*.h' `
+ln -s . ObjectiveXML