diff --git a/distrib/autobuild.py b/distrib/autobuild.py index 52515714f3..e2156f5464 100755 --- a/distrib/autobuild.py +++ b/distrib/autobuild.py @@ -428,13 +428,6 @@ def generate_apidoc(): system_command('wc -l ../../../doxyissues-hexen.txt') -def generate_readme(): - """Run Amethyst to generate readme documentation.""" - git_pull() - os.chdir(os.path.join(builder.config.DISTRIB_DIR, '../doomsday/doc/output')) - system_command('make clean all') - - def generate_wiki(): """Automatically generate wiki pages.""" git_pull() @@ -541,7 +534,6 @@ def sorted_commands(): 'purge': purge_obsolete, 'cleanup': dir_cleanup, 'apidoc': generate_apidoc, - 'readme': generate_readme, 'wiki': generate_wiki, 'web_init': web_init, 'web_update': web_update, diff --git a/distrib/pilot.py b/distrib/pilot.py index 06697381d4..334b605ae4 100755 --- a/distrib/pilot.py +++ b/distrib/pilot.py @@ -354,10 +354,6 @@ def doTask(task): msg("PURGE") return autobuild('purge') - elif task == 'generate_readme': - msg("GENERATE README") - return autobuild('readme') - elif task == 'generate_apidoc': msg("GENERATE API DOCUMENTATION") return autobuild('apidoc') @@ -390,7 +386,6 @@ def handleCompletedTasks(): elif task == 'tag_build': newTask('deb_changes', forClient='ubuntu-32bit') newTask('mac_meta', forClient='master') - newTask('generate_readme', forClient='dox') elif task == 'deb_changes': newTask('build', allClients=True) diff --git a/doomsday/doc/output/Makefile b/doomsday/doc/output/Makefile index ea1b276e7f..e2635160c6 100644 --- a/doomsday/doc/output/Makefile +++ b/doomsday/doc/output/Makefile @@ -9,25 +9,7 @@ sv_main := ../server/server.ame .PHONY: wiki -all: doomsday.6 doomsday-server.6 doomsday-shell-text.6 Read\ Me.rtf readme.txt wiki - -doomsday.6: $(readme_sources) - amethyst -dMAN -dUNIX -odoomsday.6 $(readme_main) - -Read\ Me.rtf: $(readme_sources) - amethyst -dRTF -dMACOSX -oRead\ Me.rtf $(readme_main) - -readme.txt: $(readme_sources) - amethyst -dTXT -dWIN32 -dCR_NL -oreadme.txt $(readme_main) - -doomsday-server.6: $(sv_sources) - amethyst -dMAN -dUNIX -odoomsday-server.6 $(sv_main) - -doomsday-shell-text.6: $(shell_sources) - amethyst -dMAN -dUNIX -odoomsday-shell-text.6 $(shell_main) +all: wiki wiki: python /Users/jaakko/Dropbox/Scripts/readme_to_wiki.py - -clean: - rm -f doomsday.6 Read\ Me.rtf readme.txt