From: Ian Jackson Date: Mon, 6 Nov 2017 00:24:27 +0000 (+0000) Subject: sort out toplevels X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=89761e53453ed295ba593c692763166726e681e4;p=moebius3.git sort out toplevels Signed-off-by: Ian Jackson --- diff --git a/.gitignore b/.gitignore index 62075e7..9209c6c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ moebius-core.scad *.gcode commitid.scad *.tmp +*.auto.scad diff --git a/Makefile b/Makefile index 0e3f024..d0075d8 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,29 @@ all: moebius-core.scad PLAY = /home/reprap/play +USING_AUTOS = moebius $(shell set -xe; $(PLAY)/commitid.scad.pl >commitid.scad.tmp; cmp commitid.scad.tmp commitid.scad || mv -f commitid.scad.tmp commitid.scad ) moebius-core.scad: genscad moebius.py ./$< >$@.tmp && mv -f $@.tmp $@ + +AUTO_TOPLEVELS := $(foreach m,$(USING_AUTOS),$(shell $(PLAY)/toplevel-find $m)) + +autoincs: $(AUTO_INCS) +scads: $(addsuffix .auto.scad, $(AUTO_TOPLEVELS)) +stls: $(addsuffix .auto.stl, $(AUTO_TOPLEVELS)) + +%.auto.scads: %.scad + $(MAKE) $(addsuffix .auto.scad, $(shell $(PLAY)/toplevel-find $*)) +%.auto.stls: + $(MAKE) $(addsuffix .auto.stl, $(shell $(PLAY)/toplevel-find $*)) + +.PRECIOUS: %.auto.scad +%.auto.scad: $(PLAY)/toplevel-make Makefile $(PLAY)/toplevel-find + @echo ' write $@' + $< $@ >$@.tmp + @mv -f $@.tmp $@ + +.PRECIOUS: %.stl %.gcode %.eps %.dxf + diff --git a/moebius-demo.scad b/moebius.scad similarity index 98% rename from moebius-demo.scad rename to moebius.scad index b8c82d5..41031a1 100644 --- a/moebius-demo.scad +++ b/moebius.scad @@ -158,7 +158,7 @@ module Kit(){ ////toplevel Pin(); } -module TestKit(){ +module TestKit(){ ////toplevel intersection(){ Kit(); cube([500,500,15], center=true); @@ -175,4 +175,4 @@ module TestKit(){ //Bottom(); //Kit(); //Demo(); -TestKit(); +//TestKit();