matita.conf.xml.sample is now generated

diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in
index 009a6cec13bc6eb1d2a3b9b8c5cf2eb320d7b735..4c3d9f305920bf1e76b2e2c3968b27e6d86951e9 100644 (file)
--- a/helm/matita/Makefile.in
+++ b/helm/matita/Makefile.in
@@ -54,7 +54,23 @@ CCMOS =                              \
 CLEANCMOS = $(CCMOS)
 
 
-all: matita matitac matitatop cicbrowser matitadep matitaclean
+all: matita.conf.xml matita matitac matitatop cicbrowser matitadep matitaclean
+
+matita.conf.xml: matita.conf.xml.sample
+       @echo
+       @echo "matita.conf.xml.sample is newer than matita.conf.xml"
+       @echo
+       @echo "PLEASE update your configuration file!"
+       @echo "(copying matita.conf.xml.sample should work)"
+       @echo
+       @false
+
+matita.conf.xml.sample: matita.conf.xml.sample.in
+       autoconf
+       ./configure
+       @echo 
+       @echo "WARNING: The configuration sample file has changed!"
+       @echo 
 
 ifeq ($(HAVE_OCAMLOPT),yes)
 CMXS = $(patsubst %.cmo,%.cmx,$(CMOS))
@@ -127,6 +143,7 @@ distclean: clean
        rm -f config.log config.status Makefile buildTimeConf.ml
        rm -f matita.glade.bak matita.gladep.bak
        rm -rf autom4te.cache/
+       rm -f configure matita.conf.xml.sample
 
 tests: matitac matitadep matitaclean
        @(cd library && make clean all)

diff --git a/helm/matita/configure.ac b/helm/matita/configure.ac
index 7e2591f8fc9b1d9d2de2e524565a1edffa635f1a..293d8a7677f3e790e6d5f2c2b406bcb08dcd29c4 100644 (file)
--- a/helm/matita/configure.ac
+++ b/helm/matita/configure.ac
@@ -90,6 +90,8 @@ if test "$DEBUG" = "true"; then
 fi
 
 RT_BASE_DIR=`pwd`
+USER_HOME=`echo $HOME`
+USER_NAME=`echo $USER`
 
 AC_SUBST(CAMLP4O)
 AC_SUBST(DEBUG)
@@ -102,8 +104,11 @@ AC_SUBST(HAVE_OCAMLOPT)
 AC_SUBST(LABLGLADECC)
 AC_SUBST(OCAMLFIND)
 AC_SUBST(RT_BASE_DIR)
+AC_SUBST(USER_HOME)
+AC_SUBST(USER_NAME)
 
 AC_OUTPUT([
+  matita.conf.xml.sample
   buildTimeConf.ml
   Makefile
 ])

diff --git a/helm/matita/matita.conf.xml.sample b/helm/matita/matita.conf.xml.sample
deleted file mode 100644 (file)
index 56a04d6..0000000
--- a/helm/matita/matita.conf.xml.sample
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<helm_registry>
-  <section name="matita">
-    <key name="auto_disambiguation">true</key>
-    <key name="environment_trust">true</key>
-    <key name="baseuri">cic:/matita/</key>
-    <key name="basedir">.matita/xml</key>
-    <key name="owner">@@OWNER@@</key>
-<!--     <key name="font_size">10</key> -->
-    <key name="tactics_bar">false</key>
-  </section>
-  <section name="db">
-    <!-- <key name="host">localhost</key> -->
-    <key name="host">mowgli.cs.unibo.it</key>
-    <key name="user">helm</key>
-    <key name="database">matita</key>
-  </section>
-  <section name="getter">
-    <key name="cache_dir">.matita/getter/cache</key>
-    <key name="dtd_dir">/projects/helm/xml/dtd</key>
-    <key name="prefix">
-      cic:/
-      file:///projects/helm/library/coq_contribs/
-    </key>
-    <key name="prefix">
-      cic:/matita/
-      .matita/xml/matita/
-    </key>
-  </section>
-</helm_registry>

diff --git a/helm/matita/matita.conf.xml.sample.in b/helm/matita/matita.conf.xml.sample.in
new file mode 100644 (file)
index 0000000..b353a87
--- /dev/null
+++ b/helm/matita/matita.conf.xml.sample.in
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<helm_registry>
+  <section name="matita">
+    <key name="auto_disambiguation">true</key>
+    <key name="environment_trust">true</key>
+    <key name="baseuri">cic:/matita/</key>
+    <key name="basedir">@USER_HOME@/.matita/xml</key>
+    <key name="owner">@USER_NAME@</key>
+<!--     <key name="font_size">10</key> -->
+    <key name="tactics_bar">false</key>
+  </section>
+  <section name="db">
+    <!-- <key name="host">localhost</key> -->
+    <key name="host">mowgli.cs.unibo.it</key>
+    <key name="user">helm</key>
+    <key name="database">matita</key>
+  </section>
+  <section name="getter">
+    <key name="cache_dir">@USER_HOME@/.matita/getter/cache</key>
+    <key name="dtd_dir">/projects/helm/xml/dtd</key>
+    <key name="prefix">
+      cic:/
+      file:///projects/helm/library/coq_contribs/
+    </key>
+    <key name="prefix">
+      cic:/matita/
+      file://@USER_HOME@/.matita/xml/matita/
+    </key>
+  </section>
+</helm_registry>