[Commits] python.it commit r222 - in www/trunk: python.it python.it/doc python.it/doc/articoli python.it/doc/diveintopython python.it/doc/howto python.it/faq python.it/help python.it/pics python.it/styles python.it/styles/images python.it/topics python.it/topics/database python.it/topics/gui python.it/topics/scicomp python.it/topics/so python.it/topics/tkinter python.it/topics/web python.it/topics/xml python.it/vari scripts

commit a svn.python.it commit a svn.python.it
Dom 1 Ott 2006 22:58:21 CEST


Author: manlio
Date: Sun Oct  1 22:57:32 2006
New Revision: 222

Added:
   www/trunk/python.it/doc/Makefile   (contents, props changed)
   www/trunk/python.it/doc/articoli/Makefile   (contents, props changed)
   www/trunk/python.it/doc/diveintopython/Makefile   (contents, props changed)
   www/trunk/python.it/doc/howto/Makefile   (contents, props changed)
   www/trunk/python.it/faq/Makefile   (contents, props changed)
   www/trunk/python.it/help/Makefile   (contents, props changed)
   www/trunk/python.it/pics/Makefile   (contents, props changed)
   www/trunk/python.it/styles/Makefile   (contents, props changed)
   www/trunk/python.it/styles/images/Makefile   (contents, props changed)
   www/trunk/python.it/topics/Makefile   (contents, props changed)
   www/trunk/python.it/topics/database/Makefile   (contents, props changed)
   www/trunk/python.it/topics/gui/Makefile   (contents, props changed)
   www/trunk/python.it/topics/scicomp/Makefile   (contents, props changed)
   www/trunk/python.it/topics/so/Makefile   (contents, props changed)
   www/trunk/python.it/topics/tkinter/Makefile   (contents, props changed)
   www/trunk/python.it/topics/web/Makefile   (contents, props changed)
   www/trunk/python.it/topics/xml/Makefile   (contents, props changed)
   www/trunk/python.it/vari/Makefile   (contents, props changed)
Modified:
   www/trunk/python.it/Makefile
   www/trunk/scripts/make.rules
Log:
completati i makefile

Modified: www/trunk/python.it/Makefile
==============================================================================
--- www/trunk/python.it/Makefile	(original)
+++ www/trunk/python.it/Makefile	Sun Oct  1 22:57:32 2006
@@ -7,21 +7,13 @@
 
 SUBDIRS = doc faq help topics vari
 
-#EXTRA_TARGETS = channews.rdf SiteMap.html
+$(TARGETS): links.h
 
 all: $(TARGETS)
 
-subdirs: $(SUBDIRS)
-
 
-# the multiple wildcards avoid use of the Unix find command and keep
-# the globbing within GNU make, so is presumably a bit more portable to
-# non-Unix platforms
-# SiteMap.ht: sitemap.py index.ht \
-# 	    $(wildcard */*/*/.sitemap-ignore) \
-# 	    $(wildcard */*/.sitemap-ignore) \
-# 	    $(wildcard */.sitemap-ignore)
-# 	#python sitemap.py >@; cp @ SiteMap.ht; rm @
+# XXX what's the need for this?
+subdirs: $(SUBDIRS)
 
 doc: always
 	(cd doc; $(MAKE))
@@ -40,3 +32,4 @@
 
 always:
 	@echo >/dev/null
+

Added: www/trunk/python.it/doc/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/doc/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=..
+ROOT_OFFSET=doc
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/doc/articoli/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/doc/articoli/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=../..
+ROOT_OFFSET=doc/articoli
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/doc/diveintopython/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/doc/diveintopython/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=../..
+ROOT_OFFSET=doc/diveintopython
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/doc/howto/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/doc/howto/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=../..
+ROOT_OFFSET=howto
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/faq/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/faq/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=..
+ROOT_OFFSET=faq
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/help/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/help/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=..
+ROOT_OFFSET=help
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/pics/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/pics/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,4 @@
+ROOT_DIR=..
+ROOT_OFFSET=pics
+
+include $(ROOT_DIR)/scripts/make.rules

Added: www/trunk/python.it/styles/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/styles/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=..
+ROOT_OFFSET=styles
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+#$(TARGETS): links.h

Added: www/trunk/python.it/styles/images/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/styles/images/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,4 @@
+ROOT_DIR=..
+ROOT_OFFSET=pics
+
+include $(ROOT_DIR)/scripts/make.rules

