Restructure tree

The top-level directory is getting crowded. Make some subdirs: ports: Snek ports. All of these build snek for some device chips: SoC-specific code. To be used in building snek for some device hosts: Snek hosts. Targets for installers and places to run snekde Signed-off-by: Keith Packard <keithp@keithp.com>
keith-packard · May 28, 2019 · ca601a5 · ca601a5
1 parent d03561d
commit ca601a5
Show file tree

Hide file tree

Showing 150 changed files with 72 additions and 99 deletions.
diff --git a/Makefile b/Makefile
@@ -19,12 +19,12 @@ include snek-install.defs
 
 SNEK_OTHEROS?=1
 ifeq ($(SNEK_OTHEROS),1)
-SNEK_OTHEROS_DIR=linux windows macosx
+SNEK_OTHEROS_DIR=$(SNEK_HOSTS)/linux $(SNEK_HOSTS)/windows $(SNEK_HOSTS)/macosx
 endif
 
 SUBDIRS = snekde doc examples $(SNEK_OTHEROS_DIR)
 
-SNEKS = posix/snek $(FIRMWARE)
+SNEKS = $(SNEK_PORTS)/posix/snek $(FIRMWARE)
 
 all: $(SNEKS)
 	+for dir in $(SUBDIRS); do (cd $$dir && make PREFIX=$(PREFIX) DESTDIR=$(DESTDIR)); done
@@ -66,9 +66,7 @@ install: $(SHAREFILES) $(PKGFILES) $(DOCFILES)
 
 upload:
 	+cd doc && make upload
-	+cd linux && make upload
-	+cd windows && make upload
-	+cd macosx && make upload
+	for otheros in $(SNEK_OTHEROS_DIR); do cd "$$otheros" && make upload; done
 
 snek.pc: snek.pc.in
 	$(SNEK_SED) $^ > $@

diff --git a/atmega/snek-atmega-eeprom.c → chips/atmega/snek-atmega-eeprom.c b/atmega/snek-atmega-eeprom.c → chips/atmega/snek-atmega-eeprom.c
diff --git a/atmega/snek-atmega-serial.c → chips/atmega/snek-atmega-serial.c b/atmega/snek-atmega-serial.c → chips/atmega/snek-atmega-serial.c
diff --git a/atmega/snek-atmega.h → chips/atmega/snek-atmega.h b/atmega/snek-atmega.h → chips/atmega/snek-atmega.h
diff --git a/avr/ao-adc-avr.c → chips/avr/ao-adc-avr.c b/avr/ao-adc-avr.c → chips/avr/ao-adc-avr.c
diff --git a/avr/ao-arch-funcs.h → chips/avr/ao-arch-funcs.h b/avr/ao-arch-funcs.h → chips/avr/ao-arch-funcs.h
diff --git a/avr/ao-arch.h → chips/avr/ao-arch.h b/avr/ao-arch.h → chips/avr/ao-arch.h
diff --git a/avr/ao-snek-avr.c → chips/avr/ao-snek-avr.c b/avr/ao-snek-avr.c → chips/avr/ao-snek-avr.c
diff --git a/avr/ao-usb-avr.c → chips/avr/ao-usb-avr.c b/avr/ao-usb-avr.c → chips/avr/ao-usb-avr.c
diff --git a/avr/snek-avr-eeprom.c → chips/avr/snek-avr-eeprom.c b/avr/snek-avr-eeprom.c → chips/avr/snek-avr-eeprom.c
diff --git a/avr/snek-avr.defs → chips/avr/snek-avr.defs b/avr/snek-avr.defs → chips/avr/snek-avr.defs
@@ -13,7 +13,6 @@
 #
 
 SNEK_AO = $(SNEK_ROOT)/ao
-SNEK_AVR = $(SNEK_ROOT)/avr
 
 SNEK_LOCAL_VPATH = $(SNEK_AVR):$(SNEK_AO)
 

