...

diff --git a/helm/interface/.cvsignore b/helm/interface/.cvsignore
index e1f786511c8dc4881708ba8a86f494986df1e68c..d93fd19b18f8a8ec8cec0caf22e45878bba2807e 100644 (file)
--- a/helm/interface/.cvsignore
+++ b/helm/interface/.cvsignore
@@ -15,6 +15,7 @@ output.ps
 output2.ps
 
 Makefile
+configuration.ml
 configure
 config.log
 config.cache

diff --git a/helm/interface/AUTHORS b/helm/interface/AUTHORS
index 963977a6f2d26cf197855a67a80695a4437fff6d..153b3df9ced583eb4f5bea2873ba36527cc3b6e3 100644 (file)
--- a/helm/interface/AUTHORS
+++ b/helm/interface/AUTHORS
@@ -1,4 +1,3 @@
 Andrea Asperti <asperti@cs.unibo.it>
 Luca Padovani <lpadovan@cs.unibo.it>
 Claudio Sacerdoti Coen <sacerdot@cs.unibo.it>
-Irene Schena <schena@cs.unibo.it>

diff --git a/helm/interface/Makefile.in b/helm/interface/Makefile.in
index cb833fcc74cca8789e3ea5e7e057c34f16663d7f..453d58b06fbf3963822d5093965a12ba1f3d45b6 100644 (file)
--- a/helm/interface/Makefile.in
+++ b/helm/interface/Makefile.in
@@ -1,4 +1,6 @@
-OCAML_ROOT = /usr/lib/ocaml
+OCAML_ROOT = @OCAML_ROOT@
+HELM_BIN_DIR = @HELM_BIN_DIR@
+
 LABLGTK_DIR = $(OCAML_ROOT)/lablgtk
 LABLGTK_MATHVIEW_DIR = $(OCAML_ROOT)/lablgtk/mathview
 MINIDOM_DIR = $(OCAML_ROOT)/minidom
@@ -172,4 +174,15 @@ clean:
            reduction.opt fix_params fix_params.opt mmlinterface \
            mmlinterface.opt mmlinterface2 mmlinterface2.opt
 
+install:
+       cp experiment reduction fix_params mmlinterface \
+         experiment.opt reduction.opt fix_params.opt mmlinterface.opt \
+         $(HELM_BIN_DIR)
+
+distclean:
+       rm -f Makefile configuration.ml configure config.log config.cache \
+         config.status
+
+.PHONY: install distclean clean
+
 include .depend

diff --git a/helm/interface/README b/helm/interface/README
index 9f6eb3534f9e070e7fb8ec433d759ceefc40c698..63d2c2ac84e879a6672476e9033af689cc538e78 100644 (file)
--- a/helm/interface/README
+++ b/helm/interface/README
@@ -3,6 +3,6 @@ NOTE: This is the first alpha release of project HELM.
 HELM (Hypertextual Electronic Library of Mathematics) is a project aimed
 at the creation of tools for the development and exploitation of a huge
 distributed library of formal mathematical knowledge. This package holds
-the configuration files shared by all this tools.
+a gtk interface to the library.
 
 For more information see http://www.cs.unibo.it/helm

diff --git a/helm/interface/config.cache.pkg b/helm/interface/config.cache.pkg
new file mode 100644 (file)
index 0000000..fe72875
--- /dev/null
+++ b/helm/interface/config.cache.pkg
@@ -0,0 +1,4 @@
+# This is the config.cache that holds the ``standard'' path for the
+# HELM library. It is supposed to be used when creating packages
+
+helm_cv_HELM_DEFAULT_CONFIGURATION_DIR=${helm_cv_HELM_DEFAULT_CONFIGURATION_DIR='$RESOLVED_PREFIX/etc/helm'}

diff --git a/helm/interface/configuration.ml.in b/helm/interface/configuration.ml.in
index add4c3a882d35b4a6b5e6beebc8c9b47ca050d5d..2177397eeec2623c3ade7f0db6e65631f9b3d05e 100644 (file)
--- a/helm/interface/configuration.ml.in
+++ b/helm/interface/configuration.ml.in
@@ -13,11 +13,11 @@
 let filename =
  let prefix =
   try
-   Sys.getenv "HELM_CONFIGURATION_PREFIX"
+   Sys.getenv "HELM_CONFIGURATION_DIR"
   with
-   Not_found -> ""
+   Not_found -> "@HELM_DEFAULT_CONFIGURATION_DIR@"
  in
-  prefix ^ "/local/etc/helm/configuration.xml";;
+  prefix ^ "/configuration.xml";;
 
 exception Warnings;;
 

diff --git a/helm/interface/configure.in b/helm/interface/configure.in
index 29f38aa9a2f8642f2bbf8272e4e9546d906f6f06..71fdf4a9381e308693834c841ab624c5bcdad810 100644 (file)
--- a/helm/interface/configure.in
+++ b/helm/interface/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(etc/configuration.xml.in)
+AC_INIT(configuration.ml.in)
 
 if test "x$prefix" != xNONE; then
   RESOLVED_PREFIX=$prefix
