[Spambayes-checkins] website/scripts make.rules,1.4,1.5

Mon Oct 27 23:43:51 EST 2003

Update of /cvsroot/spambayes/website/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv32622

Modified Files:
	make.rules 
Log Message:
* Make rsync use "./*" - this makes it work on Windows (I'll check it 
  doesn't break linux next <wink>
* Add a rule for FAQ style .txt -> .html

Index: make.rules
===================================================================
RCS file: /cvsroot/spambayes/website/scripts/make.rules,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** make.rules	23 Jul 2003 15:32:55 -0000	1.4
--- make.rules	28 Oct 2003 04:43:49 -0000	1.5
***************
*** 49,58 ****
  HTRELDIR =	.

  GENERATED_HTML= $(SOURCES:.ht=.html)

! .SUFFIXES:	.ht .html
  .ht.html:
  		$(HT2HTML) $(HTFLAGS) $(HTRELDIR)/$<

  all: $(TARGETS)

--- 49,74 ----
  HTRELDIR =	.

+ # docutils 'html.py' script.
+ DUHTML = html.py
+ 
  GENERATED_HTML= $(SOURCES:.ht=.html)

! .SUFFIXES:	.txt .ht .html
  .ht.html:
  		$(HT2HTML) $(HTFLAGS) $(HTRELDIR)/$<

+ # Use a single rule to go from .txt -> .html (otherwise we would
+ # need a custom rule for our special .ht -> .html command
+ .txt.html:
+ 	$(DUHTML) $< > faq.body.tmp
+ 	echo "Title: $(FAQ_TITLE)" > $*.ht
+ 	echo "Contact-URL: $(ROOT_DIR)/contact.html" >> $*.ht
+ 	echo "Author-Email: SpamBayes at python.org" >> $*.ht
+ 	echo "Author: SpamBayes" >> $*.ht
+ 	echo "" >> $*.ht
+ 	cat faq.body.tmp | sed -e '1,/<body>/d' -e '/<\/body>/,$$d' >> $*.ht
+ 	rm faq.body.tmp
+ 	$(HT2HTML) -f -s SpamBayesFAQGenerator -r $(ROOT_DIR) $(HTRELDIR)/$*.ht
+ 
  all: $(TARGETS)

***************
*** 71,75 ****
  	fi
  	@echo Push to $(LIVE_DEST) ...
! 	rsync --rsh=$(RSYNC_RSH) -v -r -l -t --update $(LOCAL_INCLUDE) $(GLOBAL_EXCLUDES) $(EXCLUDE_FROM) ./ $(LIVE_DEST)

  validate:	$(TARGETS)
--- 87,91 ----
  	fi
  	@echo Push to $(LIVE_DEST) ...
! 	rsync --rsh=$(RSYNC_RSH) -v -r -l -t --update $(LOCAL_INCLUDE) $(GLOBAL_EXCLUDES) $(EXCLUDE_FROM) ./* $(LIVE_DEST)

  validate:	$(TARGETS)