diff --git a/avr/snek-avr.h → chips/avr/snek-avr.h b/avr/snek-avr.h → chips/avr/snek-avr.h
diff --git a/avr/snek-avr51.x → chips/avr/snek-avr51.x b/avr/snek-avr51.x → chips/avr/snek-avr51.x
diff --git a/samd21/ao-adc-samd21.c → chips/samd21/ao-adc-samd21.c b/samd21/ao-adc-samd21.c → chips/samd21/ao-adc-samd21.c
diff --git a/samd21/ao-adc-samd21.h → chips/samd21/ao-adc-samd21.h b/samd21/ao-adc-samd21.h → chips/samd21/ao-adc-samd21.h
diff --git a/samd21/ao-arch-funcs.h → chips/samd21/ao-arch-funcs.h b/samd21/ao-arch-funcs.h → chips/samd21/ao-arch-funcs.h
diff --git a/samd21/ao-arch.h → chips/samd21/ao-arch.h b/samd21/ao-arch.h → chips/samd21/ao-arch.h
diff --git a/samd21/ao-dma-samd21.c → chips/samd21/ao-dma-samd21.c b/samd21/ao-dma-samd21.c → chips/samd21/ao-dma-samd21.c
diff --git a/samd21/ao-dma-samd21.h → chips/samd21/ao-dma-samd21.h b/samd21/ao-dma-samd21.h → chips/samd21/ao-dma-samd21.h
diff --git a/samd21/ao-flash-samd21.c → chips/samd21/ao-flash-samd21.c b/samd21/ao-flash-samd21.c → chips/samd21/ao-flash-samd21.c
diff --git a/samd21/ao-flash.h → chips/samd21/ao-flash.h b/samd21/ao-flash.h → chips/samd21/ao-flash.h
diff --git a/samd21/ao-interrupt.c → chips/samd21/ao-interrupt.c b/samd21/ao-interrupt.c → chips/samd21/ao-interrupt.c
diff --git a/samd21/ao-neopixel.c → chips/samd21/ao-neopixel.c b/samd21/ao-neopixel.c → chips/samd21/ao-neopixel.c
diff --git a/samd21/ao-serial-samd21.c → chips/samd21/ao-serial-samd21.c b/samd21/ao-serial-samd21.c → chips/samd21/ao-serial-samd21.c
diff --git a/samd21/ao-serial.h → chips/samd21/ao-serial.h b/samd21/ao-serial.h → chips/samd21/ao-serial.h
diff --git a/samd21/ao-snek.c → chips/samd21/ao-snek.c b/samd21/ao-snek.c → chips/samd21/ao-snek.c
diff --git a/samd21/ao-snek.h → chips/samd21/ao-snek.h b/samd21/ao-snek.h → chips/samd21/ao-snek.h
diff --git a/samd21/ao-stdio.c → chips/samd21/ao-stdio.c b/samd21/ao-stdio.c → chips/samd21/ao-stdio.c
diff --git a/samd21/ao-tc-samd21.c → chips/samd21/ao-tc-samd21.c b/samd21/ao-tc-samd21.c → chips/samd21/ao-tc-samd21.c
diff --git a/samd21/ao-tc-samd21.h → chips/samd21/ao-tc-samd21.h b/samd21/ao-tc-samd21.h → chips/samd21/ao-tc-samd21.h
diff --git a/samd21/ao-tcc-samd21.c → chips/samd21/ao-tcc-samd21.c b/samd21/ao-tcc-samd21.c → chips/samd21/ao-tcc-samd21.c
diff --git a/samd21/ao-tcc-samd21.h → chips/samd21/ao-tcc-samd21.h b/samd21/ao-tcc-samd21.h → chips/samd21/ao-tcc-samd21.h
diff --git a/samd21/ao-timer.c → chips/samd21/ao-timer.c b/samd21/ao-timer.c → chips/samd21/ao-timer.c
diff --git a/samd21/ao-usb-samd21.c → chips/samd21/ao-usb-samd21.c b/samd21/ao-usb-samd21.c → chips/samd21/ao-usb-samd21.c
diff --git a/samd21/registers.ld → chips/samd21/registers.ld b/samd21/registers.ld → chips/samd21/registers.ld
diff --git a/samd21/samd21.h → chips/samd21/samd21.h b/samd21/samd21.h → chips/samd21/samd21.h
diff --git a/samd21/snek-altos.builtin → chips/samd21/snek-altos.builtin b/samd21/snek-altos.builtin → chips/samd21/snek-altos.builtin
diff --git a/samd21/snek-altos.c → chips/samd21/snek-altos.c b/samd21/snek-altos.c → chips/samd21/snek-altos.c
diff --git a/samd21/snek-eeprom.c → chips/samd21/snek-eeprom.c b/samd21/snek-eeprom.c → chips/samd21/snek-eeprom.c
diff --git a/samd21/snek-gpio.c → chips/samd21/snek-gpio.c b/samd21/snek-gpio.c → chips/samd21/snek-gpio.c
diff --git a/samd21/snek-samd21.defs → chips/samd21/snek-samd21.defs b/samd21/snek-samd21.defs → chips/samd21/snek-samd21.defs
@@ -13,7 +13,6 @@
 #
 
 SNEK_AO = $(SNEK_ROOT)/ao
-SNEK_SAMD21 = $(SNEK_ROOT)/samd21
 
 SNEK_LOCAL_VPATH = $(SNEK_SAMD21):$(SNEK_AO)
 

diff --git a/samd21/snek-samd21.ld → chips/samd21/snek-samd21.ld b/samd21/snek-samd21.ld → chips/samd21/snek-samd21.ld
diff --git a/samd21/uf2conv.py → chips/samd21/uf2conv.py b/samd21/uf2conv.py → chips/samd21/uf2conv.py
diff --git a/linux/.gitignore → hosts/linux/.gitignore b/linux/.gitignore → hosts/linux/.gitignore
diff --git a/linux/Makefile → hosts/linux/Makefile b/linux/Makefile → hosts/linux/Makefile
@@ -12,19 +12,19 @@
 # General Public License for more details.
 #
 
-SNEK_ROOT=..
+SNEK_ROOT=../..
 
 SNEK_NO_BUILD_TARGETS = 1
 
-include ../snek-install.defs
+include $(SNEK_ROOT)/snek-install.defs
 
 LINUX_DIST=snek-linux-$(SNEK_VERSION).tar.bz2
 LINUX_SH=snek-linux-$(SNEK_VERSION).sh
