@@ -34,15 +34,13 @@ ifeq ($(SYSTEM), Darwin) endif FRAMEWORKS = -framework Cocoa LIBS = -lobjc -lpcre -lreadline - LIBDIRS = ifeq ($(shell test -d $(PREFIX)/lib && echo yes), yes) LIBDIRS += -L$(PREFIX)/lib endif else - INCLUDES += -I/usr/include/GNUstep/Headers FRAMEWORKS = LIBS = -lm -lpcre -lreadline -lgnustep-base - LIBDIRS += -L/usr/lib/GNUstep/System/Library/Libraries + LIBDIRS = endif C_FILES = $(wildcard objc/*.c) @@ -58,13 +56,18 @@ ifeq ($(SYSTEM), Darwin) CFLAGS += -DMACOSX -DDARWIN $(LEOPARD_CFLAGS) else CFLAGS += -DLINUX - MFLAGS += -fconstant-string-class=NSConstantString +# MFLAGS += -fconstant-string-class=NSConstantString + MFLAGS += $(shell gnustep-config --objc-flags) endif LDFLAGS += $(FRAMEWORKS) LDFLAGS += $(LIBS) LDFLAGS += $(LIBDIRS) LDFLAGS += $(FFI_LIB) +ifeq ($(SYSTEM), Darwin) +else + LDFLAGS += $(shell gnustep-config --base-libs) +endif ifeq ($(SYSTEM), Linux) LDFLAGS += -lobjc Makefile @@ -36,15 +36,15 @@ END) ;; libraries (set @frameworks (NSMutableArray array)) (set @inc_dirs (NSMutableArray arrayWithList:(list "/usr/include"))) -(set @lib_dirs (NSMutableArray arrayWithList:(list "/usr/lib"))) +(set @lib_dirs (array)) ;; (NSMutableArray arrayWithList:(list "/usr/lib"))) (set @libs (NSMutableArray arrayWithList:(list "objc" "ffi" "pcre"))) (@inc_dirs addObjectsFromList:(list "./include" "./include/Nu")) (ifDarwin (then (@frameworks addObject:"Cocoa") (@libs addObject:"edit")) - (else (@libs addObjectsFromList:(list "readline" "m" "gnustep-base")) - (@inc_dirs addObject:"/usr/include/GNUstep/Headers") + (else (@libs addObjectsFromList:(list "readline" "m" )) + ;;(@inc_dirs addObject:"/usr/include/GNUstep/Headers") ;; this will be set by gnustep-config: ;; (@lib_dirs addObject:"/usr/lib/GNUstep/System/Library/Libraries") )) @@ -91,7 +91,7 @@ END) (ifDarwin (then (set @cflags "-Wall -g -O2 -DDARWIN -DMACOSX #{@sdk} #{@leopard} -std=gnu99") (set @mflags "-fobjc-exceptions")) ;; Want to try Apple's new GC? Add this: "-fobjc-gc" - (else (set @cflags "-Wall -DLINUX -g -std=gnu99 ") + (else (set @cflags "-Wall -DLINUX -g -std=gnu99 -fPIC") ;; (set @mflags "-fobjc-exceptions -fconstant-string-class=NSConstantString") (set @mflags ((NSString stringWithShellCommand:"gnustep-config --objc-flags") chomp)))) @@ -105,6 +105,7 @@ END) (set @ldflags ((list (cond ;; statically link in pcre since most people won't have it.. +(t nil) ((NSFileManager fileExistsNamed:"#{@pcre_prefix}/lib/libpcre.a") "#{@pcre_prefix}/lib/libpcre.a") ((NSFileManager fileExistsNamed:"/usr/lib/libpcre.a") "/usr/lib/libpcre.a") ((NSFileManager fileExistsNamed:"#{@prefix}/lib/libpcre.a") "#{@prefix}/lib/libpcre.a") Nukefile @@ -15,6 +15,7 @@ ;; See the License for the specific language governing permissions and ;; limitations under the License. +(global NSUTF8StringEncoding 4) (global NSLog (NuBridgedFunction functionWithName:"NSLog" signature:"v@")) ;; Warning! I want to deprecate these. nu/nu.nu @@ -482,9 +482,9 @@ extern id Nu__null; + (NSData *) dataWithShellCommand:(NSString *) command standardInput:(id) input { - char *input_template = strdup("/tmp/nuXXXXX"); + char *input_template = strdup("/tmp/nuXXXXXX"); char *input_filename = mktemp(input_template); - char *output_template = strdup("/tmp/nuXXXXX"); + char *output_template = strdup("/tmp/nuXXXXXX"); char *output_filename = mktemp(output_template); id returnValue = nil; if (input_filename || output_filename) { @@ -495,9 +495,17 @@ extern id Nu__null; if ([input isKindOfClass:[NSData class]]) [input writeToFile:inputFileName atomically:NO]; else if ([input isKindOfClass:[NSString class]]) +#ifdef DARWIN [input writeToFile:inputFileName atomically:NO encoding:NSUTF8StringEncoding error:nil]; +#else + [input writeToFile:inputFileName atomically:NO]; +#endif else +#ifdef DARWIN [[input stringValue] writeToFile:inputFileName atomically:NO encoding:NSUTF8StringEncoding error:nil]; +#else + [[input stringValue] writeToFile:inputFileName atomically:NO]; +#endif fullCommand = [NSString stringWithFormat:@"%@ < %@ > %@", command, inputFileName, outputFileName]; } else { @@ -509,6 +517,8 @@ extern id Nu__null; returnValue = [NSData dataWithContentsOfFile:outputFileName]; system([[NSString stringWithFormat:@"rm -f %@ %@", inputFileName, outputFileName] cStringUsingEncoding:NSUTF8StringEncoding]); } + free(input_template); + free(output_template); return returnValue; } #endif objc/extensions.m @@ -44,8 +44,8 @@ (imethod (id) testCbrt is (assert_equal 0 (NuMath cbrt:0)) (assert_equal 0 (cbrt 0)) - (assert_equal 1.5 (NuMath cbrt:3.375)) - (assert_equal 1.5 (cbrt 3.375)) + (assert_in_delta 1.5 (NuMath cbrt:3.375) 0.001) + (assert_in_delta 1.5 (cbrt 3.375) 0.001) (assert_in_delta 1.587 (NuMath cbrt:4) 0.001)) (imethod (id) testSquare is test/test_math.nu 47903b25eb7e8a9ac5a199b5a787d59413fb7d62 Tim Burks tim@neontology.com http://github.com/timburks/nu/commit/8c59e56b6ef2a2d268d023c14cd2f81097550625 8c59e56b6ef2a2d268d023c14cd2f81097550625 2009-08-18T18:25:44-07:00 2009-08-18T18:25:44-07:00 Updates to get a working build on Debian Lenny with gnustep-base-1.18.0 0b210acb5e1bdfc56a7fe84054ef773a8611781f Tim Burks tim@neontology.com