@@ -29,39 +29,41 @@ END) (set @c_files (filelist "^objc/.*\.c$")) (set @m_files (filelist "^objc/.*\.m$")) (@m_files unionSet:(filelist "^baked/.*\.m$")) -(set @nu_files (filelist "^nu/.*\.nu$")) +(set @nu_files (filelist "^nu/.*\.nu$")) (set @icon_files (filelist "^lib/.*\.icns$")) (set @nib_files '("share/nu/resources/English.lproj/MainMenu.nib")) ;; libraries -(ifDarwin - (then (set @frameworks '("Cocoa")) - (set @libs '("edit" "ffi" )) - (set @lib_dirs (NSMutableArray arrayWithObject:"/usr/lib"))) - (else (set @frameworks nil) - (set @libs (list "readline" "ffi" "m" "gnustep-base" )) - (set @lib_dirs (NSMutableArray arrayWithList:(list "/usr/lib/GNUstep/System/Library/Libraries"))))) - -(if (NSFileManager directoryExistsNamed:"#{@prefix}/lib") (@lib_dirs addObject:"#{@prefix}/lib")) +(set @frameworks (NSMutableArray array)) +(set @inc_dirs (NSMutableArray arrayWithList:(list "/usr/include"))) +(set @lib_dirs (NSMutableArray arrayWithList:(list "/usr/lib"))) +(set @libs (NSMutableArray arrayWithList:(list "objc" "ffi" "pcre"))) -;; includes +(@inc_dirs addObjectsFromList:(list "./include" "./include/Nu")) (ifDarwin - (then (set @includes " -I ./include -I ./include/Nu ")) - (else (set @includes " -I ./include -I ./include/Nu -I /usr/local/include -I /usr/include/GNUstep/Headers"))) - -;; cc main.m -fobjc-exceptions -fconstant-string-class=NSConstantString -L/usr/local/lib -lobjc -Wl,--rpath -Wl,/usr/local/lib -I /usr/include/GNUstep/Headers -L/usr/lib/GNUstep/System/Library/Libraries/ -lgnustep-base + (then (@frameworks addObject:"Cocoa") + (@libs addObject:"edit")) + (else (@libs addObjectsFromList:(list "readline" "m" "gnustep-base")) + (@inc_dirs addObject:"/usr/include/GNUstep/Headers") + (@lib_dirs addObject:"/usr/lib/GNUstep/System/Library/Libraries"))) -(if (NSFileManager directoryExistsNamed:"#{@prefix}/include") (@includes appendString:" -I #{@prefix}/include")) +(if (NSFileManager directoryExistsNamed:"#{@prefix}/include") (@inc_dirs addObject:"#{@prefix}/include")) +(if (NSFileManager directoryExistsNamed:"#{@prefix}/lib") (@lib_dirs addObject:"#{@prefix}/lib")) (ifDarwin (then (if (NSFileManager fileExistsNamed:"/usr/lib/libffi.dylib") (then ;; Use the libffi that ships with OS X. - (@includes appendString:" -I /usr/include")) + (@inc_dirs addObject:"/usr/include/ffi")) (else ;; Use the libffi that is distributed with Nu. - (@includes appendString:" -I ./libffi/include") - (@lib_dirs addObject:"./libffi")))) - (else ;; Use the libffi that ships with Linux - (@includes appendString:" -I /usr/include"))) + (@inc_dirs addObject:"./libffi/include") + (@lib_dirs addObject:"./libffi"))))) + +(set @pcre_prefix "") +(let ((pcre_config ((NSString stringWithShellCommand:"which pcre-config 2>/dev/null") chomp))) + (if pcre_config + (then (set @pcre_prefix ((NSString stringWithShellCommand:"#{pcre_config} --prefix") chomp)) + (@inc_dirs addObject:"#{@pcre_prefix}/include") + (@lib_dirs addObject:"#{@pcre_prefix}/lib")))) ;; framework description (set @framework "Nu") @@ -81,7 +83,7 @@ END) (set @leopard "-DLEOPARD_OBJC2 -D__OBJC2__") ("-isysroot /Developer/SDKs/MacOSX10.5.sdk")) ((NSFileManager directoryExistsNamed:"/Developer/SDKs/MacOSX10.4u.sdk") - (" -isysroot /Developer/SDKs/MacOSX10.4u.sdk")) + ("-isysroot /Developer/SDKs/MacOSX10.4u.sdk")) (else ""))) (ifDarwin @@ -96,26 +98,23 @@ END) ;; or set this to just build for your chosen platform ;; (set @arch '("i386")) -(ifDarwin - (then (set @ldflags - ((list - (cond ;; statically link in pcre since most people won't have it.. - ((NSFileManager fileExistsNamed:"#{@prefix}/lib/libpcre.a") ("#{@prefix}/lib/libpcre.a")) - (else (NSException raise:"NukeBuildError" format:"Can't find static pcre library (libpcre.a)."))) - ((@frameworks map: (do (framework) " -framework #{framework}")) join) - ((@libs map: (do (lib) " -l#{lib}")) join) - ((@lib_dirs map: (do (libdir) " -L#{libdir}")) join)) - join))) - (else (set @ldflags - ((list - "-lgnustep-base -L /usr/lib/GNUstep/System/Library/Libraries -L/usr/local/lib -lobjc -Wl,--rpath -Wl,/usr/lib/GNUstep/System/Library/Libraries -Wl,--rpath -Wl,/usr/local/lib" - (cond ;; statically link in pcre since most people won't have it.. - ((NSFileManager fileExistsNamed:"/usr/lib/libpcre.a") "/usr/lib/libpcre.a") - ((NSFileManager fileExistsNamed:"#{@prefix}/lib/libpcre.a") ("#{@prefix}/lib/libpcre.a")) - (else (NSException raise:"NukeBuildError" format:"Can't find static pcre library (libpcre.a)."))) - ((@frameworks map: (do (framework) " -framework #{framework}")) join) - ((@libs map: (do (lib) " -l#{lib}")) join)) - join)))) +(set @includes + ((@inc_dirs map: (do (inc) " -I#{inc}")) join)) +(set @ldflags + ((list + (cond ;; statically link in pcre since most people won't have it.. + ((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") + (else (NSException raise:"NukeBuildError" format:"Can't find static pcre library (libpcre.a)."))) + ((@frameworks map: (do (framework) " -framework #{framework}")) join) + ((@libs map: (do (lib) " -l#{lib}")) join) + (ifDarwin + (then ((@lib_dirs map: + (do (libdir) " -L#{libdir}")) join)) + (else ((@lib_dirs map: + (do (libdir) " -L#{libdir} -Wl,--rpath #{libdir}")) join)))) + join)) (ifDarwin (set @public_headers (filelist "include/Nu/Nu.h"))) Nukefile @@ -8,45 +8,48 @@ require 'rake/clean' SYSTEM = `uname`.chomp -PREFIX = ENV["PREFIX"] ? ENV["PREFIX"] : "/usr/local" +PREFIX = ENV['PREFIX'] || '/usr/local' -if SYSTEM == "Darwin" - if File.exist? "/usr/lib/libffi.dylib" +@frameworks = [] +@inc_dirs = %w{./include} +@libs = %w{objc ffi pcre} +@lib_dirs = [] + +if SYSTEM == 'Darwin' + @frameworks << 'Cocoa' + @libs += %w{edit} +else + @libs += %w{readline m} +end + +@inc_dirs << "#{PREFIX}/include" if File.exist? "#{PREFIX}/include" +@lib_dirs << "#{PREFIX}/lib" if File.exists? "#{PREFIX}/lib" + +if SYSTEM == 'Darwin' + if File.exist? '/usr/lib/libffi.dylib' # Use the libffi that ships with OS X. - FFI_LIB = "-L/usr/lib -lffi" - FFI_INCLUDE = "-I /usr/include/ffi" - LEOPARD_CFLAGS = "-DLEOPARD_OBJC2" + @inc_dirs << '/usr/include/ffi' else # Use the libffi that is distributed with Nu. - FFI_LIB = "-L./libffi -lffi" - FFI_INCLUDE = "-I ./libffi/include" - LEOPARD_CFLAGS = "" + @inc_dirs << './libffi/include' + @lib_dirs << './libffi' end -else # Linux - # Use the libffi that is distributed with Linux. - FFI_LIB = "-lffi" - FFI_INCLUDE = "" - LEOPARD_CFLAGS = "" end -@includes = FFI_INCLUDE + " -I ./include " - -if SYSTEM == "Darwin" - @includes += " -I #{PREFIX}/include" if File.exist? "#{PREFIX}/include" - @frameworks = %w{Cocoa} - @libs = %w{objc pcre readline} - @lib_dirs = [] - @lib_dirs << "#{PREFIX}/lib" if File.exist? "#{PREFIX}/lib" -else - @includes += " -I /usr/local/include" - @frameworks = [] # %w{Cocoa} - @libs = %w{m pcre readline } - @lib_dirs = [] +PCRE_CONFIG = `which pcre-config 2>/dev/null`.chomp +if PCRE_CONFIG + prefix = `#{PCRE_CONFIG} --prefix`.chomp + @inc_dirs << "#{prefix}/include" + @lib_dirs << "#{prefix}/lib" end +@leopard_cflags = '' +if File.exists? '/Developer/SDKs/MacOSX10.5.sdk' + @leopard_cflags = '-DLEOPARD_OBJC2' +end -CLEAN.include("*/*.o") -CLOBBER.include("mininush") +CLEAN.include('*/*.o') +CLOBBER.include('mininush') @c_files = FileList['objc/*.c'] @objc_files = FileList['objc/*.m'] + FileList['main/*.m'] @@ -55,28 +58,28 @@ CLOBBER.include("mininush") @cc = "gcc" if SYSTEM == "Darwin" - @cflags = "-g -O2 -Wall -DMACOSX -DDARWIN -DMININUSH -std=gnu99 #{LEOPARD_CFLAGS}" + @cflags = "-g -O2 -Wall -DMACOSX -DDARWIN -DMININUSH -std=gnu99 #{@leopard_cflags}" @mflags = "-fobjc-exceptions" else - @cflags = "-g -O2 -Wall -DLINUX -DMININUSH -std=gnu99 #{LEOPARD_CFLAGS} " + @cflags = "-g -O2 -Wall -DLINUX -DMININUSH -std=gnu99 #{@leopard_cflags}" @mflags = "-fobjc-exceptions -fconstant-string-class=NSConstantString" end +@cflags += @inc_dirs.map {|inc| " -I#{inc}"}.join @ldflags = @frameworks.map {|framework| " -framework #{framework}"}.join @ldflags += @libs.map {|lib| " -l#{lib}"}.join @ldflags += @lib_dirs.map {|libdir| " -L#{libdir}"}.join -@ldflags += " #{FFI_LIB}" if SYSTEM == "Linux" @ldflags += " -lobjc -lNuFound" @ldflags += " -Wl,--rpath -Wl,/usr/local/lib" end rule ".o" => [".m"] do |t| - sh "#{@cc} #{@cflags} #{@mflags} #{@includes} -c -o #{t.name} #{t.source}" + sh "#{@cc} #{@cflags} #{@mflags} -c -o #{t.name} #{t.source}" end rule ".o" => [".c"] do |t| - sh "#{@cc} #{@cflags} #{@includes} -c -o #{t.name} #{t.source}" + sh "#{@cc} #{@cflags} -c -o #{t.name} #{t.source}" end file "mininush" => @gcc_objects do Rakefile 8e0f935014bd9476059b370df7798962b2733682 Martin Kuehl martin.kuehl@gmail.com http://github.com/timburks/nu/commit/ebe578b558c4431c51b87233949d8dc277573c57 ebe578b558c4431c51b87233949d8dc277573c57 2008-12-28T08:50:14-08:00 2008-12-21T15:31:09-08:00 • Simplify Rakefile and Nukefile • Add support for finding pcre via `pcre-config` bf18f7b20848416599f1e2e137d19c495859a947 Martin Kuehl martin.kuehl@gmail.com