Make puzzles first class categories

2010-10-21 22:15:18 -06:00 · 2010-10-21 22:15:18 -06:00 · 637545aa9a
parent 7fba5155b1
commit 637545aa9a
530 changed files with 194 additions and 191 deletions
--- a/21
+++ b/21
@ -1,21 +1,6 @@
-PACKAGES = 
+BUILD = build
+BIN = bin

 all: packages

-define COPYTREE
-	mkdir -p $(2)
-	(cd $(1) && find . -not -name "*~" | cpio -o) | (cd $(2) && cpio -i)
-endef
-
-
-include */*.mk
-
-packages: $(addsuffix .pkg, $(PACKAGES))
-
-install: $(addsuffix -install, $(PACKAGES))
-
-clean: $(addsuffix -clean, $(PACKAGES))
-	rm -rf build *.pkg *-install *-build
-
-%.pkg: %-install
-	mksquashfs build/$* $*.pkg -all-root -noappend
+include packages/packages.mk
--- a/include/arc4.c
+++ b/include/arc4.c
--- a/include/arc4.h
+++ b/include/arc4.h
--- a/include/isaac.c
+++ b/include/isaac.c
--- a/include/isaac.h
+++ b/include/isaac.h
--- a/include/token.c
+++ b/include/token.c
--- a/include/token.h
+++ b/include/token.h
--- a/logger/logger.mk
+++ b/logger/logger.mk
@ -1,21 +0,0 @@
-LOGGER_PKGDIR = build/logger
-LOGGER_PACKAGE = logger.pkg
-
-logger-install: logger-build
-	mkdir -p $(LOGGER_PKGDIR)
-
-	mkdir -p $(LOGGER_PKGDIR)/bin/
-	$(MAKE) -C logger/src install DESTDIR=$(CURDIR)/$(LOGGER_PKGDIR)
-
-	$(call COPYTREE, logger/tokens, $(LOGGER_PKGDIR)/tokens)	
-
-	$(call COPYTREE, logger/service, $(LOGGER_PKGDIR)/service)
-
-logger-clean:
-	rm -rf $(LOGGER_PKGDIR) $(LOGGER_PACKAGE)
-	$(MAKE) -C logger/src clean
-
-logger-build:
-	$(MAKE) -C logger/src build
-
-PACKAGES += logger
--- a/logger/src/token.c
+++ b/logger/src/token.c
@ -1 +0,0 @@
-../../common/token.c
--- a/logger/src/token.h
+++ b/logger/src/token.h
@ -1 +0,0 @@
-../../common/token.h
--- a/mcp/mcp.mk
+++ b/mcp/mcp.mk
@ -1,33 +0,0 @@
-MCP_PKGDIR = build/mcp
-MCP_PACKAGE = mcp.pkg
-
-mcp-install: mcp-build
-	mkdir -p $(MCP_PKGDIR)
-
-	$(call COPYTREE, mcp/bin, $(MCP_PKGDIR)/bin)
-	cp mcp/src/in.tokend $(MCP_PKGDIR)/bin/
-	cp mcp/src/tokencli $(MCP_PKGDIR)/bin/
-	cp mcp/src/tokencli $(MCP_PKGDIR)/bin/
-	cp mcp/src/puzzles.cgi $(MCP_PKGDIR)/bin/
-
-	$(call COPYTREE, mcp/service, $(MCP_PKGDIR)/service)
-
-	$(call COPYTREE, mcp/tokend.keys, $(MCP_PKGDIR)/tokend.keys)
-
-	$(call COPYTREE, mcp/www, $(MCP_PKGDIR)/www)
-	cp mcp/src/puzzler.cgi $(MCP_PKGDIR)/www/
-	cp mcp/src/claim.cgi $(MCP_PKGDIR)/www/
-
-	touch $@
-
-mcp-test: mcp-build
-	mcp/test.sh
-
-mcp-clean:
-	rm -rf $(MCP_PKGDIR) $(MCP_PACKAGE) mcp-install
-	$(MAKE) -C mcp/src clean
-
-mcp-build:
-	$(MAKE) -C mcp/src build
-
-PACKAGES += mcp
--- a/mcp/src/arc4.c
+++ b/mcp/src/arc4.c
@ -1 +0,0 @@
-../../common/arc4.c
--- a/mcp/src/arc4.h
+++ b/mcp/src/arc4.h
@ -1 +0,0 @@
-../../common/arc4.h
--- a/puzzles/mkpuzzles
+++ b/puzzles/mkpuzzles
--- a/octopus/octopus.mk
+++ b/octopus/octopus.mk
@ -1,20 +0,0 @@
-OCTOPUS_PKGDIR = build/octopus
-OCTOPUS_PACKAGE = octopus.pkg
-
-octopus-install: octopus-build
-	mkdir -p $(OCTOPUS_PKGDIR)/bin/
-
-	$(call COPYTREE, octopus/service, $(OCTOPUS_PKGDIR)/service)
-
-	$(call COPYTREE, octopus/tokens, $(OCTOPUS_PKGDIR)/tokens)
-
-	cp octopus/src/octopus $(OCTOPUS_PKGDIR)/bin/
-
-octopus-clean:
-	rm -rf $(OCTOPUS_PKGDIR) $(OCTOPUS_PACKAGE)
-	$(MAKE) -C octopus/src clean
-
-octopus-build:
-	$(MAKE) -C octopus/src build
-
-PACKAGES += octopus
--- a/octopus/src/token.c
+++ b/octopus/src/token.c
@ -1 +0,0 @@
-../../common/token.c
--- a/octopus/src/token.h
+++ b/octopus/src/token.h
@ -1 +0,0 @@
-../../common/token.h
--- a/packages/basemath/1/index.mdwn
+++ b/packages/basemath/1/index.mdwn
--- a/packages/basemath/1/key
+++ b/packages/basemath/1/key
--- a/packages/basemath/2/index.mdwn
+++ b/packages/basemath/2/index.mdwn
--- a/packages/basemath/2/key
+++ b/packages/basemath/2/key
--- a/packages/basemath/3/index.mdwn
+++ b/packages/basemath/3/index.mdwn
--- a/packages/basemath/3/key
+++ b/packages/basemath/3/key
--- a/packages/basemath/4/index.mdwn
+++ b/packages/basemath/4/index.mdwn
--- a/packages/basemath/4/key
+++ b/packages/basemath/4/key
--- a/packages/basemath/5/index.mdwn
+++ b/packages/basemath/5/index.mdwn
--- a/packages/basemath/5/key
+++ b/packages/basemath/5/key
--- a/packages/basemath/basemath.mk
+++ b/packages/basemath/basemath.mk
@ -0,0 +1 @@
+$(eval $(call STANDARD_PUZZLE, basemath))
--- a/packages/basemath/summary.txt
+++ b/packages/basemath/summary.txt
--- a/packages/bletchley/100/key
+++ b/packages/bletchley/100/key
--- a/packages/bletchley/100/key.png
+++ b/packages/bletchley/100/key.png
--- a/packages/bletchley/1000/index.mdwn
+++ b/packages/bletchley/1000/index.mdwn
--- a/packages/bletchley/1000/key
+++ b/packages/bletchley/1000/key
--- a/packages/bletchley/150/aacaaebb0cd0503e7bad97c42321a738
+++ b/packages/bletchley/150/aacaaebb0cd0503e7bad97c42321a738
--- a/packages/bletchley/150/index.mdwn
+++ b/packages/bletchley/150/index.mdwn
--- a/packages/bletchley/150/key
+++ b/packages/bletchley/150/key
--- a/packages/bletchley/200/index.mdwn
+++ b/packages/bletchley/200/index.mdwn
--- a/packages/bletchley/200/key
+++ b/packages/bletchley/200/key
--- a/packages/bletchley/250/index.mdwn
+++ b/packages/bletchley/250/index.mdwn
--- a/packages/bletchley/250/key
+++ b/packages/bletchley/250/key
--- a/packages/bletchley/300/index.mdwn
+++ b/packages/bletchley/300/index.mdwn
--- a/packages/bletchley/300/key
+++ b/packages/bletchley/300/key
--- a/packages/bletchley/350/936bc08007a9076673a81040024728be
+++ b/packages/bletchley/350/936bc08007a9076673a81040024728be
--- a/packages/bletchley/350/key
+++ b/packages/bletchley/350/key
--- a/packages/bletchley/50/adddbafb502355634d9ef10e1848cf52
+++ b/packages/bletchley/50/adddbafb502355634d9ef10e1848cf52
--- a/packages/bletchley/50/key
+++ b/packages/bletchley/50/key
--- a/packages/bletchley/500/200601262232.ogg
+++ b/packages/bletchley/500/200601262232.ogg
--- a/packages/bletchley/500/cipher.txt
+++ b/packages/bletchley/500/cipher.txt
--- a/packages/bletchley/500/index.mdwn
+++ b/packages/bletchley/500/index.mdwn
--- a/packages/bletchley/500/key
+++ b/packages/bletchley/500/key
--- a/packages/bletchley/900/1d45b460b5844d0d769ca469f7b5bdc7
+++ b/packages/bletchley/900/1d45b460b5844d0d769ca469f7b5bdc7
--- a/packages/bletchley/900/key
+++ b/packages/bletchley/900/key
--- a/packages/bletchley/bletchley.mk
+++ b/packages/bletchley/bletchley.mk
@ -0,0 +1 @@
+$(eval $(call STANDARD_PUZZLE, bletchley))
--- a/packages/bletchley/summary.txt
+++ b/packages/bletchley/summary.txt
--- a/packages/codebreaking/1/index.mdwn
+++ b/packages/codebreaking/1/index.mdwn
--- a/packages/codebreaking/1/key
+++ b/packages/codebreaking/1/key
--- a/packages/codebreaking/2/index.mdwn
+++ b/packages/codebreaking/2/index.mdwn
--- a/packages/codebreaking/2/key
+++ b/packages/codebreaking/2/key
--- a/packages/codebreaking/3/dancing.png
+++ b/packages/codebreaking/3/dancing.png
--- a/packages/codebreaking/3/index.mdwn
+++ b/packages/codebreaking/3/index.mdwn
--- a/packages/codebreaking/3/key
+++ b/packages/codebreaking/3/key
--- a/packages/codebreaking/4/index.mdwn
+++ b/packages/codebreaking/4/index.mdwn
--- a/packages/codebreaking/4/key
+++ b/packages/codebreaking/4/key
--- a/packages/codebreaking/5/image.png
+++ b/packages/codebreaking/5/image.png
--- a/packages/codebreaking/5/key
+++ b/packages/codebreaking/5/key
--- a/packages/codebreaking/6/image.png
+++ b/packages/codebreaking/6/image.png
--- a/packages/codebreaking/6/key
+++ b/packages/codebreaking/6/key
--- a/packages/codebreaking/7/index.mdwn
+++ b/packages/codebreaking/7/index.mdwn
--- a/packages/codebreaking/7/key
+++ b/packages/codebreaking/7/key
--- a/packages/codebreaking/8/index.mdwn
+++ b/packages/codebreaking/8/index.mdwn
--- a/packages/codebreaking/8/key
+++ b/packages/codebreaking/8/key
--- a/packages/codebreaking/codebreaking.mk
+++ b/packages/codebreaking/codebreaking.mk
@ -0,0 +1 @@
+$(eval $(call STANDARD_PUZZLE, codebreaking))
--- a/packages/codebreaking/summary.txt
+++ b/packages/codebreaking/summary.txt
--- a/packages/compaq/100/index.mdwn
+++ b/packages/compaq/100/index.mdwn
--- a/packages/compaq/100/key
+++ b/packages/compaq/100/key
--- a/packages/compaq/150/b2f3f6b43ecadc7ae0b5f0edde694c78
+++ b/packages/compaq/150/b2f3f6b43ecadc7ae0b5f0edde694c78
--- a/packages/compaq/150/key
+++ b/packages/compaq/150/key
--- a/packages/compaq/200/a6bcc9cff02efe6ae870e422014ee8c2
+++ b/packages/compaq/200/a6bcc9cff02efe6ae870e422014ee8c2
--- a/packages/compaq/200/key
+++ b/packages/compaq/200/key
--- a/packages/compaq/350/e76cb42be0c0f12f97b2071aba8b74f2
+++ b/packages/compaq/350/e76cb42be0c0f12f97b2071aba8b74f2
--- a/packages/compaq/350/key
+++ b/packages/compaq/350/key
--- a/packages/compaq/400/d56b7cb684b7d5137cbf7980b4e4a68f
+++ b/packages/compaq/400/d56b7cb684b7d5137cbf7980b4e4a68f
--- a/packages/compaq/400/key
+++ b/packages/compaq/400/key
--- a/packages/compaq/50/index.mdwn
+++ b/packages/compaq/50/index.mdwn
--- a/packages/compaq/50/key
+++ b/packages/compaq/50/key
--- a/packages/compaq/500/02cb1e1d65a68b29ac851936c9bb4684
+++ b/packages/compaq/500/02cb1e1d65a68b29ac851936c9bb4684
--- a/packages/compaq/500/key
+++ b/packages/compaq/500/key
--- a/packages/compaq/600/daa36d50d4c807634dfd13a8239046de
+++ b/packages/compaq/600/daa36d50d4c807634dfd13a8239046de
--- a/packages/compaq/600/key
+++ b/packages/compaq/600/key
--- a/packages/compaq/compaq.mk
+++ b/packages/compaq/compaq.mk
@ -0,0 +1 @@
+$(eval $(call STANDARD_PUZZLE, compaq))
--- a/packages/compaq/summary.txt
+++ b/packages/compaq/summary.txt
--- a/packages/crypto/1/index.mdwn
+++ b/packages/crypto/1/index.mdwn
--- a/packages/crypto/1/key
+++ b/packages/crypto/1/key
--- a/packages/crypto/100/index.mdwn
+++ b/packages/crypto/100/index.mdwn
--- a/packages/crypto/100/key
+++ b/packages/crypto/100/key
--- a/packages/crypto/100caesar.py
+++ b/packages/crypto/100caesar.py
--- a/packages/crypto/110/index.mdwn
+++ b/packages/crypto/110/index.mdwn
--- a/packages/crypto/110/key
+++ b/packages/crypto/110/key
--- a/packages/crypto/110substitution.py
+++ b/packages/crypto/110substitution.py
--- a/packages/crypto/120/index.mdwn
+++ b/packages/crypto/120/index.mdwn
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`$(eval $(call STANDARD_PUZZLE, codebreaking))`