neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Try to resolve config.py problems

This commit is contained in:
Neale Pickett 2010-05-15 17:08:03 -06:00
parent 272f9c5d59
commit 53609263e6
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Makefile
View File

@ -30,35 +30,36 @@ puzzles-build: puzzles
puzzles-install: puzzles-build puzzles-install: puzzles-build
./mkpuzzles.py --base=$(BASE_URL) --puzzles=$(BUILD_DIR)/puzzles \ ./mkpuzzles.py --base=$(BASE_URL) --puzzles=$(BUILD_DIR)/puzzles \
--htmldir=$(WWW)/puzzler --keyfile=$(LIB)/puzzler.keys --htmldir=$(DESTDIR)$(WWW)/puzzler \
--keyfile=$(DESTDIR)$(LIB)/puzzler.keys
puzzles-clean: puzzles-clean:
rm -rf $(BUILD_DIR)/puzzles $(WWW)/puzzler $(LIB)/puzzler.keys rm -rf $(BUILD_DIR)/puzzles $(DESTDIR)$(WWW)/puzzler $(DESTDIR)$(LIB)/puzzler.keys
tanks-install: tanks-install:
install --directory $(VAR)/tanks install --directory $(DESTDIR)$(VAR)/tanks
install --directory $(VAR)/tanks/results install --directory $(DESTDIR)$(VAR)/tanks/results
install --directory $(VAR)/tanks/errors install --directory $(DESTDIR)$(VAR)/tanks/errors
install --directory $(VAR)/tanks/ai install --directory $(DESTDIR)$(VAR)/tanks/ai
install --directory $(VAR)/tanks/ai/players install --directory $(DESTDIR)$(VAR)/tanks/ai/players
install --directory $(VAR)/tanks/ai/house install --directory $(DESTDIR)$(VAR)/tanks/ai/house
ln -sf $(VAR)/tanks/results $(WWW)/tanks/results ln -sf $(VAR)/tanks/results $(DESTDIR)$(WWW)/tanks/results
install bin/run-tanks $(SBIN) install bin/run-tanks $(DESTDIR)$(SBIN)
tanks-clean: tanks-clean:
rm -rf $(VAR)/tanks rm -rf $(DESTDIR)$(VAR)/tanks
rm -rf $(WWW)/tanks rm -rf $(DESTDIR)$(WWW)/tanks
install: $(INSTALL_TARGETS) install: $(INSTALL_TARGETS)
install bin/pointscli $(BIN) install bin/pointscli $(DESTDIR)$(BIN)
install bin/in.pointsd bin/in.flagd \ install bin/in.pointsd bin/in.flagd \
bin/scoreboard \ bin/scoreboard \
bin/run-ctf $(SBIN) bin/run-ctf $(DESTDIR)$(SBIN)
cp -r lib/* $(LIB) cp -r lib/* $(DESTDIR)$(LIB)
cp -r www/* $(WWW) cp -r www/* $(DESTDIR)$(WWW)
cp template.html $(LIB) cp template.html $(DESTDIR)$(LIB)
install --directory $(VAR)/disabled install --directory $(VAR)/disabled
@ -67,14 +68,14 @@ install: $(INSTALL_TARGETS)
$(INSTALL_TARGETS): base-install $(INSTALL_TARGETS): base-install
base-install: base-install:
install --directory $(LIB) $(BIN) $(SBIN) install --directory $(DESTDIR)$(LIB) $(DESTDIR)$(BIN) $(DESTDIR)$(SBIN)
install --directory $(VAR) install --directory $(DESTDIR)$(VAR)
install --directory $(WWW) install --directory $(DESTDIR)$(WWW)
install --directory $(WWW)/puzzler install --directory $(DESTDIR)$(WWW)/puzzler
install --directory $(VAR)/points install --directory $(DESTDIR)$(VAR)/points
install --directory $(VAR)/points/tmp install --directory $(DESTDIR)$(VAR)/points/tmp
install --directory $(VAR)/points/cur install --directory $(DESTDIR)$(VAR)/points/cur
install --directory $(VAR)/flags install --directory $(DESTDIR)$(VAR)/flags
echo 'VAR = "$(VAR)"' > ctf/paths.py echo 'VAR = "$(VAR)"' > ctf/paths.py
echo 'WWW = "$(WWW)"' >> ctf/paths.py echo 'WWW = "$(WWW)"' >> ctf/paths.py
@ -84,8 +85,9 @@ base-install:
echo 'BASE_URL = "$(BASE_URL)"' >> ctf/paths.py echo 'BASE_URL = "$(BASE_URL)"' >> ctf/paths.py
uninstall: uninstall:
rm -rf $(VAR) $(WWW) $(LIB) $(BIN) $(SBIN) rm -rf $(DESTDIR)$(VAR) $(DESTDIR)$(WWW) $(DESTDIR)$(LIB)
rmdir $(BASE) || true rm -rf $(DESTDIR)$(BIN) $(DESTDIR)$(SBIN)
rmdir $(DESTDIR)$(BASE) || true
clean: $(CLEAN_TARGETS) clean: $(CLEAN_TARGETS)