@@ -13,134 +13,30 @@ else
 fi
 
 dnl General
-AC_MSG_CHECKING("for the lib/helm dir")
-HELM_LIB_DIR=$RESOLVED_EXEC_PREFIX/lib/helm
-AC_MSG_RESULT($HELM_LIB_DIR)
+AC_MSG_CHECKING("for the ocaml library dir")
+OCAML_ROOT=`ocamlc -v | grep "^Standard" | sed 's/^.*: *//'`
+AC_MSG_RESULT($OCAML_ROOT)
 
-AC_MSG_CHECKING("for the etc/helm dir")
-HELM_ETC_DIR=$RESOLVED_PREFIX/etc/helm
-AC_MSG_RESULT($HELM_ETC_DIR)
+AC_MSG_CHECKING("for the bin dir")
+HELM_BIN_DIR=$RESOLVED_EXEC_PREFIX/bin
+AC_MSG_RESULT($HELM_BIN_DIR)
 
-AC_MSG_CHECKING("for the lib/helm dir")
-HELM_SHARE_DIR=$RESOLVED_PREFIX/share/helm
-AC_MSG_RESULT($HELM_SHARE_DIR)
-
-dnl Only for GtkMathview XML configuration
-HELM_DICTIONARY_PATH=$HELM_ETC_DIR/helm-dictionary.xml
-
-AC_CHECK_PROG(HAVE_GTKMATHVIEW_CONFIG,gtkmathview-config,yes,no)
-if test $HAVE_GTKMATHVIEW_CONFIG = no ; then
-   AC_MSG_ERROR(Could not find gtkmathview-config)
-fi
-GTKMATHVIEW_PREFIX=`gtkmathview-config --prefix`
-
-AC_MSG_CHECKING("for dictionary.xml")
-AC_CACHE_VAL(helm_cv_GTKMATHVIEW_DICTIONARY_PATH,
-   helm_cv_GTKMATHVIEW_DICTIONARY_PATH=$GTKMATHVIEW_PREFIX/share/gtkmathview/dictionary.xml
-   if test ! -f $helm_cv_GTKMATHVIEW_DICTIONARY_PATH ; then
-      echo ""
-      AC_MSG_WARN(Could not find dictionary.xml. Where is it?)
-      read helm_cv_GTKMATHVIEW_DICTIONARY_PATH
-      RES="Asked"
-   fi
-)
-GTKMATHVIEW_DICTIONARY_PATH=$helm_cv_GTKMATHVIEW_DICTIONARY_PATH
-if test "$RES" != "Asked" ; then
-   AC_MSG_RESULT($GTKMATHVIEW_DICTIONARY_PATH)
-fi
-AC_CACHE_SAVE
-
-AC_MSG_CHECKING("for font-configuration.xml")
+AC_MSG_CHECKING("for the helm configuration dir")
 RES=""
