Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added --program-name configure option.

  • Loading branch information...
commit 1a8fa710f754764001cc3b0323902c347c970d56 1 parent e512065
@brixen brixen authored
View
12 configure
@@ -325,6 +325,10 @@ class Configure
o.doc "\n File system paths for installing Rubinius"
+ o.on "--program-name", "NAME", "Build Rubinius executable as NAME" do |name|
+ @program_name = name
+ end
+
o.on "-P", "--prefix", "PATH", "Install Rubinius in subdirectories of PATH" do |dir|
@prefixdir = expand_install_dir dir
end
@@ -1686,6 +1690,12 @@ Run 'rake' to build, test and install Rubinius.
EOM
end
+ if @program_name != "ruby"
+ program_links = "#{@program_name}, ruby"
+ else
+ program_links = "#{@program_name}"
+ end
+
@log.write <<-EOM
------------------------------------------------------------------
@@ -1698,7 +1708,7 @@ to your PATH or run commands directly from that directory.
Available commands are:
- #{@program_name}, ruby, rake, gem, irb, rdoc, ri
+ #{program_links}, rake, gem, irb, rdoc, ri
------------------------------------------------------------------
EOM
View
2  rakelib/gems.rake
@@ -7,7 +7,7 @@ namespace :gems do
if BUILD_CONFIG[:stagingdir]
rbx = "#{BUILD_CONFIG[:stagingdir]}#{BUILD_CONFIG[:bindir]}/#{BUILD_CONFIG[:program_name]}"
else
- rbx = "#{BUILD_CONFIG[:sourcedir]}/bin/rbx"
+ rbx = "#{BUILD_CONFIG[:sourcedir]}/bin/#{BUILD_CONFIG[:program_name]}"
end
gems = Dir["preinstalled-gems/*.gem"]
options = "--local --conservative --ignore-dependencies --no-rdoc --no-ri"
View
15 rakelib/install.rake
@@ -50,10 +50,14 @@ def install_bin(source, target)
# Create symlinks for common commands
begin
- ["ruby", "rake", "gem", "irb", "rdoc", "ri"].each do |command|
- name = "#{target}/#{BUILD_CONFIG[:bindir]}/#{command}"
- File.delete name if File.exists? name
- File.symlink BUILD_CONFIG[:program_name], name
+ program_name = BUILD_CONFIG[:program_name]
+
+ ["rbx", "ruby", "rake", "gem", "irb", "rdoc", "ri"].each do |name|
+ link = "#{target}/#{BUILD_CONFIG[:bindir]}/#{name}"
+ unless program_name == name
+ File.delete link if File.exists? link
+ File.symlink program_name, link
+ end
end
rescue NotImplementedError
# ignore
@@ -127,8 +131,9 @@ namespace :stage do
if BUILD_CONFIG[:stagingdir]
install_bin "#{BUILD_CONFIG[:sourcedir]}/vm/vm", BUILD_CONFIG[:stagingdir]
+ name = BUILD_CONFIG[:program_name]
mode = File::CREAT | File::TRUNC | File::WRONLY
- File.open("#{BUILD_CONFIG[:sourcedir]}/bin/rbx", mode, 0755) do |f|
+ File.open("#{BUILD_CONFIG[:sourcedir]}/bin/#{name}", mode, 0755) do |f|
f.puts <<-EOS
#!/bin/sh
#
View
1  vm/config.h
@@ -2,7 +2,6 @@
#define RBX_CONFIG
#include "gen/config.h"
-#include "gen/signature.h"
#include "detection.hpp"
#endif
View
1  vm/environment.cpp
@@ -1,4 +1,5 @@
#include "config.h"
+#include "signature.h"
#include "prelude.hpp"
#include "environment.hpp"
#include "config_parser.hpp"
Please sign in to comment.
Something went wrong with that request. Please try again.