From 2a99d9db90685382489982b94e542091186ec23e Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sun, 4 Aug 2019 22:42:43 -0600 Subject: [PATCH] massive rework of fab targets in pcb-rnd.mk to use 'cam' output approach --- pcb-rnd.mk | 244 ++++++----------------------------------------------- 1 file changed, 25 insertions(+), 219 deletions(-) diff --git a/pcb-rnd.mk b/pcb-rnd.mk index 17d53e8..4405f67 100644 --- a/pcb-rnd.mk +++ b/pcb-rnd.mk @@ -59,242 +59,47 @@ pcb: $(SCHEMATICS) Makefile $(CONFIG) pcb-rnd --gui batch $(PROJECT).lht # echo "Run pcb-rnd and import $(PROJECT).tdx" -TOPCOPPER=$(PROJECT).top.copper.none.*.gbr -TOPSILK=$(PROJECT).top.silk.none.*.gbr -TOPPASTE=$(PROJECT).top.paste.none.*.gbr -TOPMASK=$(PROJECT).top.mask.none.*.gbr - -BOTTOMCOPPER=$(PROJECT).bottom.copper.none.*.gbr -BOTTOMSILK=$(PROJECT).bottom.silk.none.*.gbr -BOTTOMPASTE=$(PROJECT).bottom.paste.none.*.gbr -BOTTOMMASK=$(PROJECT).bottom.mask.none.*.gbr - -UDRILL=$(PROJECT).global.virtual.udrill.none.cnc -PDRILL=$(PROJECT).global.virtual.pdrill.none.cnc -DRILL=$(PROJECT).global.virtual.drill.none.cnc +define emit_xyrs + pcb-rnd -x XY $(PROJECT).lht +endef -OUTLINE=$(PROJECT).global.boundary.uroute.*.gbr +ac: $(PROJECT)-ac-pcb.zip $(PROJECT)-ac-asy.zip -$(PROJECT).xy: $(PROJECT).lht $(CONFIG) - pcb-rnd -x XY $(PROJECT).lht +$(PROJECT)-ac-pcb.zip: $(PROJECT).lht $(CONFIG) + pcb-rnd -x cam gerber:universal --outfile out/$(PROJECT) $(PROJECT).lht + rm -f $@ && zip -j $@ out/* -$(BOTTOMCOPPER): $(PROJECT).lht $(CONFIG) - pcb-rnd -x gerber $(PROJECT).lht - @case "$(SILK)" in \ - none) rm -f $(PROJECT).topsilk.gbr $(BOTTOMCOPPER); \ - ;; \ - top) rm -f $(PROJECT).bottomsilk.gbr; \ - ;; \ - bottom) rm -f $(PROJECT).topsilk.gbr; \ - ;; \ - both) \ - ;; \ - *) echo "Invalid silk $(SILK)"; exit 1; \ - ;; \ - esac - -$(DRILL): $(BOTTOMCOPPER) - gerbv -x drill -o $(DRILL) $(UDRILL) $(PDRILL) - -zip: $(PROJECT).zip - -$(PROJECT).zip: $(BOTTOMCOPPER) $(PROJECT).xy Makefile - rm -f $@ && zip $@ $(PROJECT).*.gbr $(PROJECT).*.cnc $(PROJECT).xy # $(PROJECT).xls - -ac: $(PROJECT)-ac.zip $(PROJECT)-bom.csv - -$(PROJECT)-bom.csv: partslist.csv - cp partslist.csv $@ - -$(PROJECT)-ac.zip: $(BOTTOMCOPPER) $(PROJECT).xy - cp $(BOTTOMCOPPER) $(PROJECT).gbl - cp $(BOTTOMMASK) $(PROJECT).gbs - if [ -f $(BOTTOMSILK) ]; then \ - cp $(BOTTOMSILK) $(PROJECT).gbo; \ - fi - if [ -f $(BOTTOMPASTE) ]; then \ - cp $(BOTTOMPASTE) $(PROJECT).gbp; \ - fi - if [ -f $(TOPSILK) ]; then \ - cp $(TOPSILK) $(PROJECT).gto; \ - fi - if [ -f $(TOPPASTE) ]; then \ - cp $(TOPPASTE) $(PROJECT).gtp; \ - fi - cp $(OUTLINE) $(PROJECT).gml - cp $(TOPCOPPER) $(PROJECT).gtl - cp $(TOPMASK) $(PROJECT).gts - cp $(PDRILL) $(PROJECT).ncd - if [ -f $(UDRILL) ]; then \ - cp $(UDRILL) $(PROJECT).drd; \ - fi - if [ -f $(PROJECT).group1.gbr -a -f $(PROJECT).group2.gbr ]; then \ - cp $(PROJECT).group1.gbr $(PROJECT).gl2; \ - cp $(PROJECT).group2.gbr $(PROJECT).gl3; \ - elif [ -f $(PROJECT).group2.gbr -a -f $(PROJECT).group3.gbr ]; then \ - cp $(PROJECT).group2.gbr $(PROJECT).gl2; \ - cp $(PROJECT).group3.gbr $(PROJECT).gl3; \ - elif [ -f $(PROJECT).group5.gbr -a -f $(PROJECT).group7.gbr ]; then \ - cp $(PROJECT).group5.gbr $(PROJECT).gl2; \ - cp $(PROJECT).group7.gbr $(PROJECT).gl3; \ - fi - rm -f $@ && zip $@ \ - $(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \ - $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \ - $(PROJECT).gml $(PROJECT).ncd $(PROJECT).gml $(PROJECT).drd \ - $(PROJECT).gl2 $(PROJECT).gl3 \ - $(PROJECT).xy +$(PROJECT)-ac-asy.zip: $(PROJECT)-ac-pcb.zip partslist.csv + cp partslist.csv $(PROJECT)-bom.csv + $(call emit_xyrs) + rm -f $@ && zip -j $@ $(PROJECT).xy $(PROJECT)-bom.csv out/$(PROJECT).fab oshpark: $(PROJECT)-oshpark.zip -$(PROJECT)-oshpark.zip: $(BOTTOMCOPPER) $(DRILL) - cp $(BOTTOMCOPPER) bottom\ layer.ger - cp $(BOTTOMMASK) bottom\ solder\ mask.ger - if [ -f $(BOTTOMSILK) ]; then \ - cp $(BOTTOMSILK) bottom\ silk\ screen.ger; \ - fi - if [ -f $(TOPSILK) ]; then \ - cp $(TOPSILK) top\ silk\ screen.ger; \ - fi - cp $(OUTLINE) board\ outline.ger - cp $(TOPCOPPER) top\ layer.ger - cp $(TOPMASK) top\ solder\ mask.ger - cp $(DRILL) drills.xln - if [ -f $(PROJECT).group1.gbr -a -f $(PROJECT).group2.gbr ]; then \ - cp $(PROJECT).group1.gbr internal\ plane\ 1.ger; \ - cp $(PROJECT).group2.gbr internal\ plane\ 2.ger; \ - elif [ -f $(PROJECT).group2.gbr -a -f $(PROJECT).group3.gbr ]; then \ - cp $(PROJECT).group2.gbr internal\ plane\ 1.ger; \ - cp $(PROJECT).group3.gbr internal\ plane\ 2.ger; \ - elif [ -f $(PROJECT).group5.gbr -a -f $(PROJECT).group7.gbr ]; then \ - cp $(PROJECT).group5.gbr internal\ plane\ 1.ger; \ - cp $(PROJECT).group7.gbr internal\ plane\ 2.ger; \ - fi - rm -f $@ && zip $@ *.ger *.xln +$(PROJECT)-oshpark.zip: $(PROJECT).lht $(CONFIG) + pcb-rnd -x cam gerber:OSH_Park --outfile out/$(PROJECT) $(PROJECT).lht + $(call emit_xyrs) + rm -f $@ && zip -j $@ out/* $(PROJECT).xy seeed: $(PROJECT)-seeed.zip $(PROJECT)-seeed.csv -$(PROJECT)-seeed.zip: $(BOTTOMCOPPER) $(DRILL) $(PROJECT)-sch.pdf $(PROJECT).xy $(SEEED_EXTRA) - cp $(BOTTOMCOPPER) $(PROJECT).gbl - cp $(BOTTOMMASK) $(PROJECT).gbs - if [ -f $(BOTTOMSILK) ]; then \ - cp $(BOTTOMSILK) $(PROJECT).gbo; \ - fi - if [ -f $(BOTTOMPASTE) ]; then \ - cp $(BOTTOMPASTE) $(PROJECT).gbp; \ - fi - if [ -f $(TOPSILK) ]; then \ - cp $(TOPSILK) $(PROJECT).gto; \ - fi - if [ -f $(TOPPASTE) ]; then \ - cp $(TOPPASTE) $(PROJECT).gtp; \ - fi - cp $(OUTLINE) $(PROJECT).gml - cp $(TOPCOPPER) $(PROJECT).gtl - cp $(TOPMASK) $(PROJECT).gts - cp $(DRILL) $(PROJECT).txt - if [ -f $(PROJECT).group1.gbr -a -f $(PROJECT).group2.gbr ]; then \ - cp $(PROJECT).group1.gbr $(PROJECT).gl2; \ - cp $(PROJECT).group2.gbr $(PROJECT).gl3; \ - elif [ -f $(PROJECT).group2.gbr -a -f $(PROJECT).group3.gbr ]; then \ - cp $(PROJECT).group2.gbr $(PROJECT).gl2; \ - cp $(PROJECT).group3.gbr $(PROJECT).gl3; \ - elif [ -f $(PROJECT).group5.gbr -a -f $(PROJECT).group7.gbr ]; then \ - cp $(PROJECT).group5.gbr $(PROJECT).gl2; \ - cp $(PROJECT).group7.gbr $(PROJECT).gl3; \ - fi - rm -f $@ && zip $@ \ - $(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \ - $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \ - $(PROJECT).gml $(PROJECT).txt \ - $(PROJECT).gl2 $(PROJECT).gl3 \ - $(PROJECT).xy $(PROJECT)-sch.pdf \ - $(SEEED_EXTRA) - -goldphoenix: $(PROJECT)-goldphoenix.zip - -$(PROJECT)-goldphoenix.zip: $(BOTTOMCOPPER) $(DRILL) $(PROJECT)-sch.pdf $(PROJECT).xy $(PROJECT)-goldphoenix.csv - cp $(BOTTOMCOPPER) $(PROJECT).gbl - cp $(BOTTOMMASK) $(PROJECT).gbs - if [ -f $(BOTTOMSILK) ]; then \ - cp $(BOTTOMSILK) $(PROJECT).gbo; \ - fi - if [ -f $(BOTTOMPASTE) ]; then \ - cp $(BOTTOMPASTE) $(PROJECT).gbp; \ - fi - if [ -f $(TOPSILK) ]; then \ - cp $(TOPSILK) $(PROJECT).gto; \ - fi - if [ -f $(TOPPASTE) ]; then \ - cp $(TOPPASTE) $(PROJECT).gtp; \ - fi - cp $(OUTLINE) $(PROJECT).gml - cp $(TOPCOPPER) $(PROJECT).gtl - cp $(TOPMASK) $(PROJECT).gts - cp $(DRILL) $(PROJECT).txt - if [ -f $(PROJECT).group1.gbr -a -f $(PROJECT).group2.gbr ]; then \ - cp $(PROJECT).group1.gbr $(PROJECT).gl2; \ - cp $(PROJECT).group2.gbr $(PROJECT).gl3; \ - elif [ -f $(PROJECT).group2.gbr -a -f $(PROJECT).group3.gbr ]; then \ - cp $(PROJECT).group2.gbr $(PROJECT).gl2; \ - cp $(PROJECT).group3.gbr $(PROJECT).gl3; \ - elif [ -f $(PROJECT).group5.gbr -a -f $(PROJECT).group7.gbr ]; then \ - cp $(PROJECT).group5.gbr $(PROJECT).gl2; \ - cp $(PROJECT).group7.gbr $(PROJECT).gl3; \ - fi - rm -f $@ && zip $@ \ - $(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \ - $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \ - $(PROJECT).gml $(PROJECT).txt \ - $(PROJECT).gl2 $(PROJECT).gl3 \ - $(PROJECT).xy $(PROJECT)-sch.pdf \ - $(PROJECT)-goldphoenix.csv +$(PROJECT)-seeed.zip: $(PROJECT).lht $(CONFIG) $(PROJECT)-sch.pdf $(SEEED_EXTRA) + pcb-rnd -x cam gerber:Seeed --outfile out/$(PROJECT) $(PROJECT).lht + $(call emit_xyrs) + rm -f $@ && zip -j $@ out/* $(PROJECT).xy $(PROJECT)-sch.pdf $(SEEED_EXTRA) jlcpcb: $(PROJECT)-jlcpcb.zip -$(PROJECT)-jlcpcb.zip: $(BOTTOMCOPPER) $(PROJECT).xy - cp $(BOTTOMCOPPER) $(PROJECT).gbl - cp $(BOTTOMMASK) $(PROJECT).gbs - if [ -f $(BOTTOMSILK) ]; then \ - cp $(BOTTOMSILK) $(PROJECT).gbo; \ - fi - if [ -f $(BOTTOMPASTE) ]; then \ - cp $(BOTTOMPASTE) $(PROJECT).gbp; \ - fi - if [ -f $(TOPSILK) ]; then \ - cp $(TOPSILK) $(PROJECT).gto; \ - fi - if [ -f $(PROJECT).toppaste.gbr ]; then \ - cp $(PROJECT).toppaste.gbr $(PROJECT).gtp; \ - fi - cp $(OUTLINE) $(PROJECT).gko - cp $(TOPCOPPER) $(PROJECT).gtl - cp $(PROJECT).topmask.gbr $(PROJECT).gts - cp $(PROJECT).plated-drill.cnc $(PROJECT).xln - if [ -f $(UDRILL) ]; then \ - cp $(UDRILL) $(PROJECT).drd; \ - fi - if [ -f $(PROJECT).group1.gbr -a -f $(PROJECT).group2.gbr ]; then \ - cp $(PROJECT).group1.gbr $(PROJECT).g2l; \ - cp $(PROJECT).group2.gbr $(PROJECT).g3l; \ - elif [ -f $(PROJECT).group2.gbr -a -f $(PROJECT).group3.gbr ]; then \ - cp $(PROJECT).group2.gbr $(PROJECT).g2l; \ - cp $(PROJECT).group3.gbr $(PROJECT).g3l; \ - elif [ -f $(PROJECT).group5.gbr -a -f $(PROJECT).group7.gbr ]; then \ - cp $(PROJECT).group5.gbr $(PROJECT).g2l; \ - cp $(PROJECT).group7.gbr $(PROJECT).g3l; \ - fi - rm -f $@ && zip $@ \ - $(PROJECT).gtl $(PROJECT).gts $(PROJECT).gto $(PROJECT).gtp \ - $(PROJECT).gbl $(PROJECT).gbs $(PROJECT).gbo $(PROJECT).gbp \ - $(PROJECT).gko $(PROJECT).xln $(PROJECT).drd \ - $(PROJECT).g2l $(PROJECT).g3l +$(PROJECT)-jlcpcb.zip: $(PROJECT).lht $(CONFIG) + pcb-rnd -x cam gerber:JLC_PCB --outfile out/$(PROJECT) $(PROJECT).lht + $(call emit_xyrs) + rm -f $@ && zip -j $@ out/* $(PROJECT).xy stencilsunlimited: $(BOTTOMCOPPER) $(PROJECT).toppaste.gbr $(OUTLINE) rm -f $(PROJECT)-stencil.zip && zip $(PROJECT)-stencil.zip $(PROJECT).toppaste.gbr $(OUTLINE) stencil: $(PROJECT).lht - pcb-rnd -x gerber -c design/paste_adjust=-10mil $(PROJECT).lht + pcb-rnd -x cam gerber:universal -c design/paste_adjust=-10mil $(PROJECT).lht mv $(PROJECT).top.paste.none.0.gbr stencil.gbr clean: @@ -310,6 +115,7 @@ clean: rm -f $(PROJECT)-seeed.zip $(PROJECT)-seeed.csv rm -f $(PROJECT)-goldphoenix.zip $(PROJECT)-goldphoenix.csv rm -f $(PROJECT)*.ps $(PROJECT)*.pdf $(PROJECT)-bom.csv + rm -fr out muffins: muffin-6570.pdf muffin-5267.pdf muffin-keithp.pdf -- 2.47.2