-DESKTOP_FILES=../posix/snek.desktop.in ../snekde/snekde.desktop.in
-PROGS=../posix/snek ../snekde/snekde ../snek-duino/snek-duino-install.in
-EXAMPLES=../examples
-ICONS=../snek.svg
-DOC=../doc/snek.pdf ../snek-duino/snek-duino-install.1 ../snekde/snekde.1 ../COPYING
+DESKTOP_FILES=$(SNEK_PORTS)/posix/snek.desktop.in $(SNEK_ROOT)/snekde/snekde.desktop.in
+PROGS=$(SNEK_PORTS)/posix/snek $(SNEK_ROOT)/snekde/snekde $(SNEK_PORTS)/snek-duino/snek-duino-install.in
+EXAMPLES=$(SNEK_ROOT)/examples
+ICONS=$(SNEK_ROOT)/snek.svg
+DOC=$(SNEK_ROOT)/doc/snek.pdf $(SNEK_PORTS)/snek-duino/snek-duino-install.1 $(SNEK_ROOT)/snekde/snekde.1 $(SNEK_ROOT)/COPYING
 LINUX_FILES=$(PROGS) $(DESKTOP_FILES) $(FIRMWARE) $(USBFIRMWARE) $(ICONS) $(DOC) $(EXAMPLES)
 
 all: $(LINUX_SH)

diff --git a/linux/linux-install.sh → hosts/linux/linux-install.sh b/linux/linux-install.sh → hosts/linux/linux-install.sh
diff --git a/macosx/.gitignore → hosts/macosx/.gitignore b/macosx/.gitignore → hosts/macosx/.gitignore
diff --git a/macosx/Info.plist.in → hosts/macosx/Info.plist.in b/macosx/Info.plist.in → hosts/macosx/Info.plist.in
diff --git a/macosx/Makefile → hosts/macosx/Makefile b/macosx/Makefile → hosts/macosx/Makefile
@@ -13,7 +13,7 @@
 #
 
 SNEK_NO_BUILD_TARGETS = 1
-SNEK_ROOT=..
+SNEK_ROOT=../..
 
 include $(SNEK_ROOT)/snek-install.defs
 
@@ -22,7 +22,7 @@ MACOSX_ICON_PNGS = $(shell for i in $(MACOSX_RES); do echo snek-$$i.png; done)
 MACOSX_ICON = snek.icns
 MACOSX_DIST = snek-mac-$(SNEK_VERSION).dmg
 
-SNEKDE = ../snekde/snekde.py
+SNEKDE = $(SNEK_ROOT)/snekde/snekde.py
 SNEKDE_SCRIPTS = runsnekde snekde-script
 SNEKDE_FILES = $(SNEKDE_SCRIPTS) snekde-Info.plist $(SNEKDE)
 
@@ -34,13 +34,13 @@ endif
 
 MACOSX_INSTALL = install-macosx
 
-MACOSX_DOCS = ../doc/snek.pdf ../COPYING ReadMe-Mac.rtf
+MACOSX_DOCS = $(SNEK_ROOT)/doc/snek.pdf $(SNEK_ROOT)/COPYING ReadMe-Mac.rtf
 
