rakepp 0.1.6.2 → 0.1.6.3

data/Rakefile

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

data/lib/rakepp/binarylib.rb

@@ -7,7 +7,7 @@ class BinaryLib
     @libs = libs
     @includes = includes
     @path = path
-    compiler.addTasks(self)
+    compiler.add_tasks(self)
   end
 
 end

data/lib/rakepp/compiler.rb

@@ -7,19 +7,19 @@ class Compiler
     @compileflags = compileflags
   end
 
-  def addTasks(artifact)
+  def add_tasks(artifact)
     if (artifact.instance_of?(Exe)) then
-      addExeTasks(artifact)
+      add_exe_tasks(artifact)
     elsif (artifact.instance_of?(SourceLib)) then
-      addSourceLibTasks(artifact)
+      add_source_lib_tasks(artifact)
     elsif (artifact.instance_of?(ObjectFile)) then
-      addObjectTasks(artifact)
+      add_object_tasks(artifact)
     elsif (artifact.instance_of?(Framework)) then
-      addFrameworkTasks(artifact)
+      add_framework_tasks(artifact)
     elsif (artifact.instance_of?(BinaryLib)) then
-      addBinaryLibTasks(artifact)
+      add_binary_lib_tasks(artifact)
     elsif (artifact.instance_of?(SharedLib)) then
-      addSharedLibTasks(artifact)
+      add_shared_lib_tasks(artifact)
     else
       raise "unknown type " + artifact.to_s
     end

data/lib/rakepp/crosstools.rb

@@ -4,7 +4,7 @@ class CrossTools
     @compilerHash = compilerHash
   end
 
-  def sourceLib(compilers, base, name, sources, dependencies, includes, privateDefines=[], forceLib=false)
+  def source_lib(compilers, base, name, sources, dependencies, includes, privateDefines=[], forceLib=false)
     todo = get_compilers(compilers)
     return todo.inject(Hash.new) do |memo, pair|
       key = pair[0]

data/lib/rakepp/gcccompiler.rb

@@ -3,55 +3,57 @@ require 'progressbar'
 require 'yaml'
 
 class GccCompiler < Compiler
-  def addObjectTasks(artifact)
+  def add_object_tasks(artifact)
     outName = File.join(artifact.targetDir, artifact.source.to_o)
+    outDir = File.dirname(outName)
+
     artifact.outFile = outName
     depFile = artifact.dep_file
 
-    depFileTask = file depFile => artifact.source.fullPath do | task |
-      calcDependencies(artifact, depFile)
-    end
-
-    recreateDepFileTask = task "#{depFile}.recreate" do | task |
-      if (!File.exists?(depFile))
-        calcDependencies(artifact, depFile)
-      end
-      deps = YAML.load_file(depFile)
-      missing = deps.inject(false) do |memo, d|
-        memo || !File.exists?(d)
-      end
-      if (missing)
-        calcDependencies(artifact, depFile)
-        deps = YAML.load_file(depFile)
-      end
-      depFileTask.enhance(deps)
-    end
+    depFileTask = file depFile => artifact.source.fullPath { | task | calc_dependencies(artifact, depFile) }
+    recreateDepFileTask = recreate_task(depFile, artifact, depFileTask)
 
     outFile = file outName => ["#{outName}.apply"] do | task |
-      command = "#{compiler(artifact)} -c #{defines(artifact)} #{includes(artifact)} -o #{outName} #{artifact.source.fullPath}"
-      sh command
+      sh "#{compiler(artifact)} -c #{defines(artifact)} #{includes(artifact)} -o #{outName} #{artifact.source.fullPath}"
     end
 
-    applyTask = task "#{outFile}.apply" => recreateDepFileTask do |task|
+    applyTask = apply_task(outFile, recreateDepFileTask, depFile)
+    outFile.enhance([applyTask])
+    dirs = [artifact.targetDir, outDir]
+    dirs.each { |d| directory d }
+    [outFile, depFileTask, recreateDepFileTask].each { |task| task.enhance(dirs) }
+    All.addObject(artifact)
+    All.addDepFile(depFile)
+  end
+
+  def apply_task(outFile, recreateDepFileTask, depFile)
+    task "#{outFile}.apply" => recreateDepFileTask do |task|
       deps = YAML.load_file(depFile)
       if (deps)
         outFile.enhance(deps)
       end
       outFile.enhance([depFile])
     end
