- moved version setting to Http_getter_const

- added conffile setting to Http_getter_const
- changed configuration file name to "http_getter.conf.xml"
- rebuilt .depend, now http_getter_env depends on http_getter_const
- changed link order in Makefile

diff --git a/helm/http_getter/.depend b/helm/http_getter/.depend
index 95103ee857d0f6c70bcf6eb1949dd5ae793efc54..f98864c49508de6e5e8b4e83fb0e29d8876e062d 100644 (file)
--- a/helm/http_getter/.depend
+++ b/helm/http_getter/.depend
@@ -16,10 +16,10 @@ http_getter_const.cmo: http_getter_const.cmi
 http_getter_const.cmx: http_getter_const.cmi 
 http_getter_debugger.cmo: http_getter_debugger.cmi 
 http_getter_debugger.cmx: http_getter_debugger.cmi 
-http_getter_env.cmo: http_getter_misc.cmi http_getter_types.cmo \
-    http_getter_env.cmi 
-http_getter_env.cmx: http_getter_misc.cmx http_getter_types.cmx \
-    http_getter_env.cmi 
+http_getter_env.cmo: http_getter_const.cmi http_getter_misc.cmi \
+    http_getter_types.cmo http_getter_env.cmi 
+http_getter_env.cmx: http_getter_const.cmx http_getter_misc.cmx \
+    http_getter_types.cmx http_getter_env.cmi 
 http_getter_map.cmo: threadSafe.cmi http_getter_map.cmi 
 http_getter_map.cmx: threadSafe.cmx http_getter_map.cmi 
 http_getter_misc.cmo: http_getter_debugger.cmi http_getter_misc.cmi 

diff --git a/helm/http_getter/Makefile b/helm/http_getter/Makefile
index 1c727bff26c5449bd333d0729abee26a01c14861..6482ba0bf167ffdde1178a8382417842c560972a 100644 (file)
--- a/helm/http_getter/Makefile
+++ b/helm/http_getter/Makefile
@@ -8,8 +8,8 @@ OCAMLOPT = ocamlfind ocamlopt $(COMMONOPTS)
 OCAMLDEP = ocamlfind ocamldep $(COMMONOPTS)
 MODULES =      \
        http_getter_debugger threadSafe                                                 \
-       http_getter_types http_getter_misc http_getter_env              \
-       http_getter_const http_getter_common http_getter_map    \
+       http_getter_types http_getter_misc http_getter_const    \
+       http_getter_env http_getter_common http_getter_map              \
        http_getter_cache
 
 OBJS = $(patsubst %,%.cmo,$(MODULES))

diff --git a/helm/http_getter/http_getter_const.ml b/helm/http_getter/http_getter_const.ml
index efbae1f51d78983b04e031fd028cea09b40da1cd..1d0a4f58184a82c8c999f766834771b2d7024772 100644 (file)
--- a/helm/http_getter/http_getter_const.ml
+++ b/helm/http_getter/http_getter_const.ml
@@ -26,6 +26,9 @@
  *  http://helm.cs.unibo.it/
  *)
 
+let version = "0.2.0"
+let conffile = "http_getter.conf.xml"
+
   (* TODO provide a better usage string *)
 let usage_string =
 "

diff --git a/helm/http_getter/http_getter_const.mli b/helm/http_getter/http_getter_const.mli
index 0aaf323f2fc2adea64aaf3d75025160af64b42be..3b03950f514c0e8cc8fb490a1021e6076c5c3321 100644 (file)
--- a/helm/http_getter/http_getter_const.mli
+++ b/helm/http_getter/http_getter_const.mli
@@ -26,5 +26,7 @@
  *  http://helm.cs.unibo.it/
  *)
 
+val version: string
+val conffile: string
 val usage_string: string
 val empty_xml: string

diff --git a/helm/http_getter/http_getter_env.ml b/helm/http_getter/http_getter_env.ml
index 5430add17258ee1be0c43986331482472c59fbcf..217ec346ee39c2c80c414eb5b0fdbf40f400972c 100644 (file)
--- a/helm/http_getter/http_getter_env.ml
+++ b/helm/http_getter/http_getter_env.ml
@@ -32,7 +32,7 @@ open Pxp_document;;
 open Pxp_types;;
 open Pxp_yacc;;
 
-let version = "0.2.0"
+let version = Http_getter_const.version
 
 type setting_src =
   | Environment (* read setting from environment variables *)
@@ -46,7 +46,7 @@ let (conf_file, conf_dir) =
     let conf_dir =
       Pcre.replace ~pat:"/$" (Sys.getenv "HELM_CONFIGURATION_DIR")
     in
-    (conf_dir ^ "/configuration.xml", conf_dir)
+    (conf_dir ^ "/" ^ Http_getter_const.conffile, conf_dir)
   with Not_found -> failwith "HELM_CONFIGURATION_DIR undefined"
 
 let safe_getenv ?(from = Both) var =