rakepp 0.1.4 → 0.1.5

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/gempackagetask'
 desc "Default Task"
 task :default => :package
 
-PKG_VERSION = '0.1.4'
+PKG_VERSION = '0.1.5'
 PKG_FILES = FileList[
     'lib/**/*.rb',
     '*.xml',

data/lib/rakepp.rb

@@ -15,6 +15,7 @@ require 'rakepp/sourcefile'
 require 'rakepp/binarylib'
 require 'rakepp/framework'
 require 'rakepp/files'
+require 'rakepp/crosstools'
 
 def dir(d)
   file_create d do |t|

data/lib/rakepp/compiler.rb

@@ -1,9 +1,10 @@
 class Compiler
-  attr_reader :targetDir
+  attr_reader :targetDir, :compileflags
 
-  def initialize(targetDir, defines)
+  def initialize(targetDir, defines, compileflags)
     @targetDir = targetDir
     @defines = defines
+    @compileflags = compileflags
   end
 
   def addTasks(artifact)

data/lib/rakepp/crosstools.rb

@@ -0,0 +1,50 @@
+class CrossTools
+
+  def initialize(compilerHash)
+    @compilerHash = compilerHash
+  end
+
+  def sourceLib(compilers, base, name, sources, dependencies, includes, privateDefines=[], forceLib=false)
+    todo = get_compilers(compilers)
+    return todo.inject(Hash.new) do |memo, pair|
+      key = pair[0]
+      compiler = pair[1]
+      deps = dependencies[key]
+      if deps == nil
+        if dependencies.size == 0
+          deps = Array.new
+        else
+          raise "missing deps for sourcelib: '#{name}' and compiler: '#{key}'"
+        end
+      end
+      memo[key] = [SourceLib.new(compiler, base, name, sources, deps, includes, privateDefines, forceLib)]
+      memo
+    end
+  end
+
+  def exe(compilers, base, name, sources, libs, includes)
+    todo = get_compilers(compilers)
+    return todo.inject(Hash.new) do |memo, pair|
+      key = pair[0]
+      compiler = pair[1]
+      l = libs[key]
+      if l == nil
+        raise "missing libs for exe: '#{name}' and compiler: '#{key}'"
+      end
+      memo[key] = Exe.new(compiler, base, name, sources, l, includes)
+      memo
+    end
+  end
+
+  def get_compilers(compilers)
+    if compilers == nil
+      return @compilerHash
+    else
+      return compilers.inject(Hash.new) do |memo, i|
+        memo[i] =  @compilerHash[i]
+        memo
+      end
+    end
+  end
+
+end

data/lib/rakepp/gcccompiler.rb

@@ -12,16 +12,26 @@ class GccCompiler < Compiler
       calcDependencies(artifact, depFile)
     end
 
-    outFile = file outName => depFile do |task|
+    recreateDepFileTask = task "#{depFile}.recreate" do | task |
+    	puts "wird immer gemacht"
+      if (!File.exists?(depFile))
+        calcDependencies(artifact, depFile)
+      end
+      deps = YAML.load_file(depFile)
+      if (deps)
+        depFileTask.enhance(deps)
+      end
+    end
+
+    outFile = file outName => ["#{depFile}.recreate", depFile] do | task |
       command = "#{compiler(artifact)} -c #{defines(artifact)} #{includes(artifact)} -o #{outName} #{artifact.source.fullPath}"
       sh command
     end
-
-    applyTask = task "#{depFile}.apply" => depFile do |task|
+    
+    applyTask = task "#{outFile}.apply" => recreateDepFileTask do |task|
       deps = YAML.load_file(depFile)
       if (deps)
         outFile.enhance(deps)
-        depFileTask.enhance(deps[1..-1])
       end
     end
 
@@ -33,25 +43,18 @@ class GccCompiler < Compiler
     dirs = [artifact.targetDir, File.dirname(outName)]
     outFile.enhance(dirs)
     depFileTask.enhance(dirs)
+    recreateDepFileTask.enhance(dirs)
 
     All.addObject(artifact)
     All.addDepFile(depFile)
   end
 
-  def arch
-    if ARCH.length > 0
-      return "-arch #{ARCH}"
-    end
-    return ''
-  end
-
   def compiler(artifact)
-    
     if ((artifact.source.fullPath.index(".cpp") != nil) ||
         (artifact.source.fullPath.index(".cxx") != nil)) then
-      return "g++ #{arch} #{OPTIMIZE} -Wall"
+      return "g++ #{compileflags}"
     else
-      return "gcc #{arch} #{OPTIMIZE} -Wall"
+      return "gcc #{compileflags}"
     end
   end
 
@@ -85,37 +88,38 @@ class GccCompiler < Compiler
       f.write(deps.to_yaml)
     end
   end
+  
   def startOfSourceLibCommand(outName, artifact)
     return "ar -r #{outName}"
   end
 
-def addSourceLibTasks(artifact)
-  outDir = File.join(@targetDir, artifact.name)
+  def addSourceLibTasks(artifact)
+    outDir = File.join(@targetDir, artifact.name)
 
-  objects = []
-  artifact.sources.each do |source|
-    objects << ObjectFile.new(self, source, outDir, artifact.tr_includes, artifact.privateDefines).outFile
-  end
+    objects = []
+    artifact.sources.each do |source|
+      objects << ObjectFile.new(self, source, outDir, artifact.tr_includes, artifact.privateDefines).outFile
+    end
 
-  libsName = File.join(@targetDir, 'libs')
-  outName = File.join(libsName, "lib#{artifact.name}.a")
+    libsName = File.join(@targetDir, 'libs')
+    outName = File.join(libsName, "lib#{artifact.name}.a")
 
-  artifact.outFile = outName
-  desc "Create SourceLib #{outName}"
-  theTask = file outName => objects do | task |
-    command = startOfSourceLibCommand(outName, artifact)
-    objects.each do | o |
-      command += " #{o}"
+    artifact.outFile = outName
+    desc "Create SourceLib #{outName}"
+    theTask = file outName => objects do | task |
+      command = startOfSourceLibCommand(outName, artifact)
+      objects.each do | o |
+        command += " #{o}"
+      end
+      sh command
     end
-    sh command
-  end
 
-  addTransitiveLibraryPrerequisites(theTask, artifact)
+    addTransitiveLibraryPrerequisites(theTask, artifact)
 
-  file outName => [libsName]
-  All.add(outName)
-  directory libsName
-end
+    file outName => [libsName]
+    All.add(outName)
+    directory libsName
+  end
 
 def addSharedLibTasks(artifact)
   outDir = File.join(@targetDir, artifact.name)
@@ -169,7 +173,7 @@ def addExeTasks(artifact)
   artifact.outFile = File.join(exesName, artifact.name + '.exe')
   desc "Create Exe #{artifact.outFile}"
   theTask = file artifact.outFile => objects do | task |
-    command = "g++ #{arch} -o #{artifact.outFile}"
+    command = "g++ #{compileflags} -o #{artifact.outFile}"
     objects.each do |o|
       command += " #{o}"
     end
@@ -198,13 +202,13 @@ end
   end
   def doAdditionalWorkForExe(artifact)
   end
-  
+
   def addTransitiveLibraryPrerequisites(theTask, artifact)
     LibHelper.tr_libs(artifact.libs).each do |lib|
       theTask.prerequisites << lib.outFile unless lib.kind_of?(BinaryLib)
     end
   end
-  
+
   def addLib(task, lib)
     if (lib.instance_of?(BinaryLib)) then
       return " -L#{lib.path||'/usr/lib'} -l#{lib.name} "

data/lib/rakepp/linuxcompiler.rb

@@ -1,7 +1,7 @@
 class LinuxCompiler < GccCompiler
 
-  def initialize(defines, output_suffix='')
-    super("linux#{output_suffix}", defines)
+  def initialize(defines, compileflags, output_suffix='')
+    super("linux#{output_suffix}", defines, compileflags)
   end
 
   def startOfSharedLibCommand(libName, artifact)

data/lib/rakepp/osxcompiler.rb

@@ -1,12 +1,13 @@
 class OsxCompiler < GccCompiler
 
-  def initialize(defines, gui=true, output_suffix='')
-    super("osx#{output_suffix}", defines)
+  def initialize(defines, compileflags, architecture, gui=true, output_suffix='')
+    super("osx#{output_suffix}", defines, "#{compileflags} -arch #{architecture}")
+    @architecture = architecture
     @gui = gui
   end
 
   def startOfSourceLibCommand(outname, artifact)
-    return "libtool -static -arch_only #{ARCH} -o #{outname}"
+    return "libtool -static -arch_only #{@architecture} -o #{outname}"
   end
 
   def startOfSharedLibCommand(libName, artifact)
@@ -14,7 +15,7 @@ class OsxCompiler < GccCompiler
     if name == nil
       name = File.basename(libName)
     end
-    return "g++ -arch #{ARCH} -dynamiclib -install_name #{name}"
+    return "g++ -arch #{@architecture} -dynamiclib -install_name #{name}"
   end
 
   def sharedExtension

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rakepp
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Christian Koestlin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +01:00
+date: 2010-03-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,7 @@ files:
 - lib/rakepp/binarylib.rb
 - lib/rakepp/cleaner.rb
 - lib/rakepp/compiler.rb
+- lib/rakepp/crosstools.rb
 - lib/rakepp/exe.rb
 - lib/rakepp/files.rb
 - lib/rakepp/framework.rb