Skip to content
This repository has been archived by the owner on Aug 9, 2021. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
* origin/master:
  [✔] Fixed deprecation warning. [➠] Minor formatting.

Conflicts:
	Rakefile
  • Loading branch information
ferrous26 committed Apr 8, 2012
2 parents 9fa7f21 + 96d7b58 commit a1ae6e9
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ end

verbose(true)

desc "Same as all"
desc 'Same as all'
task :default => :all

desc "Build everything"
desc 'Build everything'
task :all => ['build', 'gem']

desc "Build CTParser"
desc 'Build CTParser'
task :build do
gcc = RbConfig::CONFIG['CC']
cflags = RbConfig::CONFIG['CFLAGS'] + ' ' + RbConfig::CONFIG['ARCH_FLAG']
cflags.sub!(/-O./, '-O3')
cflags << " -Wall"
cflags << ' -Wall'

Dir.chdir('ext/CTParser') do
sh "#{gcc} #{cflags} -fobjc-gc CTParser.m -c -o CTParser.o"
Expand All @@ -54,12 +54,12 @@ task :build do
end
end

desc "Clean packages and extensions"
desc 'Clean packages and extensions'
task :clean do
sh "rm -rf pkg ext/CTParser/*.o ext/CTParser/*.bundle lib/*.bundle"
sh 'rm -rf pkg ext/CTParser/*.o ext/CTParser/*.bundle lib/*.bundle'
end

desc "Install as a standard library"
desc 'Install as a standard library'
task :stdlib_install => [:build] do
prefix = (ENV['DESTDIR'] || '')
dest = File.join(prefix, RbConfig::CONFIG['sitelibdir'])
Expand Down Expand Up @@ -87,8 +87,7 @@ Gem::PackageTask.new(GEM_SPEC) do |pkg|
pkg.need_tar = true
end

desc "Run Control Tower"
desc 'Run Control Tower'
task :run do
sh "macruby -I./lib -I./ext/CTParser bin/control_tower"
end

sh 'macruby -I./lib -I./ext/CTParser bin/control_tower'
end

0 comments on commit a1ae6e9

Please sign in to comment.