-MACOSX_FILES=$(SNEKDE_FILES) $(SNEK_FILES) serial $(MACOSX_ICON) $(MACOSX_SCRIPTS) $(MACOSX_INSTALL) $(MACOSX_DOCS) ../examples/*.py
+MACOSX_FILES=$(SNEKDE_FILES) $(SNEK_FILES) serial $(MACOSX_ICON) $(MACOSX_SCRIPTS) $(MACOSX_INSTALL) $(MACOSX_DOCS) $(SNEK_ROOT)/examples/*.py
 
 all: $(MACOSX_DIST)
 
-$(MACOSX_ICON): ../snek.svg
+$(MACOSX_ICON): $(SNEK_ROOT)/snek.svg
 	for i in $(MACOSX_RES); do rsvg-convert -w $$i -h $$i -o snek-$$i.png $^; done
 	png2icns $@ $(MACOSX_ICON_PNGS)
 
@@ -70,7 +70,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) macosx
 	cp -a $(MACOSX_INSTALL) macosx
 	cp -a $(FIRMWARE) macosx
 	cp -a $(USBFIRMWARE) macosx
-	cp -a ../examples/* macosx/examples
+	cp -a $(SNEK_ROOT)/examples/* macosx/examples
 	#
 	# snekde
 	#

diff --git a/macosx/ReadMe-Mac.rtf → hosts/macosx/ReadMe-Mac.rtf b/macosx/ReadMe-Mac.rtf → hosts/macosx/ReadMe-Mac.rtf
diff --git a/macosx/build-mac → hosts/macosx/build-mac b/macosx/build-mac → hosts/macosx/build-mac
@@ -15,7 +15,7 @@
 
 curdir=`pwd`
 dir=`dirname $0`
-cd "$dir/.."
+cd "$dir/../.."
 
 case $# in
     2)
@@ -34,6 +34,6 @@ target="$2"
 
 rsync -Ravz --delete `git ls-files` "$build"
 
-ssh imac-remote "cd '$builddir'/posix && make"
+ssh imac-remote "cd '$builddir'/ports/posix && make"
 
-rsync -avz "$build"/posix/snek "$curdir"/"$target"
+rsync -avz "$build"/ports/posix/snek "$curdir"/"$target"
diff --git a/macosx/install-macosx → hosts/macosx/install-macosx b/macosx/install-macosx → hosts/macosx/install-macosx
diff --git a/macosx/runsnek → hosts/macosx/runsnek b/macosx/runsnek → hosts/macosx/runsnek
diff --git a/macosx/runsnekde → hosts/macosx/runsnekde b/macosx/runsnekde → hosts/macosx/runsnekde
diff --git a/macosx/snek-Info.plist.in → hosts/macosx/snek-Info.plist.in b/macosx/snek-Info.plist.in → hosts/macosx/snek-Info.plist.in
diff --git a/macosx/snek-script → hosts/macosx/snek-script b/macosx/snek-script → hosts/macosx/snek-script
diff --git a/macosx/snekde-Info.plist.in → hosts/macosx/snekde-Info.plist.in b/macosx/snekde-Info.plist.in → hosts/macosx/snekde-Info.plist.in
diff --git a/macosx/snekde-script → hosts/macosx/snekde-script b/macosx/snekde-script → hosts/macosx/snekde-script
diff --git a/windows/.gitignore → hosts/windows/.gitignore b/windows/.gitignore → hosts/windows/.gitignore
diff --git a/.../Instdrv/NSIS/Contrib/InstDrv/Example.nsi → .../Instdrv/NSIS/Contrib/InstDrv/Example.nsi b/.../Instdrv/NSIS/Contrib/InstDrv/Example.nsi → .../Instdrv/NSIS/Contrib/InstDrv/Example.nsi
diff --git a/...drv/NSIS/Contrib/InstDrv/InstDrv-Test.exe → ...drv/NSIS/Contrib/InstDrv/InstDrv-Test.exe b/...drv/NSIS/Contrib/InstDrv/InstDrv-Test.exe → ...drv/NSIS/Contrib/InstDrv/InstDrv-Test.exe
diff --git a/...ws/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c → ...ws/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c b/...ws/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c → ...ws/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c
diff --git a/.../Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp → .../Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp b/.../Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp → .../Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp
diff --git a/.../Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw → .../Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw b/.../Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw → .../Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw
diff --git a/...s/Instdrv/NSIS/Contrib/InstDrv/Readme.txt → ...s/Instdrv/NSIS/Contrib/InstDrv/Readme.txt b/...s/Instdrv/NSIS/Contrib/InstDrv/Readme.txt → ...s/Instdrv/NSIS/Contrib/InstDrv/Readme.txt
diff --git a/...Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf → ...Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf b/...Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf → ...Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf
diff --git a/...Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys → ...Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys b/...Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys → ...Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys
diff --git a/windows/Instdrv/NSIS/Includes/java.nsh → hosts/windows/Instdrv/NSIS/Includes/java.nsh b/windows/Instdrv/NSIS/Includes/java.nsh → hosts/windows/Instdrv/NSIS/Includes/java.nsh
diff --git a/windows/Instdrv/NSIS/Includes/refresh-sh.nsh → ...dows/Instdrv/NSIS/Includes/refresh-sh.nsh b/windows/Instdrv/NSIS/Includes/refresh-sh.nsh → ...dows/Instdrv/NSIS/Includes/refresh-sh.nsh
diff --git a/windows/Instdrv/NSIS/Plugins/InstDrv.dll → .../windows/Instdrv/NSIS/Plugins/InstDrv.dll b/windows/Instdrv/NSIS/Plugins/InstDrv.dll → .../windows/Instdrv/NSIS/Plugins/InstDrv.dll
diff --git a/windows/Makefile → hosts/windows/Makefile b/windows/Makefile → hosts/windows/Makefile
@@ -12,17 +12,17 @@
 # General Public License for more details.
 #
 
-SNEK_ROOT=..
+SNEK_ROOT=../..
 
 SNEK_LOCAL_SRC = \
 	snek-windows.c \
-	../snek-math.c
+	$(SNEK_ROOT)/snek-math.c
 
 SNEK_LOCAL_INC = snek-windows.h
-SNEK_LOCAL_BUILTINS = snek-windows.builtin ../snek-math.builtin
+SNEK_LOCAL_BUILTINS = snek-windows.builtin $(SNEK_ROOT)/snek-math.builtin
 
 INF=altusmetrum.inf
-WINDOWS_FILES=snek.exe snek.ico snekde.py ../doc/snek.pdf ../examples ../COPYING $(FIRMWARE) $(USBFIRMWARE) $(INF)
+WINDOWS_FILES=snek.exe snek.ico snekde.py $(SNEK_ROOT)/doc/snek.pdf $(SNEK_ROOT)/examples $(SNEK_ROOT)/COPYING $(FIRMWARE) $(USBFIRMWARE) $(INF)
 
 include $(SNEK_ROOT)/snek-install.defs
 
@@ -42,15 +42,15 @@ all: $(WINDOWS_INSTALL)
 $(WINDOWS_INSTALL): $(WINDOWS_FILES) snek.cfg
 	pynsist snek.cfg
 
-snek.cfg: snek.cfg.in ../snek-install.defs ../snek.defs
+snek.cfg: snek.cfg.in $(SNEK_ROOT)/snek-install.defs $(SNEK_ROOT)/snek.defs
 	for i in $(FIRMWARE); do echo "	$$i"; done | sed '/@SNEK_FIRMWARE@/r /dev/stdin' snek.cfg.in | sed '/@SNEK_FIRMWARE/d' | $(SNEK_SED) > $@
 
 snek.exe: $(SNEK_OBJ)
 	$(CC) $(CFLAGS) -o $@ $(SNEK_OBJ) $(LIBS)
 
 vpath %.svg ..
 
-snekde.py: ../snekde/snekde.py
+snekde.py: $(SNEK_ROOT)/snekde/snekde.py
 	cp $^ $@
 
 .SUFFIXES: .svg .build .icns .ico .rc .o .exe

diff --git a/windows/altusmetrum.cat → hosts/windows/altusmetrum.cat b/windows/altusmetrum.cat → hosts/windows/altusmetrum.cat
diff --git a/windows/altusmetrum.inf → hosts/windows/altusmetrum.inf b/windows/altusmetrum.inf → hosts/windows/altusmetrum.inf
diff --git a/windows/pyapp_snek.nsi → hosts/windows/pyapp_snek.nsi b/windows/pyapp_snek.nsi → hosts/windows/pyapp_snek.nsi
diff --git a/windows/snek-windows.builtin → hosts/windows/snek-windows.builtin b/windows/snek-windows.builtin → hosts/windows/snek-windows.builtin
diff --git a/windows/snek-windows.c → hosts/windows/snek-windows.c b/windows/snek-windows.c → hosts/windows/snek-windows.c
diff --git a/windows/snek-windows.h → hosts/windows/snek-windows.h b/windows/snek-windows.h → hosts/windows/snek-windows.h
diff --git a/windows/snek.cfg.in → hosts/windows/snek.cfg.in b/windows/snek.cfg.in → hosts/windows/snek.cfg.in
@@ -17,10 +17,10 @@ version=3.7.0
 pypi_wheels=windows-curses==1.0
 packages=serial
 
-files =../COPYING
-	../doc/snek.pdf
+files =@SNEK_ROOT@/COPYING
+	@SNEK_ROOT@/doc/snek.pdf
 	@SNEK_FIRMWARE@
-	../examples
+	@SNEK_ROOT@/examples
 	snek.exe
 	altusmetrum.inf
 	altusmetrum.cat

diff --git a/crickit-snek/.gitignore → ports/crickit-snek/.gitignore b/crickit-snek/.gitignore → ports/crickit-snek/.gitignore
diff --git a/crickit-snek/Makefile → ports/crickit-snek/Makefile b/crickit-snek/Makefile → ports/crickit-snek/Makefile
@@ -12,9 +12,9 @@
 # General Public License for more details.
 #
 
-SNEK_ROOT = ..
+SNEK_ROOT = ../..
 
-SNEK_SAMD21 = $(SNEK_ROOT)/samd21
+SNEK_SAMD21 = $(SNEK_ROOT)/chips/samd21
 
 PROGNAME=crickit-snek
 PRODUCT_NAME=CrickitSnek

diff --git a/crickit-snek/ao-pins.h → ports/crickit-snek/ao-pins.h b/crickit-snek/ao-pins.h → ports/crickit-snek/ao-pins.h
diff --git a/crickit-snek/crickit-snek.builtin → ports/crickit-snek/crickit-snek.builtin b/crickit-snek/crickit-snek.builtin → ports/crickit-snek/crickit-snek.builtin
diff --git a/feather-snek/.gitignore → ports/feather-snek/.gitignore b/feather-snek/.gitignore → ports/feather-snek/.gitignore
diff --git a/feather-snek/Makefile → ports/feather-snek/Makefile b/feather-snek/Makefile → ports/feather-snek/Makefile
@@ -12,9 +12,9 @@
 # General Public License for more details.
 #
 
-SNEK_ROOT = ..
+SNEK_ROOT = ../..
 
-SNEK_SAMD21 = $(SNEK_ROOT)/samd21
+SNEK_SAMD21 = $(SNEK_ROOT)/chips/samd21
 
 PROGNAME=feather-snek
 PRODUCT_NAME=FeatherSnek

diff --git a/feather-snek/ao-pins.h → ports/feather-snek/ao-pins.h b/feather-snek/ao-pins.h → ports/feather-snek/ao-pins.h
diff --git a/feather-snek/feather-snek.builtin → ports/feather-snek/feather-snek.builtin b/feather-snek/feather-snek.builtin → ports/feather-snek/feather-snek.builtin
diff --git a/itsybitsy-snek/.gitignore → ports/itsybitsy-snek/.gitignore b/itsybitsy-snek/.gitignore → ports/itsybitsy-snek/.gitignore
diff --git a/itsybitsy-snek/Makefile → ports/itsybitsy-snek/Makefile b/itsybitsy-snek/Makefile → ports/itsybitsy-snek/Makefile
@@ -12,29 +12,13 @@
 # General Public License for more details.
 #
 
-SNEK_ROOT = ..
-SNEK_AVR = $(SNEK_ROOT)/avr
+SNEK_ROOT = ../..
+SNEK_AO = $(SNEK_ROOT)/ao
+SNEK_AVR = $(SNEK_ROOT)/chips/avr
 
 PROGNAME=itsybitsy-snek
 PRODUCT_NAME=ItsyBitsySnek
 
-#
-# Copyright © 2019 Keith Packard <keithp@keithp.com>
-#
-# This program 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 program 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.
-#
-
-SNEK_AO = $(SNEK_ROOT)/ao
-SNEK_AVR = $(SNEK_ROOT)/avr
-
 SNEK_LOCAL_VPATH = $(SNEK_AVR):$(SNEK_AO)
 
 SNEK_AVR_SRC = \
@@ -99,7 +83,7 @@ SNEK_LOCAL_INC = \
 SNEK_LOCAL_BUILTINS = \
 	$(SNEK_AVR_BUILTINS)
 
-include ../snek-install.defs
+include $(SNEK_ROOT)/snek-install.defs
 
 BASE=$(PROGNAME)-$(SNEK_VERSION)
 ELF=$(BASE).elf

diff --git a/itsybitsy-snek/ao-pins.h → ports/itsybitsy-snek/ao-pins.h b/itsybitsy-snek/ao-pins.h → ports/itsybitsy-snek/ao-pins.h
diff --git a/itsybitsy-snek/itsybitsy.builtin → ports/itsybitsy-snek/itsybitsy.builtin b/itsybitsy-snek/itsybitsy.builtin → ports/itsybitsy-snek/itsybitsy.builtin
diff --git a/itsybitsy-snek/snek-itsybitsy-install.1 → ...s/itsybitsy-snek/snek-itsybitsy-install.1 b/itsybitsy-snek/snek-itsybitsy-install.1 → ...s/itsybitsy-snek/snek-itsybitsy-install.1
diff --git a/itsybitsy-snek/snek-itsybitsy-install.in → .../itsybitsy-snek/snek-itsybitsy-install.in b/itsybitsy-snek/snek-itsybitsy-install.in → .../itsybitsy-snek/snek-itsybitsy-install.in
diff --git a/itsybitsy3v-snek/.gitignore → ports/itsybitsy3v-snek/.gitignore b/itsybitsy3v-snek/.gitignore → ports/itsybitsy3v-snek/.gitignore
diff --git a/itsybitsy3v-snek/Makefile → ports/itsybitsy3v-snek/Makefile b/itsybitsy3v-snek/Makefile → ports/itsybitsy3v-snek/Makefile
@@ -12,29 +12,13 @@
 # General Public License for more details.
 #
 
-SNEK_ROOT = ..
-SNEK_AVR = $(SNEK_ROOT)/avr
+SNEK_ROOT = ../..
+SNEK_AVR = $(SNEK_ROOT)/chips/avr
+SNEK_AO = $(SNEK_ROOT)/ao
 
 PROGNAME=itsybitsy3v-snek
 PRODUCT_NAME=ItsyBitsySnek
 
-#
-# Copyright © 2019 Keith Packard <keithp@keithp.com>
-#
-# This program 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 program 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.
-#
-
-SNEK_AO = $(SNEK_ROOT)/ao
-SNEK_AVR = $(SNEK_ROOT)/avr
-
 SNEK_LOCAL_VPATH = $(SNEK_AVR):$(SNEK_AO)
 
 SNEK_AVR_SRC = \
@@ -98,7 +82,7 @@ SNEK_LOCAL_INC = \
 SNEK_LOCAL_BUILTINS = \
 	$(SNEK_AVR_BUILTINS)
 
-include ../snek-install.defs
+include $(SNEK_ROOT)/snek-install.defs
 
 BASE=$(PROGNAME)-$(SNEK_VERSION)
 ELF=$(BASE).elf

diff --git a/itsybitsy3v-snek/ao-pins.h → ports/itsybitsy3v-snek/ao-pins.h b/itsybitsy3v-snek/ao-pins.h → ports/itsybitsy3v-snek/ao-pins.h
diff --git a/itsybitsy3v-snek/itsybitsy3v.builtin → ports/itsybitsy3v-snek/itsybitsy3v.builtin b/itsybitsy3v-snek/itsybitsy3v.builtin → ports/itsybitsy3v-snek/itsybitsy3v.builtin
diff --git a/metro-snek/.gitignore → ports/metro-snek/.gitignore b/metro-snek/.gitignore → ports/metro-snek/.gitignore
diff --git a/metro-snek/Makefile → ports/metro-snek/Makefile b/metro-snek/Makefile → ports/metro-snek/Makefile
@@ -12,9 +12,9 @@
 # General Public License for more details.
 #
 
-SNEK_ROOT = ..
+SNEK_ROOT = ../..
 
-SNEK_SAMD21 = $(SNEK_ROOT)/samd21
+SNEK_SAMD21 = $(SNEK_ROOT)/chips/samd21
 
 PROGNAME=metro-snek
 PRODUCT_NAME=MetroSnek

diff --git a/metro-snek/ao-pins.h → ports/metro-snek/ao-pins.h b/metro-snek/ao-pins.h → ports/metro-snek/ao-pins.h
diff --git a/metro-snek/metro-snek.builtin → ports/metro-snek/metro-snek.builtin b/metro-snek/metro-snek.builtin → ports/metro-snek/metro-snek.builtin
diff --git a/playground-snek/.gitignore → ports/playground-snek/.gitignore b/playground-snek/.gitignore → ports/playground-snek/.gitignore
diff --git a/playground-snek/Makefile → ports/playground-snek/Makefile b/playground-snek/Makefile → ports/playground-snek/Makefile
@@ -12,9 +12,9 @@
 # General Public License for more details.
 #
 
-SNEK_ROOT = ..
+SNEK_ROOT = ../..
 
-SNEK_SAMD21 = $(SNEK_ROOT)/samd21
+SNEK_SAMD21 = $(SNEK_ROOT)/chips/samd21
 
 PROGNAME=playground-snek
 PRODUCT_NAME=PlaygroundSnek

diff --git a/playground-snek/ao-pins.h → ports/playground-snek/ao-pins.h b/playground-snek/ao-pins.h → ports/playground-snek/ao-pins.h
diff --git a/playground-snek/playground-snek.builtin → ...s/playground-snek/playground-snek.builtin b/playground-snek/playground-snek.builtin → ...s/playground-snek/playground-snek.builtin
diff --git a/posix/.gitignore → ports/posix/.gitignore b/posix/.gitignore → ports/posix/.gitignore
diff --git a/posix/Makefile → ports/posix/Makefile b/posix/Makefile → ports/posix/Makefile
@@ -12,7 +12,7 @@
 # General Public License for more details.
 #
 
-SNEK_ROOT=..
+SNEK_ROOT=../..
 
 SNEK_LOCAL_SRC = \
 	snek-main.c \
@@ -21,7 +21,7 @@ SNEK_LOCAL_SRC = \
 	snek-curses.c
 
 SNEK_LOCAL_INC = snek-posix.h
-SNEK_LOCAL_BUILTINS = snek-posix.builtin ../snek-math.builtin
+SNEK_LOCAL_BUILTINS = snek-posix.builtin $(SNEK_ROOT)/snek-math.builtin
 
 include $(SNEK_ROOT)/snek-install.defs
 

diff --git a/posix/snek-curses.c → ports/posix/snek-curses.c b/posix/snek-curses.c → ports/posix/snek-curses.c
diff --git a/posix/snek-main.c → ports/posix/snek-main.c b/posix/snek-main.c → ports/posix/snek-main.c
diff --git a/posix/snek-posix.builtin → ports/posix/snek-posix.builtin b/posix/snek-posix.builtin → ports/posix/snek-posix.builtin
diff --git a/posix/snek-posix.c → ports/posix/snek-posix.c b/posix/snek-posix.c → ports/posix/snek-posix.c
diff --git a/posix/snek-posix.h → ports/posix/snek-posix.h b/posix/snek-posix.h → ports/posix/snek-posix.h
diff --git a/posix/snek.1 → ports/posix/snek.1 b/posix/snek.1 → ports/posix/snek.1
diff --git a/posix/snek.desktop.in → ports/posix/snek.desktop.in b/posix/snek.desktop.in → ports/posix/snek.desktop.in
diff --git a/snek-duino/.gitignore → ports/snek-duino/.gitignore b/snek-duino/.gitignore → ports/snek-duino/.gitignore
diff --git a/snek-duino/Makefile → ports/snek-duino/Makefile b/snek-duino/Makefile → ports/snek-duino/Makefile
@@ -12,18 +12,20 @@
 # General Public License for more details.
 #
 
-SNEK_ROOT = ..
+SNEK_ROOT = ../..
+SNEK_ATMEGA = $(SNEK_ROOT)/chips/atmega
+
 SNEK_LOCAL_SRC = \
 	snek-duino.c \
 	snek-atmega-eeprom.c \
 	snek-io.c \
 	snek-atmega-serial.c
 
-SNEK_LOCAL_VPATH = $(SNEK_ROOT)/atmega
-SNEK_LOCAL_INC = $(SNEK_LOCAL_VPATH)/snek-atmega.h
+SNEK_LOCAL_VPATH = $(SNEK_ATMEGA)
+SNEK_LOCAL_INC = $(SNEK_ATMEGA)/snek-atmega.h
 SNEK_LOCAL_BUILTINS = snek-duino.builtin
 
-include ../snek-install.defs
+include $(SNEK_ROOT)/snek-install.defs
 
 SNEK_CFLAGS = $(SNEK_MOST_WARNINGS) $(SNEK_BASE_CFLAGS)
 

diff --git a/snek-duino/snek-duino-install.1 → ports/snek-duino/snek-duino-install.1 b/snek-duino/snek-duino-install.1 → ports/snek-duino/snek-duino-install.1
diff --git a/snek-duino/snek-duino-install.in → ports/snek-duino/snek-duino-install.in b/snek-duino/snek-duino-install.in → ports/snek-duino/snek-duino-install.in
diff --git a/snek-duino/snek-duino.builtin → ports/snek-duino/snek-duino.builtin b/snek-duino/snek-duino.builtin → ports/snek-duino/snek-duino.builtin
diff --git a/snek-duino/snek-duino.c → ports/snek-duino/snek-duino.c b/snek-duino/snek-duino.c → ports/snek-duino/snek-duino.c
diff --git a/snek-mega/.gitignore → ports/snek-mega/.gitignore b/snek-mega/.gitignore → ports/snek-mega/.gitignore
diff --git a/...no-usbserial-atmega16u2-Mega2560-Rev3.hex → ...no-usbserial-atmega16u2-Mega2560-Rev3.hex b/...no-usbserial-atmega16u2-Mega2560-Rev3.hex → ...no-usbserial-atmega16u2-Mega2560-Rev3.hex
diff --git a/snek-mega/Makefile → ports/snek-mega/Makefile b/snek-mega/Makefile → ports/snek-mega/Makefile
@@ -12,7 +12,9 @@
 # General Public License for more details.
 #
 
-SNEK_ROOT = ..
+SNEK_ROOT = ../..
+SNEK_ATMEGA = $(SNEK_ROOT)/chips/atmega
+
 SNEK_LOCAL_SRC = \
 	snek-mega.c \
 	snek-atmega-eeprom.c \
@@ -34,13 +36,14 @@ SNEK_LOCAL_SRC = \
 	kf_sin.c \
 	kf_cos.c
 
-SNEK_LOCAL_VPATH = $(SNEK_ROOT)/atmega
-SNEK_LOCAL_INC = $(SNEK_LOCAL_VPATH)/snek-atmega.h machine/ieeefp.h fdlibm.h snek-mega-math.h
+SNEK_LOCAL_VPATH = $(SNEK_ATMEGA)
+SNEK_LOCAL_INC = $(SNEK_ATMEGA)/snek-atmega.h machine/ieeefp.h fdlibm.h snek-mega-math.h
+
 SNEK_LOCAL_BUILTINS = \
 	snek-mega.builtin \
 	snek-math.builtin
 
-include ../snek-install.defs
+include $(SNEK_ROOT)/snek-install.defs
 
 SNEK_CFLAGS = $(SNEK_MOST_WARNINGS) $(SNEK_BASE_CFLAGS)
 

diff --git a/snek-mega/ef_acosh.c → ports/snek-mega/ef_acosh.c b/snek-mega/ef_acosh.c → ports/snek-mega/ef_acosh.c
diff --git a/snek-mega/ef_atanh.c → ports/snek-mega/ef_atanh.c b/snek-mega/ef_atanh.c → ports/snek-mega/ef_atanh.c
diff --git a/snek-mega/ef_remainder.c → ports/snek-mega/ef_remainder.c b/snek-mega/ef_remainder.c → ports/snek-mega/ef_remainder.c
diff --git a/snek-mega/erf_gamma.c → ports/snek-mega/erf_gamma.c b/snek-mega/erf_gamma.c → ports/snek-mega/erf_gamma.c
diff --git a/snek-mega/erf_lgamma.c → ports/snek-mega/erf_lgamma.c b/snek-mega/erf_lgamma.c → ports/snek-mega/erf_lgamma.c
diff --git a/snek-mega/exp2.c → ports/snek-mega/exp2.c b/snek-mega/exp2.c → ports/snek-mega/exp2.c
diff --git a/snek-mega/fdlibm.h → ports/snek-mega/fdlibm.h b/snek-mega/fdlibm.h → ports/snek-mega/fdlibm.h
diff --git a/snek-mega/kf_cos.c → ports/snek-mega/kf_cos.c b/snek-mega/kf_cos.c → ports/snek-mega/kf_cos.c
diff --git a/snek-mega/kf_sin.c → ports/snek-mega/kf_sin.c b/snek-mega/kf_sin.c → ports/snek-mega/kf_sin.c
diff --git a/snek-mega/machine/ieeefp.h → ports/snek-mega/machine/ieeefp.h b/snek-mega/machine/ieeefp.h → ports/snek-mega/machine/ieeefp.h
diff --git a/snek-mega/math_config.h → ports/snek-mega/math_config.h b/snek-mega/math_config.h → ports/snek-mega/math_config.h
diff --git a/snek-mega/sf_asinh.c → ports/snek-mega/sf_asinh.c b/snek-mega/sf_asinh.c → ports/snek-mega/sf_asinh.c
diff --git a/snek-mega/sf_erf.c → ports/snek-mega/sf_erf.c b/snek-mega/sf_erf.c → ports/snek-mega/sf_erf.c
diff --git a/snek-mega/sf_exp.c → ports/snek-mega/sf_exp.c b/snek-mega/sf_exp.c → ports/snek-mega/sf_exp.c
diff --git a/snek-mega/sf_exp2.c → ports/snek-mega/sf_exp2.c b/snek-mega/sf_exp2.c → ports/snek-mega/sf_exp2.c
diff --git a/snek-mega/sf_log1p.c → ports/snek-mega/sf_log1p.c b/snek-mega/sf_log1p.c → ports/snek-mega/sf_log1p.c
diff --git a/snek-mega/sf_log2.c → ports/snek-mega/sf_log2.c b/snek-mega/sf_log2.c → ports/snek-mega/sf_log2.c
diff --git a/snek-mega/sf_log2_data.c → ports/snek-mega/sf_log2_data.c b/snek-mega/sf_log2_data.c → ports/snek-mega/sf_log2_data.c
diff --git a/snek-mega/snek-mega-install.1 → ports/snek-mega/snek-mega-install.1 b/snek-mega/snek-mega-install.1 → ports/snek-mega/snek-mega-install.1
diff --git a/snek-mega/snek-mega-install.in → ports/snek-mega/snek-mega-install.in b/snek-mega/snek-mega-install.in → ports/snek-mega/snek-mega-install.in
diff --git a/snek-mega/snek-mega-math.builtin → ports/snek-mega/snek-mega-math.builtin b/snek-mega/snek-mega-math.builtin → ports/snek-mega/snek-mega-math.builtin
diff --git a/snek-mega/snek-mega-math.c → ports/snek-mega/snek-mega-math.c b/snek-mega/snek-mega-math.c → ports/snek-mega/snek-mega-math.c
diff --git a/snek-mega/snek-mega-math.h → ports/snek-mega/snek-mega-math.h b/snek-mega/snek-mega-math.h → ports/snek-mega/snek-mega-math.h
diff --git a/snek-mega/snek-mega.builtin → ports/snek-mega/snek-mega.builtin b/snek-mega/snek-mega.builtin → ports/snek-mega/snek-mega.builtin
diff --git a/snek-mega/snek-mega.c → ports/snek-mega/snek-mega.c b/snek-mega/snek-mega.c → ports/snek-mega/snek-mega.c
diff --git a/snek-mega/wf_tgamma.c → ports/snek-mega/wf_tgamma.c b/snek-mega/wf_tgamma.c → ports/snek-mega/wf_tgamma.c