+  end
 
-    outFile.enhance([applyTask])
-
-    directory artifact.targetDir
-    directory File.dirname(outName)
-
-    dirs = [artifact.targetDir, File.dirname(outName)]
-    outFile.enhance(dirs)
-    depFileTask.enhance(dirs)
-    recreateDepFileTask.enhance(dirs)
+  def recreate_task(depFile, artifact, depFileTask)
+    task "#{depFile}.recreate" do | task |
+      if (!File.exists?(depFile))
+        calc_dependencies(artifact, depFile)
+      end
+      deps = YAML.load_file(depFile)
+      if (dep_missing?(deps))
+        calc_dependencies(artifact, depFile)
+        deps = YAML.load_file(depFile)
+      end
+      depFileTask.enhance(deps)
+    end
+  end
 
-    All.addObject(artifact)
-    All.addDepFile(depFile)
+  def dep_missing?(deps)
+    deps.inject(false) do |memo, d|
+      memo || !File.exists?(d)
+    end
   end
 
   def compiler(artifact)
@@ -80,7 +82,7 @@ class GccCompiler < Compiler
     return res
   end
 
-  def calcDependencies(artifact, taskToEnhance)
+  def calc_dependencies(artifact, taskToEnhance)
     source = artifact.source
     command = "#{compiler(artifact)} -M #{defines(artifact)} #{includes(artifact)} #{source.fullPath}"
     deps = `#{command}`
@@ -97,13 +99,10 @@ class GccCompiler < Compiler
     return "ar -r #{outName}"
   end
 
