rakepp 0.1.5 → 0.1.6.1

data/Rakefile

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

data/lib/rakepp/gcccompiler.rb

@@ -13,26 +13,31 @@ class GccCompiler < Compiler
     end
 
     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)
+      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
 
-    outFile = file outName => ["#{depFile}.recreate", depFile] do | task |
+    outFile = file outName => ["#{outName}.apply"] do | task |
       command = "#{compiler(artifact)} -c #{defines(artifact)} #{includes(artifact)} -o #{outName} #{artifact.source.fullPath}"
       sh command
     end
-    
+
     applyTask = task "#{outFile}.apply" => recreateDepFileTask do |task|
       deps = YAML.load_file(depFile)
       if (deps)
         outFile.enhance(deps)
       end
+      outFile.enhance([depFile])
     end
 
     outFile.enhance([applyTask])
@@ -77,8 +82,7 @@ class GccCompiler < Compiler
 
   def calcDependencies(artifact, taskToEnhance)
     source = artifact.source
-    command = "#{compiler(artifact)} -MM #{defines(artifact)} #{includes(artifact)} #{source.fullPath}"
-    puts command
+    command = "#{compiler(artifact)} -M #{defines(artifact)} #{includes(artifact)} #{source.fullPath}"
     deps = `#{command}`
     if deps.length == 0
       raise 'cannot calc dependencies'
@@ -88,7 +92,7 @@ class GccCompiler < Compiler
       f.write(deps.to_yaml)
     end
   end
-  
+
   def startOfSourceLibCommand(outName, artifact)
     return "ar -r #{outName}"
   end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rakepp
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 6
+  - 1
+  version: 0.1.6.1
 platform: ruby
 authors: 
 - Christian Koestlin
@@ -9,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 +02:00
+date: 2010-04-07 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: 
+  type: :runtime
+  version_requirements: *id001
 description: "    Some more high level building blocks for cpp projects.\n"
 email: gizmoATflopcodeDOTcom
 executables: []
@@ -64,18 +74,20 @@ 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.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Cpp Support for Rake.