Added: www/trunk/python.it/topics/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/topics/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=..
+ROOT_OFFSET=topics
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/topics/database/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/topics/database/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=../..
+ROOT_OFFSET=topics/database
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/topics/gui/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/topics/gui/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=../..
+ROOT_OFFSET=topics/gui
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/topics/scicomp/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/topics/scicomp/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=../..
+ROOT_OFFSET=topics/scicomp
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/topics/so/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/topics/so/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=../..
+ROOT_OFFSET=topics/so
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h python-mode.el

Added: www/trunk/python.it/topics/tkinter/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/topics/tkinter/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=../..
+ROOT_OFFSET=topics/tkinter
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/topics/web/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/topics/web/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=../..
+ROOT_OFFSET=topics/web
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/topics/xml/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/topics/xml/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=../..
+ROOT_OFFSET=topics/xml
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Added: www/trunk/python.it/vari/Makefile
==============================================================================
--- (empty file)
+++ www/trunk/python.it/vari/Makefile	Sun Oct  1 22:57:32 2006
@@ -0,0 +1,6 @@
+ROOT_DIR=..
+ROOT_OFFSET=vari
+
+include ../$(ROOT_DIR)/scripts/make.rules
+
+$(TARGETS): links.h

Modified: www/trunk/scripts/make.rules
==============================================================================
--- www/trunk/scripts/make.rules	(original)
+++ www/trunk/scripts/make.rules	Sun Oct  1 22:57:32 2006
@@ -28,23 +28,34 @@
 RSYNC_RSH =	ssh
 
 # Validation
-# (use the SGML_CATALOG_FILES enviroment variable) = /usr/share/sgml/html-4.01/HTML4.cat
+#HTML_CATALOG = /usr/share/sgml/html-4.01/HTML4.cat
 XMLLINT = xmllint
 
-EXCLUDE = --exclude-from=$(SCRIPTDIR)/rsync-excludes
+GLOBAL_EXCLUDES = --exclude-from=../$(ROOT_DIR)/scripts/rsync-excludes
+# If the file .rsync-excludes exists in the make dir, use it.
+EXCLUDE_FROM =	$(shell if [ -f .rsync-excludes ]; then \
+			   echo "--exclude-from=.rsync-excludes"; \
+			else \
+			   echo ""; \
+			fi)
+LOCAL_INCLUDE =
 
 SCRIPTDIR =	../$(ROOT_DIR)/scripts
 HT2HTML =	$(SCRIPTDIR)/ht2html/ht2html.py
 HTSTYLE =	PDONewGenerator
 HTALLFLAGS =	-f -s $(HTSTYLE)
-HTROOT = 	$(ROOT_DIR)
+# $(shell $(SCRIPTDIR)/calcroot.py $(ROOT_OFFSET))
+HTROOT = 	$(ROOT_DIR) 
 HTFLAGS =	$(HTALLFLAGS) -r $(HTROOT)
+# HTRELDIR =	.
+# HTWF =		$(SCRIPTDIR)/ht2html/htwf.py
+# HTWFFLAGS =	-s $(HTSTYLE) -r $(HTROOT)
 
 GENERATED_HTML= $(SOURCES:.ht=.html)
 
 .SUFFIXES:	.ht .html
-.ht.html:
-		python $(HT2HTML) $(HTFLAGS) $<
+.ht.html:	links.h
+		$(HT2HTML) $(HTFLAGS) $<
 
 all: $(TARGETS)
 
@@ -62,14 +73,16 @@
 	  false; \
 	fi
 	@echo Push to $(LIVE_DEST) ...
-	rsync --rsh=$(RSYNC_RSH) -v -r -l -t --update $(EXCLUDE) ./ $(LIVE_DEST)
+	rsync --rsh=$(RSYNC_RSH) -v -r -l -t --update $(LOCAL_INCLUDE) $(GLOBAL_EXCLUDES) $(EXCLUDE_FROM) ./ $(LIVE_DEST)
 
-validate: $(TARGETS)
+validate:	$(TARGETS)
 	for f in $(TARGETS); \
 	do echo $$f;\
-	$(XMLLINT) --noout --valid --catalogs $$f; \
+	$(NSGMLS) -s -c $(HTML_CATALOG) $$f; \
 	done
 
+# wfcheck:
+# 	$(HTWF) $(HTWFFLAGS) $(SOURCES)
 
 # Override local_install in Makefile for directory-specific install actions.
 local_install:


Maggiori informazioni sulla lista Commits