X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=3583e98035dd3f5dab58f8eb25e11dfd909a4564;hb=HEAD;hp=a243cd8a05016e54821e971f05171de6d0d4a635;hpb=1f45bffea52a37591fa62c019d36bd0980e889f5;p=phdru.name%2Fphdru.name.git

diff --git a/Makefile b/Makefile
index a243cd8..36cb849 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # This file is a part of phdru.name homepage/blog/news generator scripts.
 
 # __author__ = "Oleg Broytman <phd@phdru.name>"
-# __copyright__ = "Copyright (C) 2006-2017 PhiloSoft Design"
+# __copyright__ = "Copyright (C) 2006-2024 PhiloSoft Design"
 
 
 .SUFFIXES: # Clear the suffix list
@@ -11,10 +11,10 @@
 
 
 %.py: %.tmpl
-	umask 022; python2.7 `which cheetah` compile --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup $< && compyle $@ && chmod +x $@
+	umask 022; python3 -m Cheetah.CheetahWrapper compile --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup $< && python3 -m compileall $@ && chmod +x $@
 
-%.html: %.tmpl phd_site.py
-	umask 022; PYTHONPATH=. PYTHONIOENCODING=koi8-r:replace python2.7 `which cheetah` fill --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup --stdout $< | iconv -c -f utf-8 -t koi8-r >$@
+%.html: %.tmpl phd.py phd_site.py
+	umask 022; PYTHONPATH=. PYTHONIOENCODING=koi8-r:replace python3 -m Cheetah.CheetahWrapper fill --encoding=koi8-r --settings='encoding="koi8-r"' --nobackup $<
 
 
 .PHONY: fast
@@ -30,7 +30,7 @@ phdru.name: blog news
 
 
 .PHONY: blog
-blog: phd_site.py atom_10.py rss_20.py
+blog: phd.py phd_site.py atom_10.py rss_20.py
 	./reindex_blog_ru
 	$(MAKE) html
 
@@ -40,7 +40,7 @@ templates = $(shell find ../htdocs/phdru.name -type f -name \*.tmpl -print)
 htmls = $(patsubst %.tmpl,%.html,$(templates))
 
 .PHONY: html
-html: phd_site.py $(htmls) special-templates sitemap
+html: phd.py phd_site.py $(htmls) special-templates sitemap
 
 
 .PHONY: news
@@ -53,7 +53,7 @@ SITEMAP = ../htdocs/phdru.name/sitemap.xml
 .PHONY: sitemap
 sitemap: $(SITEMAP)
 
-$(SITEMAP): $(allfiles)
+$(SITEMAP): $(allfiles) sitemaps/phdru.name-config.xml
 	sitemap_gen.py --config=sitemaps/phdru.name-config.xml
 
 
@@ -77,3 +77,11 @@ special-templates: ../htdocs/phdru.name/Russian/Software/instant-messengers/inst
 	   -e 's/<div class="section" id="ii">/<lj-cut text="îÉËÔÏ ÎÅ ÏÂÅÝÁÌ ÒÁÊÓËÏÇÏ ÓÁÄÁ...">&/' \
 	   -e '/<hr width="90%">/,$$d' $< | sed '1,2d'; \
 	  echo '</lj-cut>'; } >$@
+
+.PHONY: clean-html
+clean-html:
+	find ../htdocs/phdru.name/ -type f -name \*.html -delete
+
+.PHONY: clean-blog
+clean-blog:
+	find ../htdocs/phdru.name/Russian/blog -type f -name \*.html -delete