Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 6 commits
  • 48 files changed
  • 0 commit comments
  • 3 contributors
Commits on Jan 17, 2010
Laurent Sansonetti tagging trunk for 0.5 release line
git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/branches/0.5@3285 23306eb0-4c56-4727-a40e-e92c0eb68959
0745201
Commits on Jan 20, 2010
Laurent Sansonetti removing hotcocoa_template
git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/branches/0.5@3310 23306eb0-4c56-4727-a40e-e92c0eb68959
a0dc8af
@alloy alloy Revert "Make RubyGems use ‘--format-executable’ by default, so binari…
…es get installed with the ‘mac’ prefix."

This reverts commit 3180.

git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/branches/0.5@3314 23306eb0-4c56-4727-a40e-e92c0eb68959
c7b6f56
Commits on Jan 21, 2010
@drernie drernie Updated copyrights for 2010
git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/branches/0.5@3318 23306eb0-4c56-4727-a40e-e92c0eb68959
5367956
Commits on Jan 31, 2010
Laurent Sansonetti backporting symbolication fixes from trunk
git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/branches/0.5@3381 23306eb0-4c56-4727-a40e-e92c0eb68959
bf286a6
Laurent Sansonetti backported a fix from trunk
git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/branches/0.5@3382 23306eb0-4c56-4727-a40e-e92c0eb68959
8b853cb
View
2 TODO
@@ -9,7 +9,7 @@ For 0.5 beta 3:
[X] non-ASCII regexp
[/] 32-bit should be back
[X] macruby should support #require calls when assembling a binary
-[ ] change copyright headers for 2010
+[X] change copyright headers for 2010
For 0.5 (must do):
View
2 array.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 1993-2007 Yukihiro Matsumoto
* Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
View
2 bin/rb_nibtool
@@ -4,7 +4,7 @@
#
# This file is covered by the Ruby license.
#
-# Copyright (C) 2008-2009, Apple Inc
+# Copyright (C) 2008-2010, Apple Inc
require 'optparse'
require 'ripper/filter'
View
2 bin/ruby_deploy
@@ -3,7 +3,7 @@
#
# This file is covered by the Ruby license.
#
-# Copyright (C) 2009, Apple Inc
+# Copyright (C) 2009-2010, Apple Inc
require 'optparse'
require 'rbconfig'
View
2 bin/rubyc
@@ -3,7 +3,7 @@
#
# This file is covered by the Ruby license.
#
-# Copyright (C) 2009, Apple Inc
+# Copyright (C) 2009-2010, Apple Inc
require 'optparse'
require 'rbconfig'
View
2 bridgesupport.cpp
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
*/
#include <llvm/Module.h>
View
2 bridgesupport.h
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
*/
#ifndef __BRIDGESUPPORT_H_
View
2 bs.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2009, Apple Inc. All rights reserved.
+ * Copyright (c) 2008-2010, Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
View
2 bs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2009, Apple Inc. All rights reserved.
+ * Copyright (c) 2008-2010, Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
View
2 class.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 1993-2007 Yukihiro Matsumoto
* Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
View
2 compiler.cpp
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2008-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2010, Apple Inc. All rights reserved.
*/
#define ROXOR_COMPILER_DEBUG 0
View
2 compiler.h
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2008-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2010, Apple Inc. All rights reserved.
*/
#ifndef __COMPILER_H_
View
4 data/hotcocoa_template/Rakefile
@@ -1,4 +0,0 @@
-require 'hotcocoa/application_builder'
-require 'hotcocoa/standard_rake_tasks'
-
-task :default => [:run]
View
8 data/hotcocoa_template/config/build.yml
@@ -1,8 +0,0 @@
-name: __APPLICATION_NAME__
-load: lib/application.rb
-version: "1.0"
-icon: resources/HotCocoa.icns
-resources:
- - resources/**/*.*
-sources:
- - lib/**/*.rb
View
44 data/hotcocoa_template/lib/application.rb
@@ -1,44 +0,0 @@
-require 'hotcocoa'
-
-# Replace the following code with your own hotcocoa code
-
-class Application
-
- include HotCocoa
-
- def start
- application :name => "__APPLICATION_NAME__" do |app|
- app.delegate = self
- window :frame => [100, 100, 500, 500], :title => "__APPLICATION_NAME__" do |win|
- win << label(:text => "Hello from HotCocoa", :layout => {:start => false})
- win.will_close { exit }
- end
- end
- end
-
- # file/open
- def on_open(menu)
- end
-
- # file/new
- def on_new(menu)
- end
-
- # help menu item
- def on_help(menu)
- end
-
- # This is commented out, so the minimize menu item is disabled
- #def on_minimize(menu)
- #end
-
- # window/zoom
- def on_zoom(menu)
- end
-
- # window/bring_all_to_front
- def on_bring_all_to_front(menu)
- end
-end
-
-Application.new.start
View
32 data/hotcocoa_template/lib/menu.rb
@@ -1,32 +0,0 @@
-module HotCocoa
- def application_menu
- menu do |main|
- main.submenu :apple do |apple|
- apple.item :about, :title => "About #{NSApp.name}"
- apple.separator
- apple.item :preferences, :key => ","
- apple.separator
- apple.submenu :services
- apple.separator
- apple.item :hide, :title => "Hide #{NSApp.name}", :key => "h"
- apple.item :hide_others, :title => "Hide Others", :key => "h", :modifiers => [:command, :alt]
- apple.item :show_all, :title => "Show All"
- apple.separator
- apple.item :quit, :title => "Quit #{NSApp.name}", :key => "q"
- end
- main.submenu :file do |file|
- file.item :new, :key => "n"
- file.item :open, :key => "o"
- end
- main.submenu :window do |win|
- win.item :minimize, :key => "m"
- win.item :zoom
- win.separator
- win.item :bring_all_to_front, :title => "Bring All to Front", :key => "o"
- end
- main.submenu :help do |help|
- help.item :help, :title => "#{NSApp.name} Help"
- end
- end
- end
-end
View
BIN data/hotcocoa_template/resources/HotCocoa.icns
Binary file not shown.
View
2 dispatcher.cpp
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2008-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2010, Apple Inc. All rights reserved.
*/
#include "llvm.h"
View
2 encoding.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 1993-2007 Yukihiro Matsumoto
* Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
View
2 eval.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 1993-2007 Yukihiro Matsumoto
* Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
View
2 ext/libyaml/rubyext.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2009-2010, Apple Inc. All rights reserved.
*/
#include "ruby/ruby.h"
View
2 ext/zlib/zlib.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) UENO Katsuhiro 2000-2003
*/
View
2 gc-stub.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008-2009, Apple Inc. All rights reserved.
+ * Copyright (c) 2008-2010, Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
View
2 gc.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 1993-2007 Yukihiro Matsumoto
* Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
View
2 gcd.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2009-2010, Apple Inc. All rights reserved.
*/
#include "ruby.h"
View
2 hash.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 1993-2007 Yukihiro Matsumoto
* Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
View
2 io.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 1993-2007 Yukihiro Matsumoto
* Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
View
2 lib/iconv.rb
@@ -2,7 +2,7 @@
#
# This file is covered by the Ruby license. See COPYING for more details.
#
-# Copyright (C) 2009, Apple Inc. All rights reserved.
+# Copyright (C) 2009-2010, Apple Inc. All rights reserved.
framework 'Foundation'
View
2 lib/rubygems/commands/install_command.rb
@@ -16,7 +16,7 @@ def initialize
defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({
:generate_rdoc => false,
:generate_ri => false,
- :format_executable => true, # MacRuby addition
+ :format_executable => false,
:test => false,
:version => Gem::Requirement.default,
})
View
2 lib/rubygems/dependency_installer.rb
@@ -18,7 +18,7 @@ class Gem::DependencyInstaller
:env_shebang => false,
:domain => :both, # HACK dup
:force => false,
- :format_executable => true, # MacRuby addition
+ :format_executable => false, # HACK dup
:ignore_dependencies => false,
:security_policy => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low?
:wrappers => true
View
13 lib/rubygems/installer.rb
@@ -90,13 +90,12 @@ def initialize(gem, options={})
@gem = gem
options = {
- :bin_dir => nil,
- :env_shebang => false,
- :exec_format => false,
- :force => false,
- :format_executable => true, # MacRuby addition
- :install_dir => Gem.dir,
- :source_index => Gem.source_index,
+ :bin_dir => nil,
+ :env_shebang => false,
+ :exec_format => false,
+ :force => false,
+ :install_dir => Gem.dir,
+ :source_index => Gem.source_index,
}.merge options
@env_shebang = options[:env_shebang]
View
2 lib/stringio.rb
@@ -2,7 +2,7 @@
#
# This file is covered by the Ruby license. See COPYING for more details.
#
-# Copyright (C) 2009, Apple Inc. All rights reserved.
+# Copyright (C) 2009-2010, Apple Inc. All rights reserved.
class StringIO
View
2 lib/strscan.rb
@@ -2,7 +2,7 @@
#
# This file is covered by the Ruby license. See COPYING for more details.
#
-# Copyright (C) 2009, Apple Inc. All rights reserved.
+# Copyright (C) 2009-2010, Apple Inc. All rights reserved.
class ScanError < StandardError; end
View
2 load.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2009-2010, Apple Inc. All rights reserved.
*/
#include <sys/stat.h>
View
2 main.cpp
@@ -1,7 +1,7 @@
/*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 1993-2007 Yukihiro Matsumoto
*/
View
2 markgc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2009, Apple Inc. All Rights Reserved.
+ * Copyright (c) 2007-2010, Apple Inc. All Rights Reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
View
2 objc.h
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
*/
#ifndef __OBJC_H_
View
2 objc.m
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
*/
#include <Foundation/Foundation.h>
View
2 object.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 1993-2007 Yukihiro Matsumoto
* Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
View
2 proc.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 2004-2007 Koichi Sasada
*/
View
1 re.c
@@ -2188,6 +2188,7 @@ read_escaped_byte(const char **pp, const char *end, onig_errmsg_buffer err)
return code;
}
+__attribute__((noinline))
static int
unescape_escaped_nonascii(const char **pp, const char *end, rb_encoding *enc,
VALUE buf, rb_encoding **encp, onig_errmsg_buffer err)
View
2 sprintf.cpp
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 1993-2007 Yukihiro Matsumoto
* Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
View
2 string.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 1993-2007 Yukihiro Matsumoto
* Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
View
2 thread.c
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2009-2010, Apple Inc. All rights reserved.
* Copyright (C) 2004-2007 Koichi Sasada
*/
View
21 tool/update_copyrights.ruby
@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+require 'pp'
+LAST_YEAR=2009
+NEXT_YEAR=2010
+GREP="grep -il 'Copyright.*#{LAST_YEAR}.*Apple'"
+REPLACE="-e '/Copyright/ s^\-2009, Apple^\-2010, Apple^' -e '/Copyright/ s^2009, Apple^2009\-2010, Apple^'"
+BACKUP = "sedsave"
+
+files = []
+%w(rb c cpp h m).each do |ext|
+ files += `find . -name "*.#{ext}" -print0 | xargs -0 #{GREP}`.split "\n"
+end
+files += `#{GREP} bin/*`.split "\n"
+pp files
+p "Found #{files.size} copyrights to update"
+files.each do |file|
+ p "Updating copyright of #{file}"
+ `sed -i #{BACKUP} #{REPLACE} #{file}`
+end
+p "Removing backups"
+`find . -name "*#{BACKUP}" -delete`
View
2 variable.c
@@ -1,6 +1,6 @@
/* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2007-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2010, Apple Inc. All rights reserved.
* Copyright (C) 1993-2007 Yukihiro Matsumoto
* Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
* Copyright (C) 2000 Information-technology Promotion Agency, Japan
View
50 vm.cpp
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2008-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2010, Apple Inc. All rights reserved.
*/
#define ROXOR_VM_DEBUG 0
@@ -569,37 +569,40 @@ RoxorCore::symbolize_call_address(void *addr, void **startp, char *path,
*startp = start;
}
- if (name != NULL || path != NULL || ln != NULL) {
- std::map<IMP, rb_vm_method_node_t *>::iterator iter =
- ruby_imps.find((IMP)start);
- if (iter == ruby_imps.end()) {
- // TODO symbolize objc selectors
- return false;
- }
-
- rb_vm_method_node_t *node = iter->second;
+ if (f != NULL) {
if (ln != NULL) {
*ln = 0;
- if (f != NULL) {
- for (std::vector<RoxorFunction::Line>::iterator iter =
- f->lines.begin(); iter != f->lines.end(); ++iter) {
- if ((*iter).address == (uintptr_t)addr) {
- *ln = (*iter).line;
- break;
- }
+ for (std::vector<RoxorFunction::Line>::iterator iter =
+ f->lines.begin(); iter != f->lines.end(); ++iter) {
+ *ln = (*iter).line;
+ if ((*iter).address <= (uintptr_t)addr) {
+ break;
}
}
}
if (path != NULL) {
- if (f != NULL && f->file.size() > 0) {
- strncpy(path, f->file.c_str(), path_len);
+ strncpy(path, f->file.c_str(), path_len);
+ }
+ if (name != NULL) {
+ std::map<IMP, rb_vm_method_node_t *>::iterator iter =
+ ruby_imps.find((IMP)start);
+ if (iter == ruby_imps.end()) {
+ strncpy(name, "block", name_len);
}
else {
- strncpy(path, "core", path_len);
+ strncpy(name, sel_getName(iter->second->sel), name_len);
}
}
+ }
+ else {
+ if (ln != NULL) {
+ *ln = 0;
+ }
+ if (path != NULL) {
+ strncpy(path, "core", path_len);
+ }
if (name != NULL) {
- strncpy(name, sel_getName(node->sel), name_len);
+ name[0] = '\0';
}
}
@@ -3531,8 +3534,11 @@ rb_vm_backtrace(int level)
char name[100];
unsigned long ln = 0;
+ path[0] = name[0] = '\0';
+
if (GET_CORE()->symbolize_call_address(callstack[i], NULL,
- path, sizeof path, &ln, name, sizeof name)) {
+ path, sizeof path, &ln, name, sizeof name)
+ && path[0] != '\0' && name[0] != '\0') {
char entry[PATH_MAX];
if (ln == 0) {
snprintf(entry, sizeof entry, "%s:in `%s'",
View
2 vm.h
@@ -3,7 +3,7 @@
*
* This file is covered by the Ruby license. See COPYING for more details.
*
- * Copyright (C) 2008-2009, Apple Inc. All rights reserved.
+ * Copyright (C) 2008-2010, Apple Inc. All rights reserved.
*/
#ifndef __VM_H_

No commit comments for this range

Something went wrong with that request. Please try again.