Permalink
Browse files

Change RUBY_PLATFORM to SHOES_RUBY_ARCH

  • Loading branch information...
1 parent cd8f681 commit ef1b32128da6019d7687a30a38d6e70b5bc75e62 @wasnotrice wasnotrice committed Oct 25, 2011
Showing with 12 additions and 11 deletions.
  1. +2 −2 Gemfile.lock
  2. +3 −3 Rakefile
  3. +3 −2 lib/shoes/cache.rb
  4. +1 −1 make/darwin/env.rb
  5. +1 −1 make/linux/env.rb
  6. +1 −1 make/make.rb
  7. +1 −1 make/mingw/env.rb
View
@@ -13,10 +13,10 @@ GEM
json (>= 1.4.6)
json (1.6.1)
mechanize (2.0.1)
- net-http-digest_auth (>= 1.1.1, ~> 1.1)
+ net-http-digest_auth (~> 1.1, >= 1.1.1)
net-http-persistent (~> 1.8)
nokogiri (~> 1.4)
- webrobots (>= 0.0.9, ~> 0.0)
+ webrobots (~> 0.0, >= 0.0.9)
net-http-digest_auth (1.1.1)
net-http-persistent (1.9)
nokogiri (1.5.0)
View
@@ -123,13 +123,13 @@ task :build_os => [:build_skel, "dist/#{NAME}"]
task "shoes/version.h" do |t|
File.open(t.name, 'w') do |f|
- f << %{#define SHOES_RELEASE_ID #{RELEASE_ID}\n#define SHOES_RELEASE_NAME "#{RELEASE_NAME}"\n#define SHOES_REVISION #{REVISION}\n#define SHOES_BUILD_DATE #{Time.now.strftime("%Y%m%d")}\n#define SHOES_PLATFORM "#{RUBY_PLATFORM}"\n}
+ f << %{#define SHOES_RELEASE_ID #{RELEASE_ID}\n#define SHOES_RELEASE_NAME "#{RELEASE_NAME}"\n#define SHOES_REVISION #{REVISION}\n#define SHOES_BUILD_DATE #{Time.now.strftime("%Y%m%d")}\n#define SHOES_PLATFORM "#{SHOES_RUBY_ARCH}"\n}
end
end
task "dist/VERSION.txt" do |t|
File.open(t.name, 'w') do |f|
- f << %{shoes #{RELEASE_NAME.downcase} (0.r#{REVISION}) [#{RUBY_PLATFORM} Ruby#{RUBY_V}]}
+ f << %{shoes #{RELEASE_NAME.downcase} (0.r#{REVISION}) [#{SHOES_RUBY_ARCH} Ruby#{RUBY_V}]}
%w[DEBUG].each { |x| f << " +#{x.downcase}" if ENV[x] }
f << "\n"
end
@@ -290,7 +290,7 @@ namespace :osx do
FileList[rdir].each { |rlib| cp_r rlib, "dist/ruby/lib" }
end
%w[req/binject/ext/binject_c req/ftsearch/ext/ftsearchrt req/bloopsaphone/ext/bloops req/chipmunk/ext/chipmunk].
- each { |xdir| copy_ext_osx xdir, "dist/ruby/lib/#{RUBY_PLATFORM}" }
+ each { |xdir| copy_ext_osx xdir, "dist/ruby/lib/#{SHOES_RUBY_ARCH}" }
gdir = "dist/ruby/gems/#{RUBY_V}"
{'hpricot' => 'lib', 'json' => 'lib/json/ext', 'sqlite3' => 'lib'}.each do |gemn, xdir|
View
@@ -27,6 +27,7 @@
ENV['GEM_HOME'] = GEM_DIR
require 'rbconfig'
+SHOES_RUBY_ARCH = Config::CONFIG['arch']
config = {
'ruby_install_name' => "shoes --ruby",
'RUBY_INSTALL_NAME' => "shoes --ruby",
@@ -38,10 +39,10 @@
'psdir' => "#{DIR}/doc/${PACKAGE}",
'htmldir' => "#{DIR}/doc/${PACKAGE}",
'docdir' => "#{DIR}/doc/${PACKAGE}",
- 'archdir' => "#{DIR}/ruby/lib/#{RUBY_PLATFORM}",
+ 'archdir' => "#{DIR}/ruby/lib/#{SHOES_RUBY_ARCH}",
'sitedir' => SITE_LIB_DIR,
'sitelibdir' => SITE_LIB_DIR,
- 'sitearchdir' => "#{SITE_LIB_DIR}/#{RUBY_PLATFORM}",
+ 'sitearchdir' => "#{SITE_LIB_DIR}/#{SHOES_RUBY_ARCH}",
'LIBRUBYARG_STATIC' => "",
'libdir' => "#{DIR}",
'LDFLAGS' => "-L. -L#{DIR}"
View
@@ -29,7 +29,7 @@
LINUX_CFLAGS = %[-Wall -I#{ENV['SHOES_DEPS_PATH'] || "/usr"}/include #{CAIRO_CFLAGS} #{PANGO_CFLAGS} -I#{Config::CONFIG['archdir']}]
if Config::CONFIG['rubyhdrdir']
- LINUX_CFLAGS << " -I#{Config::CONFIG['rubyhdrdir']} -I#{Config::CONFIG['rubyhdrdir']}/#{Config::CONFIG['arch']}"
+ LINUX_CFLAGS << " -I#{Config::CONFIG['rubyhdrdir']} -I#{Config::CONFIG['rubyhdrdir']}/#{SHOES_RUBY_ARCH}"
end
LINUX_LIB_NAMES = %W[#{RUBY_SO} cairo pangocairo-1.0 gif]
View
@@ -22,7 +22,7 @@
LINUX_CFLAGS = %[-Wall -I#{ENV['SHOES_DEPS_PATH'] || "/usr"}/include #{CAIRO_CFLAGS} #{PANGO_CFLAGS} -I#{Config::CONFIG['archdir']}]
if Config::CONFIG['rubyhdrdir']
- LINUX_CFLAGS << " -I#{Config::CONFIG['rubyhdrdir']} -I#{Config::CONFIG['rubyhdrdir']}/#{RUBY_PLATFORM}"
+ LINUX_CFLAGS << " -I#{Config::CONFIG['rubyhdrdir']} -I#{Config::CONFIG['rubyhdrdir']}/#{SHOES_RUBY_ARCH}"
end
LINUX_LIB_NAMES = %W[#{RUBY_SO} cairo pangocairo-1.0 ungif]
View
@@ -61,7 +61,7 @@ def common_build
FileList[rdir].each { |rlib| cp_r rlib, "dist/ruby/lib" }
end
%w[req/binject/ext/binject_c req/ftsearch/ext/ftsearchrt req/bloopsaphone/ext/bloops req/chipmunk/ext/chipmunk].
- each { |xdir| copy_ext xdir, "dist/ruby/lib/#{RUBY_PLATFORM}" }
+ each { |xdir| copy_ext xdir, "dist/ruby/lib/#{SHOES_RUBY_ARCH}" }
gdir = "dist/ruby/gems/#{RUBY_V}"
{'hpricot' => 'lib', 'json' => 'lib/json/ext', 'sqlite3' => 'lib'}.each do |gemn, xdir|
View
@@ -23,7 +23,7 @@
PANGO_LIB = '-lpangocairo-1.0 -lpango-1.0 -lpangoft2-1.0 -lpangowin32-1.0'
LINUX_CFLAGS = %[-Wall -I#{ENV['SHOES_DEPS_PATH'] || "/usr"}/include #{CAIRO_CFLAGS} #{PANGO_CFLAGS} -I#{Config::CONFIG['archdir']}]
if Config::CONFIG['rubyhdrdir']
- LINUX_CFLAGS << " -I#{Config::CONFIG['rubyhdrdir']} -I#{Config::CONFIG['rubyhdrdir']}/#{RUBY_PLATFORM}"
+ LINUX_CFLAGS << " -I#{Config::CONFIG['rubyhdrdir']} -I#{Config::CONFIG['rubyhdrdir']}/#{SHOES_RUBY_ARCH}"
end
LINUX_LIB_NAMES = %W[#{RUBY_SO} cairo pangocairo-1.0 ungif]

0 comments on commit ef1b321

Please sign in to comment.