X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=Makefile;h=cc087661db1c72c5f473ac74de04f7d3453a1724;hp=f75411010a136a5e448e0c8ba0165be8e868b735;hb=f72603e0ca1d95b2abdd4e7a421f9aee97b29914;hpb=d6af2027d85fe80d19aac3dd7319686c05c2b1fd

diff --git a/Makefile b/Makefile
index f754110..cc08766 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,25 @@
+# reprap-objects Makefile
+#
+# Build scripts for various 3D designs
+# Copyright 2012-2016 Ian Jackson
+#
+# This work is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This work is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this work.  If not, see <http://www.gnu.org/licenses/>.
+
 
 HRR=/home/reprap
 SLIC3R=$(HRR)/Slic3r/bin/slic3r
+M4=m4
 SKEINFORGE=python $(HRR)/reprappro-software.git/skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py
 
 CWD := $(shell pwd)
@@ -8,18 +27,24 @@ PLAY ?= $(CWD)
 
 CONFIG=$(PLAY)/slic3r-config.ini
 
-USING_AUTOS ?= filamentspool xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter
+FILAMENTSPOOL_AUTOS = filamentspool filamentspool-lt filamentspool-sm
+FILAMENTSPOOL_AUTOS += filamentspool-storarm3
+
+USING_AUTOS ?= $(FILAMENTSPOOL_AUTOS) xeno-drivebay-bracket dungeonquest-cone anke-gps-bracket cable-hole-trunking-cover anglepoise-neck crossbar-computer-led-mount wardrobe-hook knifeblock pandemic-counter pattress-boxes-3-cover bike-lipo-box earring-stand bike-stalk-led-mount sewing-table sewing-table-test sewing-table-jig maglite-holder
+
 AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m))
 
-AUTO_INCS = funcs.scad
+AUTO_INCS += funcs.scad sealing-box.scad sewing-table.scad
 
 default:	autoincs scads
 
+$(shell set -xe; $(PLAY)/commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad )
+
 autoincs:	$(AUTO_INCS)
 scads:		$(addsuffix .auto.scad, $(AUTO_TOPLEVELS))
 stls:		$(addsuffix .auto.stl, $(AUTO_TOPLEVELS))
 
-%.auto.scads:
+%.auto.scads: %.scad
 	$(MAKE) $(addsuffix .auto.scad, $(shell $(PLAY)/toplevel-find $*))
 %.auto.stls:
 	$(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*))
@@ -45,6 +70,7 @@ AUTOBASE=$(shell echo $(1) | perl -pe 's/,\w+\.auto$$//')
 
 %.gcode-sd:	%.gcode
 		mount /media/sd
+		rm -f /media/sd/JOB.* /media/sd/job.*
 		cp $^ /media/sd/JOB.G
 		sleep 0.5
 		umount /media/sd
@@ -89,18 +115,39 @@ pandemic-counter-l%.eps: pandemic-counter-letters.fig
 		fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
 	        @mv -f $@.tmp $@
 
+.PRECIOUS: maglite-holder-torch-curve.eps
+maglite-holder-torch-curve.eps: maglite-holder-torch.fig
+		fig2dev -D +1:70 -L eps <$< >$@.tmp
+	        @mv -f $@.tmp $@
+
+maglite-holder-torch-curve.dxf: maglite-holder-torch-curve.eps
+		pstoedit -dt -flat 0.05 -f "dxf: -polyaslines -mm" $< $@
+
+
 PANDEMICQUARANTINES_NUMBERS=1 2
 PANDEMICQUARANTINES_DXFS=$(foreach l,$(PANDEMICQUARANTINES_NUMBERS), \
 	pandemic-quarantine-l$l.dxf)
 
-pandemic-quarantine-numbers pandemic-quarantine%.stl: \
-	$(PANDEMICQUARANTINES_DXFS)
+pandemic-quarantine-numbers: $(PANDEMICQUARANTINES_DXFS)
+pandemic-quarantine%.stl: $(PANDEMICQUARANTINES_DXFS)
 
 .PRECIOUS: pandemic-quarantine-l%.eps
 pandemic-quarantine-l%.eps: pandemic-quarantine-numbers.fig
 		fig2dev -D +$(notdir $*) -L eps <$< >$@.tmp
 	        @mv -f $@.tmp $@
 
+FILAMENTSPOOL_NUMBERS=$(shell seq 300 100 1500)
+filamentspool-number-n%.eps:	filamentspool-number.eps.pl
+	./$< $* >$@.tmp && mv -f $@.tmp $@
+
+FILAMENTSPOOL_DXFS=$(foreach n,$(FILAMENTSPOOL_NUMBERS), \
+	filamentspool-number-n$n.dxf)
+
+$(addsuffix .auto.stl, $(foreach f,$(FILAMENTSPOOL_AUTOS),$(shell \
+	$(PLAY)/toplevel-find $(PLAY)/$f))): $(FILAMENTSPOOL_DXFS)
+
+filamentspool-numbers filamentspool.stl: $(FILAMENTSPOOL_DXFS)
+
 SCREWRECESSTEST_SIZES= 2 3 4 5 6
 SCREWRECESSTEST_DXFS=$(foreach s,$(SCREWRECESSTEST_SIZES), \
 	screw-recess-test-number-s$s.dxf)
@@ -114,6 +161,24 @@ screw-recess-test-number-s%.eps: screw-recess-test-number-s%.fig
 
 screw-recess-test-numbers screw-recess-test.stl: $(SCREWRECESSTEST_DXFS)
 
+question-question.eps: question-question.fig
+		fig2dev -L eps <$< >$@.tmp
+	        @mv -f $@.tmp $@
+
+sewing-table%.stl: sewing-table-rear-profile.dxf
+sewing-table%.stl: sewing-table-front-profile.dxf
+sewing-table%.stl: sewing-table-end-profile.dxf
+
+sewing-table-%-profile.eps: sewing-table-%-profile.fig
+		fig2dev -L eps -D +40 <$< >$@.tmp
+	        @mv -f $@.tmp $@
+
+question-token.stl: question-question.dxf
+
+lemon-stand.stl: lemon-stand.scad
+
+electron-token.stl: electron-token.scad
+
 .PRECIOUS: $(SCREWRECESSTEST_DXFS) $(SCREWRECESSTEST_DXFS) \
 	$(foreach s,$(SCREWRECESSTEST_SIZES), \
 		screw-recess-test-number-s$s.fig \
@@ -125,6 +190,9 @@ screw-recess-test-numbers screw-recess-test.stl: $(SCREWRECESSTEST_DXFS)
 %:		%.pl
 		./$< >$@.tmp && mv -f $@.tmp $@
 
+%:		%.m4
+		$(M4) -P >$@.tmp $< && mv -f $@.tmp $@
+
 .PRECIOUS: %.auto.scad
 %.auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/toplevel-find
 		@echo ' write $@'