Index: Makefile
===================================================================
RCS file: /cactusdevcvs/Cactus/Makefile,v
retrieving revision 1.182
diff -r1.182 Makefile
388,391c388,395
< 	@echo "  -ThornDoc        - produce the documentation for the thorn"
< 	@echo "                     in doc/ThornDoc/<arrangement>/<thorn-name>/."
< 	@echo "  -ArrangementDoc  - produce documentation for the arrangement"
< 	@echo "                     in doc/ArrangementDoc/<arrangement-name>/."
---
> 	@echo "  -ThornDoc           - produce the documentation for the thorn"
> 	@echo "                        in doc/ThornDoc/<arrangement>/<thorn-name>/."
> 	@echo "  -ThornDocHTML       - produce the documentation for the thorn in HTML format"
> 	@echo "                        in doc/ThornDoc/<arrangement>/<thorn-name>/."
> 	@echo "  -ArrangementDoc     - produce documentation for the arrangement"
> 	@echo "                        in doc/ArrangementDoc/<arrangement-name>/."
> 	@echo "  -ArrangementDocHTML - produce documentation for the arrangement in HTML format"
> 	@echo "                        in doc/ArrangementDoc/<arrangement-name>/."
395,415c399,432
< 	@echo "  checkout         - checkout public arrangements/thorns."
< 	@echo "  cvsdiff          - show differences between installed Cactus and"
< 	@echo "                     version in CVS repository."
< 	@echo "  cvsstatus        - report on status of Cactus (when installed from CVS)."
< 	@echo "  update           - update flesh and arrangements from CVS and/or SVN."
< 	@echo "  default          - create a new configuration with a default name."
< 	@echo "  distclean        - delete all existing configurations."
< 	@echo "  downsize         - remove non-essential files."
< 	@echo "  MaintGuide       - create maintainers manual, MaintGuide.pdf."
< 	@echo "  newthorn         - create a new thorn."
< 	@echo "  TAGS             - create an emacs TAGS file."
< 	@echo "  tags             - create a vi TAGS file."
< 	@echo "  thorninfo        - give information about all available thorns."
< 	@echo "  UsersGuide       - create users manual doc/UsersGuide.pdf."
< 	@echo "  ReferenceManual  - create reference manual doc/ReferenceManual.pdf."
< 	@echo "  ThornGuide       - create the thorn manual doc/ThornGuide.pdf."
< 	@echo "  ThornDoc         - create documentation for all thorns in doc/ThornDoc."
< 	@echo "  ArrangementDoc   - create documentation for all arrangements"
< 	@echo "                     in doc/ArrangementDoc."
< 	@echo "  AllDoc           - build all documentation."
< 	@echo "  <anything else>  - prompt to create a configuration with that name."
---
> 	@echo "  checkout            - checkout public arrangements/thorns."
> 	@echo "  cvsdiff             - show differences between installed Cactus and"
> 	@echo "                        version in CVS repository."
> 	@echo "  cvsstatus           - report on status of Cactus (when installed from CVS)."
> 	@echo "  update              - update flesh and arrangements from CVS and/or SVN."
> 	@echo "  default             - create a new configuration with a default name."
> 	@echo "  distclean           - delete all existing configurations."
> 	@echo "  downsize            - remove non-essential files."
> 	@echo "  newthorn            - create a new thorn."
> 	@echo "  TAGS                - create an emacs TAGS file."
> 	@echo "  tags                - create a vi TAGS file."
> 	@echo "  thorninfo           - give information about all available thorns."
> 	@echo "  MaintGuide          - create maintainers manual."
> 	@echo "  MaintGuideHTML      - create maintainers manual in HTML format in
> 	@echo "                        doc/HTML/MaintGuide."
> 	@echo "  UsersGuide          - create users manual doc/UsersGuide.pdf."
> 	@echo "  UsersGuideHTML      - create users manual in HTML format in"
> 	@echo "                        doc/HTML/UsersGuide/."
> 	@echo "  ReferenceManual     - create reference manual doc/ReferenceManual.pdf."
> 	@echo "  ReferenceManualHTML - create reference manual in HTML format in"
> 	@echo "                        doc/HTML/ReferenceManual/."
> 	@echo "  ThornGuide          - create the thorn manual doc/ThornGuide.pdf."
> 	@echo "  ThornGuideHTML      - create the thorn manual in HTML format in"
> 	@echo "                        doc/HTML/ThornGuide/."
> 	@echo "  ThornDoc            - create documentation for all thorns in doc/ThornDoc."
> 	@echo "  ThornDocHTML        - create documentation for all thorns in HTML format"
> 	@echo "                        in doc/ThornHTML."
> 	@echo "  ArrangementDoc      - create documentation for all arrangements"
> 	@echo "                        in doc/ArrangementDoc."
> 	@echo "  ArrangementDocHTML  - create documentation for all arrangements in HTML format"
> 	@echo "                        format in doc/ArrangementHTML."
> 	@echo "  AllDoc              - build all documentation."
> 	@echo "  AllDocHTML          - build all documentation in HTML format."
> 	@echo "  <anything else>     - prompt to create a configuration with that name."
1005a1023,1026
> # Make all HTML documentation
> .PHONY: AllDocHTML
> AllDocHTML: UsersGuideHTML ReferenceManualHTML MaintGuideHTML ThornDocHTML ArrangementDocHTML
> 
1030a1052,1072
> .PHONY: UsersGuideHTML
> UsersGuideHTML:
> 	@echo $(DIVIDER)
> 	@echo "Creating user documentation (HTML)"
> 	cd doc/UsersGuide;                         \
> 	echo "  Running htlatex....";              \
> 	htlatex UsersGuide.tex "" "" "" -interaction=nonstopmode > LATEX_MESSAGES 2>&1; \
> 	if grep "^\! " "LATEX_MESSAGES"; then                            \
> 	  echo "  Problem in $<.  See doc/UsersGuide/LATEX_MESSAGES.";      \
> 	  exit 1;                                                           \
> 	elif grep "^LaTeX Warning:" "LATEX_MESSAGES"; then                  \
> 	  echo "  For more information see doc/UsersGuide/LATEX_MESSAGES."; \
> 	fi;                                                                 \
>   mkdir -p $(CCTK_HOME)/doc/HTML/UsersGuide;            \
> 	cp UsersGuide*.png $(CCTK_HOME)/doc/HTML/UsersGuide/; \
> 	cp UsersGuide*.html $(CCTK_HOME)/doc/HTML/UsersGuide/; \
> 	cp UsersGuide.css $(CCTK_HOME)/doc/HTML/UsersGuide/
> 	@echo "  Users Guide (HTML) created in doc/HTML/UsersGuide directory."
> 	@echo "  Done."
> 	@echo $(DIVIDER)
> 
1055a1098,1118
> .PHONY: ReferenceManualHTML
> ReferenceManualHTML:
> 	@echo $(DIVIDER)
> 	@echo "Creating user reference manual (HTML)"
> 	cd doc/ReferenceManual;                     \
> 	echo "  Running htlatex....";              \
> 	htlatex ReferenceManual.tex "" "" "" -interaction=nonstopmode  > LATEX_MESSAGES 2>&1; \
> 	if grep "^\! " "LATEX_MESSAGES"; then                            \
> 	  echo "  Problem in $<.  See doc/ReferenceManual/LATEX_MESSAGES."; \
> 	  exit 1;                                                           \
> 	elif grep "^LaTeX Warning:" "LATEX_MESSAGES"; then    \
> 	  echo "  For more information see doc/ReferenceManual/LATEX_MESSAGES."; \
> 	fi;                                         \
> 	mkdir -p $(CCTK_HOME)/doc/HTML/ReferenceManual;                \
> 	cp ReferenceManual*.png $(CCTK_HOME)/doc/HTML/ReferenceManual; \
> 	cp ReferenceManual*.html $(CCTK_HOME)/doc/HTML/ReferenceManual; \
> 	cp ReferenceManual.css  $(CCTK_HOME)/doc/HTML/ReferenceManual
> 	@echo "  HTML ReferenceManual created in doc/HTML/ReferenceManual directory."
> 	@echo "  Done."
> 	@echo $(DIVIDER)
> 
1080a1144,1164
> .PHONY: MaintGuideHTML
> MaintGuideHTML:
> 	@echo $(DIVIDER)
> 	@echo "Creating maintainers documentation (HTML)"
> 	cd doc/MaintGuide;                          \
> 	echo "  Running htlatex....";              \
> 	htlatex MaintGuide.tex "" "" "" -interaction=nonstopmode  > LATEX_MESSAGES 2>&1; \
> 	if grep "^\! " "LATEX_MESSAGES"; then                               \
> 	  echo "  Problem in $<.  See doc/MaintGuide/LATEX_MESSAGES.";      \
> 	  exit 1;                                                           \
> 	elif grep "^LaTeX Warning:" "LATEX_MESSAGES"; then                  \
> 	  echo "  For more information see doc/MaintGuide/LATEX_MESSAGES."; \
> 	fi;                                                                 \
> 	mkdir -p $(CCTK_HOME)/doc/HTML/MaintGuide;                          \
> 	cp MaintGuide*.png $(CCTK_HOME)/doc/HTML/MaintGuide;                \
> 	cp MaintGuide*.html $(CCTK_HOME)/doc/HTML/MaintGuide;                \
> 	cp MaintGuide.css  $(CCTK_HOME)/doc/HTML/MaintGuide
> 	@echo "  Maintainers Guide (HTML) created in doc/HTML/MaintGuide directory."
> 	@echo "  Done."
> 	@echo $(DIVIDER)
> 
1103,1104c1187,1188
< .PHONY: ThornGuide.pdf
< ThornGuide.pdf:
---
> .PHONY: ThornGuideHTML
> ThornGuideHTML:
1106c1190
< 	@echo Creating thorn documentation ThornGuide.pdf
---
> 	@echo "Creating thorn documentation ThornGuide (HTML)"
1110,1113c1194,1198
< 	$(MAKE) -f $(DOCDIR)/ThornGuide/Makefile ThornGuide.pdf
< 	if test -e "$(THORNBUILD)/ThornGuide.pdf"; then \
< 	  mv "$(THORNBUILD)/ThornGuide.pdf" $(DOCDIR)/ThornGuide.pdf;  \
< 	  echo "  ThornGuide.pdf created in doc directory."; \
---
> 	$(MAKE) ThornGuideHTML -f $(DOCDIR)/ThornGuide/Makefile DOCBUILDDIR=doc/ThornGuide/build MASTER_FILE=ThornGuide
> 	if test -e "$(THORNBUILD)/ThornGuide"; then \
> 	  mkdir -p "$(DOCDIR)/HTML"; \
> 	  mv "$(THORNBUILD)/ThornGuide" $(DOCDIR)/HTML/; \
> 	  echo "  Thorn Guide (HTML) created in doc/HTML/ThornGuide directory."; \
1173a1259,1276
> 	.PHONY: ThornDocHTML
> %-ThornDocHTML:
> 	@echo "$(DIVIDER)"
> 	@lib/sbin/ThornDocHTML $(@:%-ThornDocHTML=%)
> 	@echo $(DIVIDER)
> ThornDocHTML:
> 	@echo "$(DIVIDER)"
> 	@lib/sbin/ThornDocHTML
> 	@echo $(DIVIDER)
> %-ArrangementDocHTML:
> 	@echo "$(DIVIDER)"
> 	@lib/sbin/ArrangementDocHTML $(@:%-ArrangementDocHTML=%)
> 	@echo $(DIVIDER)
> ArrangementDocHTML:
> 	@echo "$(DIVIDER)"
> 	@lib/sbin/ArrangementDocHTML
> 	@echo $(DIVIDER)
> 
Index: doc/ThornGuide/Makefile
===================================================================
RCS file: /cactusdevcvs/Cactus/doc/ThornGuide/Makefile,v
retrieving revision 1.15
diff -r1.15 Makefile
35c35
< 
---
> IMAGE_FILE_HTML=$(CCTK_HOME)/doc/UsersGuide/bincactus2.ps
60a61,80
> ThornGuideHTML: $(MASTER_FILE).tex
> 	@echo "  LaTeXing $<...."
> 	# Fall through any latex errors so as to print sensible error message
> 	-htlatex $< "" "" "" --interaction=nonstopmode < /dev/null 2>&1 | tee LOG_LATEX_FULL_MSGS | grep -v Underfull | grep -v Overfull | grep -v OT1 > LOG_LATEX_MSGS
> 	if test -e "ThornGuide.html"; then                                    \
> 	   if grep "^\! " "LOG_LATEX_FULL_MSGS" | grep -v "destination with the same identifier" | grep -v "You have requested package" ; then            \
> 	     echo "  Problem in $<.  See $(DOCBUILDDIR)/LOG_LATEX_* .";  \
> 	     exit 1;                                             \
> 	   elif grep "^LaTeX Warning:" "LOG_LATEX_FULL_MSGS" | grep -v "destination with the same identifier" | grep -v "You have requested package" ; then         \
> 	     echo "  Warnings in $<.  See $(DOCBUILDDIR)/LOG_LATEX_* ."; \
> 	     exit 0;                                             \
> 	   fi;                                                   \
> 	   mkdir -p $(CCTK_HOME)/doc/HTML/ThornGuide;            \
> 	   cp ThornGuide*.png  $(CCTK_HOME)/doc/HTML/ThornGuide; \
>      cp ThornGuide*.html $(CCTK_HOME)/doc/HTML/ThornGuide; \
>      cp ThornGuide.css   $(CCTK_HOME)/doc/HTML/ThornGuide; \
> 	else                                                     \
> 	   echo "  Cannot find $@, an error must have occured."; \
> 	fi
> 
74a95,97
> 	if test -e $(IMAGE_FILE_HTML) && test ! -e "bincactus2.ps"; then \
> 	   cp $(IMAGE_FILE_HTML) .;                                       \
> 	fi