From 8cadea31feed26324c11116eeb581ef4e1fba902 Mon Sep 17 00:00:00 2001 From: Kevin Redon Date: Wed, 26 Mar 2014 11:58:17 +0100 Subject: [PATCH] bug fix --- hardware/Rakefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hardware/Rakefile b/hardware/Rakefile index 8f5ef85..b09b445 100644 --- a/hardware/Rakefile +++ b/hardware/Rakefile @@ -162,7 +162,7 @@ targets.each do |target| # the date sh "sed -i 's/\\(date=\\)\\$Date\\$/\\1#{date}/' #{t.name}" # the revision - sh "sed -i 's/\\(revision=\\)\\$Revision\\$/\\1#{sch_rev}/' #{t.name}" + sh "sed -i 's/\\(revision=\\)\\$Revision\\$/\\1#{tagert[:sch_rev]}/' #{t.name}" end end @@ -172,7 +172,7 @@ targets.each do |target| sh "cp #{t.prerequisites.join(' ')} #{t.name}" # on \ is to prevent ruby interpreting it, th other is for sed # the version and revision - version_revision = "v#{version}.#{pcb_rev.to_s.rjust(3,'0')}" + version_revision = "v#{version}.#{target[:pcb_rev].to_s.rjust(3,'0')}" sh "sed -i 's/\\$version\\$/#{version_revision}/' #{t.name}" # the date sh "sed -i 's/\\$date\\$/#{date}/' #{t.name}" @@ -225,9 +225,10 @@ GERBERS.each do |gerber| sh "pcb -x gerber --gerberfile #{target} --all-layers #{t.prerequisites.join(' ')}" end end -=end + ATTACHMENTS = ["cern_ohl_v_1_2_howto.pdf","CHANGES.txt","LICENSE.txt","PRODUCT.txt"] desc "create archive with release files" file "hardware-release_v#{version}.tar.gz" => ATTACHMENTS+["lib",vsch,vpcb,"notes.txt","#{target}_schematic.pdf","#{target}_layout.pdf","#{target}_layout-top.png","#{target}_layout-bottom.png"]+GERBERS do |t| sh "tar -acf '#{t.name}' #{t.prerequisites.join(' ')}" end +=end