Changeset 5548
- Timestamp:
- 09/02/10 20:19:34 (1 year ago)
- Files:
-
- trunk/build/script/bob.rb (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/script/bob.rb
r5508 r5548 22 22 HAIKU = RUBY_PLATFORM =~ /haiku/ ? true : false 23 23 SOLARIS = RUBY_PLATFORM =~ /solaris/ ? true : false 24 WINDOWS = RUBY_PLATFORM =~ /windows/ ? true : false24 WINDOWS = RUBY_PLATFORM =~ /windows/ || RUBY_PLATFORM =~ /mingw/ ? true : false 25 25 26 26 class Functor … … 200 200 end 201 201 202 def addToLib (obj )202 def addToLib (obj, append_objs_path = true) 203 203 eol = "\r\n" if WINDOWS 204 204 eol = " " unless WINDOWS 205 205 206 file = File.join(@args.objs, obj) 206 file = File.join(@args.objs, obj) if append_objs_path 207 file = obj unless append_objs_path 207 208 208 209 @libs << file << eol if File.exists?(file) … … 238 239 def check_command (cmd, line) 239 240 if $?.to_i != 0 240 raise "#{cmd} returned #{$?.to_i nt/256} exit status\nline was: #{line}"241 raise "#{cmd} returned #{$?.to_i/256} exit status\nline was: #{line}" 241 242 end 242 243 end … … 256 257 257 258 if !@args.quick || isOverdue(file, temp) 258 exec(cmd + t mp + " " + file)259 exec(cmd + temp + " " + file) 259 260 end 260 261 … … 263 264 264 265 dmd = "dmd -c -I#{@args.root}/tango/core -I#{@args.root} -I#{@args.root}/tango/core/vendor #{@args.flags} -of#{@args.objs}/"; 265 libs("-c -n -p256\n" + @args.lib)266 @libs << "-c -n -p256\n#{@args.lib}\n" 266 267 267 268 exclude("tango/core/rt/compiler/dmd/posix") … … 273 274 274 275 scan(".c") do |file| 275 compile("dmc -c -mn -6 -r -o ", file)276 end 277 278 addToLib(@args.root + "/tango/core/rt/compiler/dmd/minit.obj" ) if @args.core276 compile("dmc -c -mn -6 -r -o#{@args.objs}/", file) 277 end 278 279 addToLib(@args.root + "/tango/core/rt/compiler/dmd/minit.obj", false) if @args.core 279 280 280 281 File.open("tango.lsp", "w+") do |file| … … 283 284 284 285 exec("lib @tango.lsp") 285 #exec("cmd /q /c del tango.lsp *.obj")286 286 exec("cmd /q /c del tango.lsp") 287 287