-AC_CACHE_VAL(helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH,
-   helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH=$GTKMATHVIEW_PREFIX/share/gtkmathview/font-configuration.xml
-   if test ! -f $helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH ; then
-      echo ""
-      AC_MSG_WARN(Could not find font-configuration.xml. Where is it?)
-      read helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH
-      RES="Asked"
-   fi
-)
-GTKMATHVIEW_FONT_CONFIGURATION_PATH=$helm_cv_GTKMATHVIEW_FONT_CONFIGURATION_PATH
-if test "$RES" != "Asked" ; then
-   AC_MSG_RESULT($GTKMATHVIEW_FONT_CONFIGURATION_PATH)
-fi
-AC_CACHE_SAVE
-
-AC_MSG_CHECKING("for t1.config")
-RES=""
-AC_CACHE_VAL(helm_cv_GTKMATHVIEW_T1_CONFIG_FILE,
-   helm_cv_GTKMATHVIEW_T1_CONFIG_FILE=$GTKMATHVIEW_PREFIX/share/gtkmathview/t1.config
-   if test ! -f $helm_cv_GTKMATHVIEW_T1_CONFIG_FILE ; then
-      echo ""
-      AC_MSG_WARN(Could not find t1.config. Where is it?)
-      read helm_cv_GTKMATHVIEW_T1_CONFIG_FILE
-      RES="Asked"
-   fi
-)
-GTKMATHVIEW_T1_CONFIG_FILE=$helm_cv_GTKMATHVIEW_T1_CONFIG_FILE
-if test "$RES" != "Asked" ; then
-   AC_MSG_RESULT($GTKMATHVIEW_T1_CONFIG_FILE)
-fi
-AC_CACHE_SAVE
-
-HELM_FONT_CONFIGURATION_PATH=$HELM_ETC_DIR/helm-font-configuration.xml
-
-dnl Only for HELM XML configuration
-
-AC_MSG_CHECKING("for the library path")
-RES=""
-AC_CACHE_VAL(helm_cv_HELM_LIBRARY_DIR,
-  echo "Where should I put the downloaded library? Note: the \"library\" subdirectory and all the files and subdirectories recursively in it should be world writeable"
-  read helm_cv_HELM_LIBRARY_DIR
+AC_CACHE_VAL(helm_cv_HELM_DEFAULT_CONFIGURATION_DIR,
+  echo "In which directory can I find configuration.xml (part of the helm_configuration package)?"
+  read helm_cv_HELM_DEFAULT_CONFIGURATION_DIR
   RES="Asked"
 )
-HELM_LIBRARY_DIR=$helm_cv_HELM_LIBRARY_DIR
+HELM_DEFAULT_CONFIGURATION_DIR=$helm_cv_HELM_DEFAULT_CONFIGURATION_DIR
 if test "$RES" != "Asked" ; then
-   HELM_LIBRARY_DIR=`eval "echo $HELM_LIBRARY_DIR"`
-   AC_MSG_RESULT($HELM_LIBRARY_DIR)
+   HELM_DEFAULT_CONFIGURATION_DIR=`eval "echo $HELM_DEFAULT_CONFIGURATION_DIR"`
+   AC_MSG_RESULT($HELM_DEFAULT_CONFIGURATION_DIR)
 fi
 AC_CACHE_SAVE
 
+AC_SUBST(OCAML_ROOT)
+AC_SUBST(HELM_BIN_DIR)
+AC_SUBST(HELM_DEFAULT_CONFIGURATION_DIR)
 
-CONFIGURATION_HELM_DIR=$HELM_LIBRARY_DIR/library
-
-dnl CSC: ERROR: getters should download the DTDs
-CONFIGURATION_DTD_DIR=$HELM_SHARE_DIR/dtd
-
-CONFIGURATION_SERVERS_FILE=$HELM_LIBRARY_DIR/servers.txt
-CONFIGURATION_URIS_DBM=$HELM_LIBRARY_DIR/urls_of_uris
-
-AC_MSG_CHECKING("for the tmp dir")
-RES=""
-if test -d "/tmp" ; then
-   CONFIGURATION_TMPDIR=/tmp
-else
-   AC_MSG_WARN(Could not find /tmp. What directory could I use instead?)
-   read $CONFIGURATION_TMPDIR
-   RES="Asked"
-fi
-if test "$RES" != "Asked" ; then
-   AC_MSG_RESULT($CONFIGURATION_TMPDIR)
-fi
-
-AC_SUBST(HELM_LIB_DIR)
-AC_SUBST(HELM_ETC_DIR)
-AC_SUBST(HELM_LIBRARY_DIR)
-AC_SUBST(HELM_DICTIONARY_PATH)
-AC_SUBST(GTKMATHVIEW_DICTIONARY_PATH)
-AC_SUBST(HELM_FONT_CONFIGURATION_PATH)
-AC_SUBST(GTKMATHVIEW_FONT_CONFIGURATION_PATH)
-AC_SUBST(GTKMATHVIEW_T1_CONFIG_FILE)
-AC_SUBST(CONFIGURATION_HELM_DIR)
-AC_SUBST(CONFIGURATION_DTD_DIR)
-AC_SUBST(CONFIGURATION_SERVERS_FILE)
-AC_SUBST(CONFIGURATION_URIS_DBM)
-AC_SUBST(CONFIGURATION_TMPDIR)
-
-AC_OUTPUT(
-[Makefile
- lib/configuration.pl
- etc/helm-math-engine-configuration.xml
- etc/configuration.xml
-])
+AC_OUTPUT([Makefile configuration.ml])

diff --git a/helm/interface/helm_gtk_interface-0.0.1-1.spec b/helm/interface/helm_gtk_interface-0.0.1-1.spec
index 8c1ce72ed67f92ecfd5021f0bd2d10ba3e65a1bb..361f12cddea7f0c08db8bed22c092729bb941adc 100644 (file)
--- a/helm/interface/helm_gtk_interface-0.0.1-1.spec
+++ b/helm/interface/helm_gtk_interface-0.0.1-1.spec
@@ -11,7 +11,7 @@ Source: www.cs.unibo.it:/~lpadovan/mml-widget/helm_configuration-0.0.1-1.tar.gz
 HELM (Hypertextual Electronic Library of Mathematics) is a project aimed
 at the creation of tools for the development and exploitation of a huge
 distributed library of formal mathematical knowledge. This package holds
-the configuration files shared by all this tools.
+a gtk interface to the library.
 For more information see http://www.cs.unibo.it/helm
 
 %prep
@@ -22,6 +22,8 @@ cp config.cache.pkg config.cache
 ./configure
 
 %install
+make
+make opt
 make install
 
 %files