rakepp 0.1.2 → 0.1.3

data/Rakefile

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

data/lib/rakepp/compiler.rb

@@ -1,9 +1,11 @@
 class Compiler
   attr_reader :targetDir
+
   def initialize(targetDir, defines)
     @targetDir = targetDir
     @defines = defines
   end
+
   def addTasks(artifact)
     if (artifact.instance_of?(Exe)) then
       addExeTasks(artifact)
@@ -21,4 +23,6 @@ class Compiler
       raise "unknown type " + artifact.to_s
     end
   end
+
 end
+

data/lib/rakepp/gcccompiler.rb

@@ -38,12 +38,20 @@ class GccCompiler < Compiler
     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 #{ARCH} #{OPTIMIZE} -Wall"
+      return "g++ #{arch} #{OPTIMIZE} -Wall"
     else
-      return "gcc -arch #{ARCH} #{OPTIMIZE} -Wall"
+      return "gcc #{arch} #{OPTIMIZE} -Wall"
     end
   end
 
@@ -161,14 +169,16 @@ 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 #{ARCH} -o #{artifact.outFile}"
+    command = "g++ #{arch} -o #{artifact.outFile}"
     objects.each do |o|
       command += " #{o}"
     end
 
+    command += " -Wl,--start-group "
     LibHelper.tr_libs(artifact.libs).each do |lib|
       command += addLib(task, lib)
     end
+    command += " -Wl,--end-group"
 
     sh command
     doAdditionalWorkForExe(artifact)
@@ -181,25 +191,33 @@ def addExeTasks(artifact)
   directory exesName
 end
 
-def doAdditionalWorkForExe(artifact)
-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} "
+    elsif (lib.instance_of?(SourceLib)) then
+      return "#{addLibPrefix(lib)} -L#{targetDir}/libs -l#{lib.name} #{addLibSuffix(lib)}"
+    elsif (lib.instance_of?(SharedLib)) then
+      return " #{targetDir}/libs/#{lib.name}.so "
+    else
+      raise "#{lib} not supported"
+    end
+  end
 
-def addTransitiveLibraryPrerequisites(theTask, artifact)
-  LibHelper.tr_libs(artifact.libs).each do |lib|
-    theTask.prerequisites << lib.outFile unless lib.kind_of?(BinaryLib)
+  def addLibPrefix(lib)
+    return ''
   end
-end
 
-def addLib(task, lib)
-  if (lib.instance_of?(BinaryLib)) then
-    return " -L#{lib.path||'/usr/lib'} -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}.so "
-  else
-    raise "#{lib} not supported"
+  def addLibSuffix(lib)
+    return ''
   end
-end
 
 end

data/lib/rakepp/linuxcompiler.rb

@@ -1,11 +1,32 @@
 class LinuxCompiler < GccCompiler
-  def initialize(defines)
-    super('linux', defines)
+
+  def initialize(defines, output_suffix='')
+    super("linux#{output_suffix}", defines)
   end
+
   def startOfSharedLibCommand(libName, artifact)
     return "g++ -shared"
   end
+
   def sharedExtension
     return 'so'
   end
+
+
+  def addLibPrefix(lib)
+    if lib.forceLib
+      return '-Wl,--whole-archive'
+    else
+      return ''
+    end
+  end
+
+  def addLibSuffix(lib)
+    if lib.forceLib
+      return '-Wl,--no-whole-archive'
+    else
+      return ''
+    end
+  end
+
 end

data/lib/rakepp/sourcelib.rb

@@ -1,7 +1,7 @@
 class SourceLib
-  attr_reader :name, :sources, :includes, :outFile, :libs, :privateDefines
+  attr_reader :name, :sources, :includes, :outFile, :libs, :privateDefines, :forceLib
   attr_writer :outFile, :privateDefines
-  def initialize(compiler, base, name, sources, libs, includes, privateDefines=[])
+  def initialize(compiler, base, name, sources, libs, includes, privateDefines=[], forceLib=false)
     @name = name
     @sources = sources
     @libs = libs
@@ -13,6 +13,7 @@ class SourceLib
       end
     end
     @privateDefines = privateDefines
+    @forceLib = forceLib
     compiler.addTasks(self)
   end
 

data/lib/rakepp.rb

@@ -1,14 +1,4 @@
 require 'rakepp/os'
-
-#OPTIMIZE = '-O3'
-#OPTIMIZE = ''
-
-#if OS.osx?
-#  ARCH = '-arch i386 -O0 -gdwarf-2 -mfix-and-continue -fmessage-length=0'
-#else
-#  ARCH = ''
-#end
-
 require 'rakepp/cleaner'
 require 'rakepp/all'
 require 'rakepp/compiler'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rakepp
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Christian Koestlin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +01:00
+date: 2010-03-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.3
     version: 
-description: Some more high level building blocks for cpp projects.
+description: "    Some more high level building blocks for cpp projects.\n"
 email: gizmoATflopcodeDOTcom
 executables: []
 
@@ -50,8 +50,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: []
 
@@ -72,9 +74,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rakepp
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Cpp Support for Rake.
 test_files: []