From 70e5ce205ba4556bc6718fa12457b73b329d2b90 Mon Sep 17 00:00:00 2001 From: Revar Desmera Date: Thu, 30 Mar 2017 05:10:55 -0700 Subject: [PATCH 1/2] Fixed some wiki links. --- README.md | 6 +++--- gen_assembly_index.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ff11d72..37a2177 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Snappy Full Rendering](https://github.com/revarbat/snappy-reprap/wiki/snappy_small.png) +![Snappy Full Rendering](https://github.com/revarbat/snappy-reprap/wiki/v1.1-snappy_small.png) Snappy-Reprap v1.1 ================== @@ -11,8 +11,8 @@ What | URL -------------------- | ------------------------------------------------------- GitHub Repository | https://github.com/revarbat/snappy-reprap Project Wiki | https://github.com/revarbat/snappy-reprap/wiki -Bill of Materials | https://github.com/revarbat/snappy-reprap/wiki/BOM -How to Assemble | https://github.com/revarbat/snappy-reprap/wiki/Assembly +Bill of Materials | https://github.com/revarbat/snappy-reprap/wiki/v1.1-BOM +How to Assemble | https://github.com/revarbat/snappy-reprap/wiki/v1.1-Assembly RepRap.org Wiki Page | http://reprap.org/wiki/Snappy Dev Forum | https://groups.google.com/forum/#!forum/snappy-reprap-dev diff --git a/gen_assembly_index.py b/gen_assembly_index.py index 4bc500e..7bd6bd8 100755 --- a/gen_assembly_index.py +++ b/gen_assembly_index.py @@ -57,7 +57,7 @@ UL { class GenAssemblyIndex(object): indexfile = "docs/assembly/index.html" - markdownfile = "wiki/Assembly.md" + markdownfile = "wiki/v1.1-Assembly.md" sourcefile = "full_assembly.scad" modules = [] modinfo = {} From f578b5998a0d29015685076417c79ffd88a6088c Mon Sep 17 00:00:00 2001 From: Revar Desmera Date: Thu, 30 Mar 2017 05:13:48 -0700 Subject: [PATCH 2/2] Fixed generation of wiki for new layout. --- Makefile | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 5158443..b3a5f2b 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ CONVERT=convert PARTFILES=$(sort $(wildcard *_parts.scad)) TARGETS=$(patsubst %.scad,STLs/%.stl,${PARTFILES}) -ROTFILES=$(shell seq -f 'wiki/snappy_rot%03g.png' 0 10 359.99) +ROTFILES=$(shell seq -f 'wiki/v1.1-snappy_rot%03g.png' 0 10 359.99) ASM_MODULES=$(shell grep 'module [a-z0-9_]*_assembly' full_assembly.scad | sed 's/^module //' | sed 's/[^a-z0-9_].*$$//' | sed '1!G;h;$$!d') ASM_BEFORE_TARGETS=$(patsubst %,docs/assembly/%_before.png,${ASM_MODULES}) ASM_AFTER_TARGETS=$(patsubst %,docs/assembly/%_after.png,${ASM_MODULES}) @@ -19,13 +19,13 @@ pull: git pull --recurse-submodules clean: - rm -f tmp_*.png tmp_*.scad wiki/snappy_rot*.png + rm -f tmp_*.png tmp_*.scad wiki/v1.1-snappy_rot*.png cleaner: clean rm -f ${TARGETS} cleanwiki: - rm -f wiki/snappy_*.gif wiki/snappy_*.png wiki/*_parts.png + rm -f wiki/v1.1-snappy_*.gif wiki/v1.1-snappy_*.png wiki/v1.1-*_parts.png instructions: docs/assembly/index.html @@ -55,38 +55,38 @@ ${ASM_AFTER_TARGETS}: full_assembly.scad rm -f $(subst docs/assembly/,tmp_asm2_,$@) $(patsubst docs/assembly/%.png,tmp_%.scad,$@) ${ROTFILES}: full_assembly.scad $(wildcard *.scad) - ${OPENSCAD} -o $(subst wiki/,tmp_,$@) --imgsize=1024,1024 \ + ${OPENSCAD} -o $(subst wiki/v1.1-,tmp_,$@) --imgsize=1024,1024 \ --projection=p --csglimit=2000000 \ - -D '$$t=$(shell echo $(patsubst wiki/snappy_rot%.png,%/360.0,$@) | bc -l)' \ + -D '$$t=$(shell echo $(patsubst wiki/v1.1-snappy_rot%.png,%/360.0,$@) | bc -l)' \ -D '$$do_prerender=false' --camera=0,0,255,65,0,30,2200 $< - ${CONVERT} -strip -resize 512x512 $(subst wiki/,tmp_,$@) $@ - rm -f $(subst wiki/,tmp_,$@) + ${CONVERT} -strip -resize 512x512 $(subst wiki/v1.1-,tmp_,$@) $@ + rm -f $(subst wiki/v1.1-,tmp_,$@) -wiki/%.png: %.scad config.scad GDMUtils.scad - ${OPENSCAD} -o $(subst wiki/,tmp_,$@) --render --imgsize=3200,3200 \ +wiki/v1.1-%.png: %.scad config.scad GDMUtils.scad + ${OPENSCAD} -o $(subst wiki/v1.1-,tmp_,$@) --render --imgsize=3200,3200 \ --projection=p --csglimit=2000000 --camera=0,0,50,65,0,30,2000 $< - ${CONVERT} -trim -resize 200x200 -border 10x10 -bordercolor '#ffffe5' $(subst wiki/,tmp_,$@) $@ - rm -f $(subst wiki/,tmp_,$@) + ${CONVERT} -trim -resize 200x200 -border 10x10 -bordercolor '#ffffe5' $(subst wiki/v1.1-,tmp_,$@) $@ + rm -f $(subst wiki/v1.1-,tmp_,$@) -wiki/snappy_full.png: full_assembly.scad $(wildcard *.scad) - ${OPENSCAD} -o $(subst wiki/,tmp_,$@) --imgsize=3200,3200 --projection=p \ +wiki/v1.1-snappy_full.png: full_assembly.scad $(wildcard *.scad) + ${OPENSCAD} -o $(subst wiki/v1.1-,tmp_,$@) --imgsize=3200,3200 --projection=p \ --csglimit=2000000 --camera=0,0,245,65,0,30,3000 -D '$$t=0.5' $< - ${CONVERT} -trim -resize 800x800 -border 10x10 -bordercolor '#ffffe5' $(subst wiki/,tmp_,$@) $@ - rm -f $(subst wiki/,tmp_,$@) + ${CONVERT} -trim -resize 800x800 -border 10x10 -bordercolor '#ffffe5' $(subst wiki/v1.1-,tmp_,$@) $@ + rm -f $(subst wiki/v1.1-,tmp_,$@) -wiki/snappy_small.png: wiki/snappy_full.png +wiki/v1.1-snappy_small.png: wiki/v1.1-snappy_full.png ${CONVERT} -trim -resize 200x200 -border 10x10 -bordercolor '#ffffe5' $< $@ -wiki/snappy_animated.gif: ${ROTFILES} +wiki/v1.1-snappy_animated.gif: ${ROTFILES} ${CONVERT} -delay 10 -loop 0 ${ROTFILES} $@ rm -f ${ROTFILES} -wiki/snappy_anim_small.gif: wiki/snappy_animated.gif +wiki/v1.1-snappy_anim_small.gif: wiki/v1.1-snappy_animated.gif ${CONVERT} -resize 200x200 $< $@ -renderparts: $(patsubst %.scad,wiki/%.png,${PARTFILES}) -rendering: wiki/snappy_full.png wiki/snappy_small.png -animation: wiki/snappy_animated.gif wiki/snappy_anim_small.gif +renderparts: $(patsubst %.scad,wiki/v1.1-%.png,${PARTFILES}) +rendering: wiki/v1.1-snappy_full.png wiki/v1.1-snappy_small.png +animation: wiki/v1.1-snappy_animated.gif wiki/v1.1-snappy_anim_small.gif wiki: rendering renderparts animation