[r2003-07-03 08:36:14 by cvscast] Empty log message

Original author: cvscast
Date: 2003-07-03 08:36:14+00:00

Makefile.conf

@@ -10,11 +10,13 @@ PXP_WLEX = false
 # include support for expat
 EXPAT = false
 
+# generates PHP code in web pages to match the browser
+PHP = false
 
 
 # Customize the following variables to match the settings
 # of your local web server
 WEB_PREFIX = /var/www
 CGI_DIR = $(WEB_PREFIX)/cgi-bin
-CDUCE_HTML_DIR = $(WEB_PREFIX)/html
+HTML_DIR = $(WEB_PREFIX)/html
 SESSION_DIR = /tmp/cduce_sessions

Makefile.distrib

@@ -38,6 +38,14 @@ else
 	CAMLOPT_P = ocamlopt -inline 25
 endif
 
+ifeq ($(PHP), true)
+   PHP_ARG = -php
+   WEB_EXT = .php
+else
+   PHP_ARG =
+   WEB_EXT = .html
+endif
+
 OPT = -warn-error FPS
 CAMLC = ocamlfind $(CAMLC_P) $(OPT) -package "$(PACKAGES)"
 CAMLOPT = ocamlfind $(CAMLOPT_P) $(OPT) -package "$(PACKAGES)"
@@ -153,21 +161,21 @@ driver/examples.ml: cduce web/examples/build.cd web/examples/examples.xml
 	(cd web/examples; ../../cduce --quiet build.cd)
 
 web/files: cduce web/site.cd
-	(cd web; ../cduce --quiet site.cd --arg -php site.xml)
+	(cd web; ../cduce --quiet site.cd --arg $(PHP_ARG) site.xml)
 
 
 
 
 install_web_local:web/files webiface
-	cp  web/www/*.php web/cduce.css  $(CDUCE_HTML_DIR)/
+	cp  web/www/*$(WEB_EXT) web/cduce.css  $(HTML_DIR)/
 	cp webiface $(CGI_DIR)/cduce
-	if test ! -d "$(CDUCE_HTML_DIR)/img" ; then \
-	  mkdir $(CDUCE_HTML_DIR)/img; \
+	if test ! -d "$(HTML_DIR)/img" ; then \
+	  mkdir $(HTML_DIR)/img; \
 	fi;  
-	cp web/img/*.*  $(CDUCE_HTML_DIR)/img
+	cp web/img/*.*  $(HTML_DIR)/img
 
 
-local_website: cduce webiface
-	(cd web; ../cduce --quiet site.cd --arg site.xml)
+#local_website: cduce webiface
+#	(cd web; ../cduce --quiet site.cd --arg site.xml)
 #	cp  web/www/*.html web/cduce.css  $(CDUCE_HTML_DIR)/
 #	cp webiface $(CGI_DIR)/cduce

web/manual/namespaces.xml

@@ -48,7 +48,7 @@ namespace q = "http://b.com" in
 
 <p>
 This element can be bound to a variable
-<code>x</code> by a <code>let</code> binding as follows 
+<code>x</code> by a <code>let</code> binding as follows: 
 </p>
 
 <sample>
@@ -61,7 +61,6 @@ let x =
 <p>
 In which case the namespace declarations are local to the scope
 of the let.
-<br></br>
 Alternatively, it is possible to use global prefix bindings:
 </p>
 
@@ -109,7 +108,7 @@ in the current default namespace.
 
 <p>
 When used as atoms and not tags, the singleton types
-and ``any in namespace'' types must be prefixed by an backquote,
+and ``any in namespace'' types must be prefixed by a backquote,
 as for atom values: <code>`p:x, `p:*, `.:*</code>.
 </p>