Merge remote-tracking branch 'hw-template/master'
This commit is contained in:
commit
717cf3872c
|
@ -162,7 +162,7 @@ targets.each do |target|
|
||||||
# the date
|
# the date
|
||||||
sh "sed -i 's/\\(date=\\)\\$Date\\$/\\1#{date}/' #{t.name}"
|
sh "sed -i 's/\\(date=\\)\\$Date\\$/\\1#{date}/' #{t.name}"
|
||||||
# the revision
|
# 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
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -172,7 +172,7 @@ targets.each do |target|
|
||||||
sh "cp #{t.prerequisites.join(' ')} #{t.name}"
|
sh "cp #{t.prerequisites.join(' ')} #{t.name}"
|
||||||
# on \ is to prevent ruby interpreting it, th other is for sed
|
# on \ is to prevent ruby interpreting it, th other is for sed
|
||||||
# the version and revision
|
# 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}"
|
sh "sed -i 's/\\$version\\$/#{version_revision}/' #{t.name}"
|
||||||
# the date
|
# the date
|
||||||
sh "sed -i 's/\\$date\\$/#{date}/' #{t.name}"
|
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(' ')}"
|
sh "pcb -x gerber --gerberfile #{target} --all-layers #{t.prerequisites.join(' ')}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
=end
|
|
||||||
ATTACHMENTS = ["cern_ohl_v_1_2_howto.pdf","CHANGES.txt","LICENSE.txt","PRODUCT.txt"]
|
ATTACHMENTS = ["cern_ohl_v_1_2_howto.pdf","CHANGES.txt","LICENSE.txt","PRODUCT.txt"]
|
||||||
desc "create archive with release files"
|
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|
|
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(' ')}"
|
sh "tar -acf '#{t.name}' #{t.prerequisites.join(' ')}"
|
||||||
end
|
end
|
||||||
|
=end
|
||||||
|
|
Loading…
Reference in New Issue