From cfed10bbac26247e8523d4541be3798727203469 Mon Sep 17 00:00:00 2001 From: Ross Boucher Date: Sat, 16 May 2009 16:18:26 -0700 Subject: [PATCH 1/3] Add bezier path to appkit.j, fix slight code bug --- AppKit/AppKit.j | 1 + AppKit/CPBezierPath.j | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AppKit/AppKit.j b/AppKit/AppKit.j index e39fd3971..0c67725cb 100644 --- a/AppKit/AppKit.j +++ b/AppKit/AppKit.j @@ -24,6 +24,7 @@ @import "CPAlert.j" @import "CPAnimation.j" @import "CPApplication.j" +@import "CPBezierPath.j" @import "CPButton.j" @import "CPButtonBar.j" @import "CPCib.j" diff --git a/AppKit/CPBezierPath.j b/AppKit/CPBezierPath.j index 0c84a545f..da2b71d34 100644 --- a/AppKit/CPBezierPath.j +++ b/AppKit/CPBezierPath.j @@ -130,8 +130,8 @@ var DefaultLineWidth = 1.0; CGContextBeginPath(ctx); CGContextAddPath(ctx, _path); CGContextSetLineWidth(ctx, [self lineWidth]); - CGContextStrokePath(ctx); CGContextClosePath(ctx); + CGContextStrokePath(ctx); } - (void)fill @@ -141,8 +141,8 @@ var DefaultLineWidth = 1.0; CGContextBeginPath(ctx); CGContextAddPath(ctx, _path); CGContextSetLineWidth(ctx, [self lineWidth]); - CGContextFillPath(ctx); CGContextClosePath(ctx); + CGContextFillPath(ctx); } - (float)lineWidth From 83cdbec1d3ca8b4c8038882ce2fa9547cdaad033 Mon Sep 17 00:00:00 2001 From: Ross Boucher Date: Sat, 16 May 2009 16:51:05 -0700 Subject: [PATCH 2/3] Fix for broken cgcontext (stroke/fill ellipse) --- AppKit/CoreGraphics/CGContext.j | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AppKit/CoreGraphics/CGContext.j b/AppKit/CoreGraphics/CGContext.j index b2586c435..2e883ec61 100644 --- a/AppKit/CoreGraphics/CGContext.j +++ b/AppKit/CoreGraphics/CGContext.j @@ -542,7 +542,9 @@ function CGContextAddEllipseInRect(aContext, aRect) */ function CGContextFillEllipseInRect(aContext, aRect) { + CGContextBeginPath(aContext); CGContextAddEllipseInRect(aContext, aRect); + CGContextClosePath(aContext); CGContextFillPath(aContext); } @@ -554,7 +556,9 @@ function CGContextFillEllipseInRect(aContext, aRect) */ function CGContextStrokeEllipseInRect(aContext, aRect) { + CGContextBeginPath(aContext); CGContextAddEllipseInRect(aContext, aRect); + CGContextClosePath(aContext); CGContextStrokePath(aContext); } From d4436acea3c97a3f78b812e41c5dd08a833cc4c6 Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Sat, 16 May 2009 17:37:09 -0700 Subject: [PATCH 3/3] Switch browser.js to browserjs. Fix External build problems --- .gitmodules | 12 +++++----- External/Rakefile | 37 ++++++++++++++---------------- External/{browser.js => browserjs} | 0 Objective-J/Tools/Rakefile | 13 +++++------ 4 files changed, 29 insertions(+), 33 deletions(-) rename External/{browser.js => browserjs} (100%) diff --git a/.gitmodules b/.gitmodules index 5b193388c..49f4e2d17 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "External/narwhal"] path = External/narwhal url = git://github.com/tlrobinson/narwhal.git -[submodule "External/browser.js"] - path = External/browser.js - url = git://github.com/tlrobinson/browser.js.git -[submodule "External/ojunit"] - path = External/ojunit - url = git://github.com/280north/ojunit.git [submodule "External/jack"] path = External/jack url = git://github.com/tlrobinson/jack.git +[submodule "External/browserjs"] + path = External/browserjs + url = git://github.com/tlrobinson/browserjs.git +[submodule "External/ojunit"] + path = External/ojunit + url = git://github.com/280north/ojunit.git diff --git a/External/Rakefile b/External/Rakefile index d976681e0..206559362 100644 --- a/External/Rakefile +++ b/External/Rakefile @@ -8,36 +8,33 @@ require 'rake/clean' require 'fileutils' $ENVIRONMENT_NARWHAL_PRODUCT = File.join($ENVIRONMENT_DIR, 'narwhal') -$ENVIRONMENT_BROWSERJS_PRODUCT = File.join($ENVIRONMENT_NARWHAL_PRODUCT, 'packages', 'browser') +$ENVIRONMENT_BROWSERJS_PRODUCT = File.join($ENVIRONMENT_NARWHAL_PRODUCT, 'packages', 'browserjs') $ENVIRONMENT_JACK_PRODUCT = File.join($ENVIRONMENT_NARWHAL_PRODUCT, 'packages', 'jack') $ENVIRONMENT_NARWHAL_EXECUTABLE = File.join($ENVIRONMENT_BIN_DIR, 'narwhal') -file_d $ENVIRONMENT_NARWHAL_PRODUCT do - cp_r('narwhal', $ENVIRONMENT_NARWHAL_PRODUCT) +file_d $ENVIRONMENT_DIR do + mkdir_p $ENVIRONMENT_DIR end -file_d $ENVIRONMENT_NARWHAL_EXECUTABLE => [$ENVIRONMENT_NARWHAL_PRODUCT] do +file_d $ENVIRONMENT_NARWHAL_EXECUTABLE do FileUtils.ln_sf('../narwhal/bin/narwhal', $ENVIRONMENT_NARWHAL_EXECUTABLE) end -file_d $ENVIRONMENT_BROWSERJS_PRODUCT => [$ENVIRONMENT_NARWHAL_PRODUCT] do - cp_r('browser.js', $ENVIRONMENT_BROWSERJS_PRODUCT) -end - -file_d $ENVIRONMENT_JACK_PRODUCT => [$ENVIRONMENT_NARWHAL_PRODUCT] do - cp_r('jack', $ENVIRONMENT_JACK_PRODUCT) -end - task :update_submodules do - if executable_exists? "git" - system %{cd .. && git submodule update --init} - else - puts "Git not installed" - rake abort - end + if executable_exists? "git" + system %{cd .. && git submodule update --init} + else + puts "Git not installed" + rake abort + end end -task :build => [:update_submodules, $ENVIRONMENT_NARWHAL_PRODUCT, $ENVIRONMENT_BROWSERJS_PRODUCT, $ENVIRONMENT_JACK_PRODUCT, $ENVIRONMENT_NARWHAL_EXECUTABLE] +task :build => [:update_submodules, $ENVIRONMENT_DIR, $ENVIRONMENT_NARWHAL_EXECUTABLE] do + rm_rf($ENVIRONMENT_NARWHAL_PRODUCT) + cp_r('narwhal', $ENVIRONMENT_NARWHAL_PRODUCT) + cp_r('browserjs', $ENVIRONMENT_BROWSERJS_PRODUCT) + cp_r('jack', $ENVIRONMENT_JACK_PRODUCT) +end -CLOBBER.include($ENVIRONMENT_NARWHAL_PRODUCT, $ENVIRONMENT_BROWSERJS_PRODUCT, $ENVIRONMENT_JACK_PRODUCT, $ENVIRONMENT_NARWHAL_EXECUTABLE) +CLOBBER.include($ENVIRONMENT_NARWHAL_PRODUCT, $ENVIRONMENT_NARWHAL_EXECUTABLE) diff --git a/External/browser.js b/External/browserjs similarity index 100% rename from External/browser.js rename to External/browserjs diff --git a/Objective-J/Tools/Rakefile b/Objective-J/Tools/Rakefile index 9f4a800d2..5a45b4ef5 100644 --- a/Objective-J/Tools/Rakefile +++ b/Objective-J/Tools/Rakefile @@ -14,10 +14,6 @@ $OBJJC_JS_COMPILER_RHINO = File.join($ENVIRONMENT_LIB_DIR, 'js.jar') $EXECUTABLES = ['objj', 'objjc', 'plutil'] $EXECUTABLES_PRODUCTS = $EXECUTABLES.map {|e| File.join($ENVIRONMENT_BIN_DIR, e) } -file_d $ENVIRONMENT_OBJJ_PRODUCT do - cp_r('objj', $ENVIRONMENT_OBJJ_PRODUCT) -end - $EXECUTABLES.each do |executable| source = File.join('objj', 'bin', executable) dest = File.join($ENVIRONMENT_BIN_DIR, executable) @@ -28,13 +24,16 @@ $EXECUTABLES.each do |executable| end file_d $OBJJC_JS_COMPILER => 'shrinksafe.jar' do - cp('shrinksafe.jar', $OBJJC_JS_COMPILER) + cp('shrinksafe.jar', $OBJJC_JS_COMPILER) end file_d $OBJJC_JS_COMPILER_RHINO => 'js.jar' do - cp('js.jar', $OBJJC_JS_COMPILER_RHINO) + cp('js.jar', $OBJJC_JS_COMPILER_RHINO) end -task :build => [$ENVIRONMENT_OBJJ_PRODUCT, $OBJJC_JS_COMPILER, $OBJJC_JS_COMPILER_RHINO].concat($EXECUTABLES_PRODUCTS) +task :build => [$OBJJC_JS_COMPILER, $OBJJC_JS_COMPILER_RHINO].concat($EXECUTABLES_PRODUCTS) do + rm_rf($ENVIRONMENT_OBJJ_PRODUCT) + cp_r('objj', $ENVIRONMENT_OBJJ_PRODUCT) +end CLOBBER.include($ENVIRONMENT_OBJJ_PRODUCT, $EXECUTABLES_PRODUCTS, $OBJJC_JS_COMPILER, $OBJJC_JS_COMPILER_RHINO)