-  def addSourceLibTasks(artifact)
+  def add_source_lib_tasks(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.map { |source| ObjectFile.new(self, source, outDir, artifact.tr_includes, artifact.privateDefines).outFile }
 
     libsName = File.join(@targetDir, 'libs')
     outName = File.join(libsName, "lib#{artifact.name}.a")
@@ -111,113 +110,90 @@ class GccCompiler < Compiler
     artifact.outFile = outName
     desc "Create SourceLib #{outName}"
     theTask = file outName => objects do | task |
-      command = start_of_source_lib_command(outName, artifact)
-      objects.each do | o |
-        command += " #{o}"
-      end
-      sh command
+      sh objects.inject(start_of_source_lib_command(outName, artifact)) { | command, o | "#{command} #{o}" }
     end
 
-    addTransitiveLibraryPrerequisites(theTask, artifact)
+    add_transitive_library_prerequisites(theTask, artifact)
 
     file outName => [libsName]
     All.add(outName)
     directory libsName
   end
 
-def addSharedLibTasks(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
-  libsName = File.join(@targetDir, 'libs')
-  outName = File.join(libsName, "#{artifact.name}.#{shared_extension()}")
-  artifact.outFile = outName
-  desc "Create SharedLib #{outName}"
-  theTask = file outName => objects do | task |
-    command = start_of_shared_lib_command(outName, artifact)
-    objects.each do |o|
-      command += " #{o}"
-    end
+  def add_shared_lib_tasks(artifact)
+    outDir = File.join(@targetDir, artifact.name)
+    objects = artifact.sources.map { |source| ObjectFile.new(self, source, outDir, artifact.tr_includes, artifact.privateDefines).outFile }
 
-    LibHelper.tr_libs(artifact.libs).each do |lib|
-      command += addLib(task, lib)
+    libsName = File.join(@targetDir, 'libs')
+    outName = File.join(libsName, "#{artifact.name}.#{shared_extension()}")
+    artifact.outFile = outName
+    desc "Create SharedLib #{outName}"
+    theTask = file outName => objects do | task |
+      command = start_of_shared_lib_command(outName, artifact)
+      objects.each { |o| command += " #{o}" }
+      LibHelper.tr_libs(artifact.libs).each { |lib| command += add_lib(task, lib) }
+      command += " -o #{outName}"
+      sh command
     end
 
-    command += " -o #{outName}"
-    sh command
-  end
-
-  addTransitiveLibraryPrerequisites(theTask, artifact)
-
-  file outName => [libsName]
-  All.add(outName)
-  directory libsName
-end
-
-def addBinaryLibTasks(artifact)
-  artifact.outFile = "lib#{artifact.name}.a"
-end
-
-def addFrameworkTasks(artifact)
-  artifact.outFile = artifact.name
-end
+    add_transitive_library_prerequisites(theTask, artifact)
 
+    file outName => [libsName]
+    All.add(outName)
+    directory libsName
+  end
 
-def addExeTasks(artifact)
-  outDir = File.join(@targetDir, artifact.name)
+  def add_binary_lib_tasks(artifact)
+    artifact.outFile = "lib#{artifact.name}.a"
+  end
 
-  objects = []
-  artifact.sources.each do |source|
-    objects << ObjectFile.new(self, source, outDir, artifact.tr_includes).outFile
+  def add_framework_tasks(artifact)
+    artifact.outFile = artifact.name
   end
 
-  exesName = File.join(@targetDir, 'exes')
-  artifact.outFile = File.join(exesName, artifact.name + '.exe')
-  desc "Create Exe #{artifact.outFile}"
-  theTask = file artifact.outFile => objects do | task |
-    command = "g++ #{compileflags} -o #{artifact.outFile}"
-    objects.each do |o|
-      command += " #{o}"
+  def add_exe_tasks(artifact)
+    outDir = File.join(@targetDir, artifact.name)
+    objects = artifact.sources.map { |source| ObjectFile.new(self, source, outDir, artifact.tr_includes).outFile }
+    exesName = File.join(@targetDir, 'exes')
+    artifact.outFile = File.join(exesName, artifact.name + '.exe')
+    desc "Create Exe #{artifact.outFile}"
+    theTask = file artifact.outFile => objects do | task |
+      command = "g++ #{compileflags} -o #{artifact.outFile}"
+      objects.each { |o| command += " #{o}" }
+      command += start_of_libs()
+      LibHelper.tr_libs(artifact.libs).each { |lib| command += add_lib(task, lib) }
+      command += end_of_libs()
+      sh command
+      do_additional_work_for_exe(artifact)
     end
 
-    command += startOfLibs
-    LibHelper.tr_libs(artifact.libs).each do |lib|
-      command += addLib(task, lib)
-    end
-    command += endOfLibs
+    add_transitive_library_prerequisites(theTask, artifact)
 
-    sh command
-    do_additional_work_for_exe(artifact)
+    file artifact.outFile => [exesName]
+    All.add(artifact.outFile)
+    directory exesName
   end
 
-  addTransitiveLibraryPrerequisites(theTask, artifact)
-
-  file artifact.outFile => [exesName]
-  All.add(artifact.outFile)
-  directory exesName
-end
-  def startOfLibs
+  def start_of_libs()
     return ''
   end
-  def endOfLibs
+  def end_of_libs()
     return ''
   end
   def do_additional_work_for_exe(artifact)
   end
 
-  def addTransitiveLibraryPrerequisites(theTask, artifact)
+  def add_transitive_library_prerequisites(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)
+  def add_lib(task, lib)
     if (lib.instance_of?(BinaryLib)) then
       return " -L#{lib.path||'/usr/lib'} -l#{lib.name} "
     elsif (lib.instance_of?(SourceLib)) then
-      return "#{addLibPrefix(lib)} -L#{targetDir}/libs -l#{lib.name} #{addLibSuffix(lib)}"
+      return "#{add_lib_prefix(lib)} -L#{targetDir}/libs -l#{lib.name} #{add_lib_suffix(lib)}"
     elsif (lib.instance_of?(SharedLib)) then
       return " #{targetDir}/libs/#{lib.name}.so "
     else
@@ -225,11 +201,11 @@ end
     end
   end
 
-  def addLibPrefix(lib)
+  def add_lib_prefix(lib)
     return ''
   end
 
-  def addLibSuffix(lib)
+  def add_lib_suffix(lib)
     return ''
   end
 

data/lib/rakepp/gccwin32compiler.rb

@@ -7,17 +7,17 @@ class GccWin32Compiler < GccCompiler
     return "g++ -shared -Wl,--out-implib=#{libName}.a"
   end
 
-  def sharedExtension
+  def shared_extension()
     return 'dll'
   end
 
-  def addLib(task, lib)
+  def add_lib(task, lib)
     if (lib.instance_of?(BinaryLib)) then
       return " -l#{lib.name}"
     elsif (lib.instance_of?(SourceLib)) then
       return " -L#{targetDir}/libs -l#{lib.name}"
     elsif (lib.instance_of?(SharedLib)) then
-      return " #{targetDir}/libs/#{lib.name}.#{sharedExtension}.a"
+      return " #{targetDir}/libs/#{lib.name}.#{shared_extension()}.a"
     else
       raise "#{lib} not supported"
     end

data/lib/rakepp/linuxcompiler.rb

@@ -8,12 +8,12 @@ class LinuxCompiler < GccCompiler
     return "g++ -shared"
   end
 
-  def sharedExtension
+  def shared_extension()
     return 'so'
   end
 
 
-  def addLibPrefix(lib)
+  def add_lib_prefix(lib)
     if lib.forceLib
       return '-Wl,--whole-archive'
     else
@@ -21,7 +21,7 @@ class LinuxCompiler < GccCompiler
     end
   end
 
-  def addLibSuffix(lib)
+  def add_lib_suffix(lib)
     if lib.forceLib
       return '-Wl,--no-whole-archive'
     else
@@ -29,11 +29,11 @@ class LinuxCompiler < GccCompiler
     end
   end
 
-  def startOfLibs
+  def start_of_libs()
     return ' -Wl,--start-group '
   end
 
-  def endOfLibs
+  def end_of_libs()
     return ' -Wl,--end-group '
   end
 

data/lib/rakepp/objectfile.rb

@@ -6,7 +6,7 @@ class ObjectFile
     @targetDir = targetDir
     @includes = includes
     @privateDefines = privateDefines
-    compiler.addTasks(self)
+    compiler.add_tasks(self)
   end
 
   def dep_file()

data/lib/rakepp/osxcompiler.rb

@@ -22,7 +22,7 @@ class OsxCompiler < GccCompiler
     return 'so'
   end
 
-  def addLib(task, lib)
+  def add_lib(task, lib)
     if (lib.instance_of?(Framework)) then
       return " -framework #{lib.name}"
     else

data/lib/rakepp/sourcelib.rb

@@ -14,7 +14,7 @@ class SourceLib
     end
     @privateDefines = privateDefines
     @forceLib = forceLib
-    compiler.addTasks(self)
+    compiler.add_tasks(self)
   end
 
   def tr_includes

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rakepp
 version: !ruby/object:Gem::Version 
-  version: 0.1.6.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 6
+  - 3
+  version: 0.1.6.3
 platform: ruby
 authors: 
 - Christian Koestlin
@@ -9,20 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +02:00
+date: 2010-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: progressbar
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 3
         version: 0.0.3
-    version: 
-description: Some more high level building blocks for cpp projects.
+  type: :runtime
+  version_requirements: *id001
+description: "    Some more high level building blocks for cpp projects.\n"
 email: gizmoATflopcodeDOTcom
 executables: []
 
@@ -51,8 +61,10 @@ files:
 - lib/rakepp/sourcelib.rb
 - lib/rakepp.rb
 - Rakefile
-has_rdoc: false
+has_rdoc: true
 homepage: http://www.flopcode.com
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -62,20 +74,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rakepp
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Cpp Support for Rake.
 test_files: []