now we take the NUri module from the helm-ng_kernel packeage

diff --git a/helm/software/lambda-delta/.depend.opt b/helm/software/lambda-delta/.depend.opt
index a89eae37a6843d9f8fdfd9b55b85b4e1f6320b7e..26f2d959c912284f483b64b3e0a76c90a08af315 100644 (file)
--- a/helm/software/lambda-delta/.depend.opt
+++ b/helm/software/lambda-delta/.depend.opt
@@ -1,227 +1,332 @@
-lib/nUri.cmi: 
-lib/nUri.cmo: lib/nUri.cmi 
-lib/nUri.cmx: lib/nUri.cmi 
-lib/cps.cmo: 
-lib/cps.cmx: 
-lib/share.cmo: 
-lib/share.cmx: 
-lib/log.cmi: 
-lib/log.cmo: lib/cps.cmx lib/log.cmi 
-lib/log.cmx: lib/cps.cmx lib/log.cmi 
-lib/time.cmo: lib/log.cmi 
-lib/time.cmx: lib/log.cmx 
-common/options.cmo: lib/cps.cmx 
-common/options.cmx: lib/cps.cmx 
-common/hierarchy.cmi: 
-common/hierarchy.cmo: lib/cps.cmx common/hierarchy.cmi 
-common/hierarchy.cmx: lib/cps.cmx common/hierarchy.cmi 
-common/output.cmi: 
-common/output.cmo: common/options.cmx lib/log.cmi common/output.cmi 
-common/output.cmx: common/options.cmx lib/log.cmx common/output.cmi 
-common/entity.cmo: common/options.cmx lib/nUri.cmi automath/aut.cmx 
-common/entity.cmx: common/options.cmx lib/nUri.cmx automath/aut.cmx 
-common/marks.cmo: common/entity.cmx 
-common/marks.cmx: common/entity.cmx 
-common/alpha.cmi: common/entity.cmx 
-common/alpha.cmo: common/entity.cmx common/alpha.cmi 
-common/alpha.cmx: common/entity.cmx common/alpha.cmi 
-common/library.cmi: common/entity.cmx 
-common/library.cmo: lib/nUri.cmi common/hierarchy.cmi common/entity.cmx \
-    lib/cps.cmx common/library.cmi 
-common/library.cmx: lib/nUri.cmx common/hierarchy.cmx common/entity.cmx \
-    lib/cps.cmx common/library.cmi 
-text/txt.cmo: 
-text/txt.cmx: 
-text/txtParser.cmi: text/txt.cmx 
-text/txtParser.cmo: text/txt.cmx common/options.cmx text/txtParser.cmi 
-text/txtParser.cmx: text/txt.cmx common/options.cmx text/txtParser.cmi 
-text/txtLexer.cmo: text/txtParser.cmi common/options.cmx lib/log.cmi 
-text/txtLexer.cmx: text/txtParser.cmx common/options.cmx lib/log.cmx 
-text/txtTxt.cmi: text/txt.cmx 
-text/txtTxt.cmo: text/txt.cmx lib/cps.cmx text/txtTxt.cmi 
-text/txtTxt.cmx: text/txt.cmx lib/cps.cmx text/txtTxt.cmi 
-automath/aut.cmo: 
-automath/aut.cmx: 
-automath/autProcess.cmi: automath/aut.cmx 
-automath/autProcess.cmo: automath/aut.cmx automath/autProcess.cmi 
-automath/autProcess.cmx: automath/aut.cmx automath/autProcess.cmi 
-automath/autOutput.cmi: automath/autProcess.cmi automath/aut.cmx 
-automath/autOutput.cmo: lib/log.cmi lib/cps.cmx automath/autProcess.cmi \
-    automath/aut.cmx automath/autOutput.cmi 
-automath/autOutput.cmx: lib/log.cmx lib/cps.cmx automath/autProcess.cmx \
-    automath/aut.cmx automath/autOutput.cmi 
-automath/autParser.cmi: automath/aut.cmx 
-automath/autParser.cmo: common/options.cmx automath/aut.cmx \
-    automath/autParser.cmi 
-automath/autParser.cmx: common/options.cmx automath/aut.cmx \
-    automath/autParser.cmi 
-automath/autLexer.cmo: common/options.cmx lib/log.cmi automath/autParser.cmi 
-automath/autLexer.cmx: common/options.cmx lib/log.cmx automath/autParser.cmx 
-basic_ag/bag.cmo: lib/log.cmi common/entity.cmx lib/cps.cmx 
-basic_ag/bag.cmx: lib/log.cmx common/entity.cmx lib/cps.cmx 
-basic_ag/bagOutput.cmi: lib/log.cmi basic_ag/bag.cmx 
-basic_ag/bagOutput.cmo: common/options.cmx lib/nUri.cmi lib/log.cmi \
-    common/hierarchy.cmi common/entity.cmx basic_ag/bag.cmx \
-    basic_ag/bagOutput.cmi 
-basic_ag/bagOutput.cmx: common/options.cmx lib/nUri.cmx lib/log.cmx \
-    common/hierarchy.cmx common/entity.cmx basic_ag/bag.cmx \
-    basic_ag/bagOutput.cmi 
-basic_ag/bagEnvironment.cmi: basic_ag/bag.cmx 
-basic_ag/bagEnvironment.cmo: lib/nUri.cmi lib/log.cmi common/entity.cmx \
-    basic_ag/bag.cmx basic_ag/bagEnvironment.cmi 
-basic_ag/bagEnvironment.cmx: lib/nUri.cmx lib/log.cmx common/entity.cmx \
-    basic_ag/bag.cmx basic_ag/bagEnvironment.cmi 
-basic_ag/bagSubstitution.cmi: basic_ag/bag.cmx 
-basic_ag/bagSubstitution.cmo: lib/share.cmx basic_ag/bag.cmx \
-    basic_ag/bagSubstitution.cmi 
-basic_ag/bagSubstitution.cmx: lib/share.cmx basic_ag/bag.cmx \
-    basic_ag/bagSubstitution.cmi 
-basic_ag/bagReduction.cmi: basic_ag/bag.cmx 
-basic_ag/bagReduction.cmo: lib/nUri.cmi lib/log.cmi common/entity.cmx \
-    lib/cps.cmx basic_ag/bagSubstitution.cmi basic_ag/bagOutput.cmi \
-    basic_ag/bagEnvironment.cmi basic_ag/bag.cmx basic_ag/bagReduction.cmi 
-basic_ag/bagReduction.cmx: lib/nUri.cmx lib/log.cmx common/entity.cmx \
-    lib/cps.cmx basic_ag/bagSubstitution.cmx basic_ag/bagOutput.cmx \
-    basic_ag/bagEnvironment.cmx basic_ag/bag.cmx basic_ag/bagReduction.cmi 
-basic_ag/bagType.cmi: common/entity.cmx basic_ag/bag.cmx 
-basic_ag/bagType.cmo: lib/share.cmx lib/nUri.cmi lib/log.cmi \
-    common/hierarchy.cmi common/entity.cmx lib/cps.cmx \
-    basic_ag/bagReduction.cmi basic_ag/bagOutput.cmi \
-    basic_ag/bagEnvironment.cmi basic_ag/bag.cmx basic_ag/bagType.cmi 
-basic_ag/bagType.cmx: lib/share.cmx lib/nUri.cmx lib/log.cmx \
-    common/hierarchy.cmx common/entity.cmx lib/cps.cmx \
-    basic_ag/bagReduction.cmx basic_ag/bagOutput.cmx \
-    basic_ag/bagEnvironment.cmx basic_ag/bag.cmx basic_ag/bagType.cmi 
-basic_ag/bagUntrusted.cmi: common/entity.cmx basic_ag/bag.cmx 
-basic_ag/bagUntrusted.cmo: lib/nUri.cmi lib/log.cmi common/entity.cmx \
-    basic_ag/bagType.cmi basic_ag/bagEnvironment.cmi basic_ag/bag.cmx \
-    basic_ag/bagUntrusted.cmi 
-basic_ag/bagUntrusted.cmx: lib/nUri.cmx lib/log.cmx common/entity.cmx \
-    basic_ag/bagType.cmx basic_ag/bagEnvironment.cmx basic_ag/bag.cmx \
-    basic_ag/bagUntrusted.cmi 
-basic_rg/brg.cmo: common/entity.cmx 
-basic_rg/brg.cmx: common/entity.cmx 
-basic_rg/brgOutput.cmi: lib/log.cmi common/library.cmi basic_rg/brg.cmx 
-basic_rg/brgOutput.cmo: common/options.cmx lib/nUri.cmi lib/log.cmi \
-    common/library.cmi common/hierarchy.cmi common/entity.cmx lib/cps.cmx \
-    basic_rg/brg.cmx basic_rg/brgOutput.cmi 
-basic_rg/brgOutput.cmx: common/options.cmx lib/nUri.cmx lib/log.cmx \
-    common/library.cmx common/hierarchy.cmx common/entity.cmx lib/cps.cmx \
-    basic_rg/brg.cmx basic_rg/brgOutput.cmi 
-basic_rg/brgEnvironment.cmi: basic_rg/brg.cmx 
-basic_rg/brgEnvironment.cmo: lib/nUri.cmi common/entity.cmx basic_rg/brg.cmx \
-    basic_rg/brgEnvironment.cmi 
-basic_rg/brgEnvironment.cmx: lib/nUri.cmx common/entity.cmx basic_rg/brg.cmx \
-    basic_rg/brgEnvironment.cmi 
-basic_rg/brgSubstitution.cmi: basic_rg/brg.cmx 
-basic_rg/brgSubstitution.cmo: basic_rg/brg.cmx basic_rg/brgSubstitution.cmi 
-basic_rg/brgSubstitution.cmx: basic_rg/brg.cmx basic_rg/brgSubstitution.cmi 
-basic_rg/brgReduction.cmi: lib/log.cmi common/entity.cmx basic_rg/brg.cmx 
-basic_rg/brgReduction.cmo: lib/share.cmx common/output.cmi lib/nUri.cmi \
-    lib/log.cmi common/entity.cmx lib/cps.cmx basic_rg/brgOutput.cmi \
-    basic_rg/brgEnvironment.cmi basic_rg/brg.cmx basic_rg/brgReduction.cmi 
-basic_rg/brgReduction.cmx: lib/share.cmx common/output.cmx lib/nUri.cmx \
-    lib/log.cmx common/entity.cmx lib/cps.cmx basic_rg/brgOutput.cmx \
-    basic_rg/brgEnvironment.cmx basic_rg/brg.cmx basic_rg/brgReduction.cmi 
-basic_rg/brgType.cmi: lib/log.cmi common/entity.cmx basic_rg/brgReduction.cmi \
-    basic_rg/brg.cmx 
-basic_rg/brgType.cmo: lib/share.cmx lib/nUri.cmi lib/log.cmi \
-    common/hierarchy.cmi common/entity.cmx lib/cps.cmx \
-    basic_rg/brgSubstitution.cmi basic_rg/brgReduction.cmi \
-    basic_rg/brgOutput.cmi basic_rg/brgEnvironment.cmi basic_rg/brg.cmx \
-    basic_rg/brgType.cmi 
-basic_rg/brgType.cmx: lib/share.cmx lib/nUri.cmx lib/log.cmx \
-    common/hierarchy.cmx common/entity.cmx lib/cps.cmx \
-    basic_rg/brgSubstitution.cmx basic_rg/brgReduction.cmx \
-    basic_rg/brgOutput.cmx basic_rg/brgEnvironment.cmx basic_rg/brg.cmx \
-    basic_rg/brgType.cmi 
-basic_rg/brgUntrusted.cmi: common/entity.cmx basic_rg/brgType.cmi \
-    basic_rg/brg.cmx 
-basic_rg/brgUntrusted.cmo: lib/nUri.cmi lib/log.cmi common/entity.cmx \
-    basic_rg/brgType.cmi basic_rg/brgReduction.cmi \
-    basic_rg/brgEnvironment.cmi basic_rg/brg.cmx basic_rg/brgUntrusted.cmi 
-basic_rg/brgUntrusted.cmx: lib/nUri.cmx lib/log.cmx common/entity.cmx \
-    basic_rg/brgType.cmx basic_rg/brgReduction.cmx \
-    basic_rg/brgEnvironment.cmx basic_rg/brg.cmx basic_rg/brgUntrusted.cmi 
-complete_rg/crg.cmo: common/entity.cmx 
-complete_rg/crg.cmx: common/entity.cmx 
-complete_rg/crgOutput.cmi: complete_rg/crg.cmx 
-complete_rg/crgOutput.cmo: lib/nUri.cmi common/hierarchy.cmi \
-    common/entity.cmx complete_rg/crg.cmx lib/cps.cmx \
-    complete_rg/crgOutput.cmi 
-complete_rg/crgOutput.cmx: lib/nUri.cmx common/hierarchy.cmx \
-    common/entity.cmx complete_rg/crg.cmx lib/cps.cmx \
-    complete_rg/crgOutput.cmi 
-complete_rg/crgXml.cmi: common/library.cmi complete_rg/crg.cmx 
-complete_rg/crgXml.cmo: lib/nUri.cmi common/library.cmi common/hierarchy.cmi \
-    common/entity.cmx complete_rg/crg.cmx lib/cps.cmx common/alpha.cmi \
-    complete_rg/crgXml.cmi 
-complete_rg/crgXml.cmx: lib/nUri.cmx common/library.cmx common/hierarchy.cmx \
-    common/entity.cmx complete_rg/crg.cmx lib/cps.cmx common/alpha.cmx \
-    complete_rg/crgXml.cmi 
-complete_rg/crgTxt.cmi: text/txt.cmx complete_rg/crg.cmx 
-complete_rg/crgTxt.cmo: text/txtTxt.cmi text/txt.cmx common/options.cmx \
-    lib/nUri.cmi common/hierarchy.cmi common/entity.cmx complete_rg/crg.cmx \
-    lib/cps.cmx complete_rg/crgTxt.cmi 
-complete_rg/crgTxt.cmx: text/txtTxt.cmx text/txt.cmx common/options.cmx \
-    lib/nUri.cmx common/hierarchy.cmx common/entity.cmx complete_rg/crg.cmx \
-    lib/cps.cmx complete_rg/crgTxt.cmi 
-complete_rg/crgAut.cmi: complete_rg/crg.cmx automath/aut.cmx 
-complete_rg/crgAut.cmo: common/options.cmx lib/nUri.cmi common/entity.cmx \
-    complete_rg/crg.cmx lib/cps.cmx automath/aut.cmx complete_rg/crgAut.cmi 
-complete_rg/crgAut.cmx: common/options.cmx lib/nUri.cmx common/entity.cmx \
-    complete_rg/crg.cmx lib/cps.cmx automath/aut.cmx complete_rg/crgAut.cmi 
-complete_rg/crgBrg.cmi: complete_rg/crg.cmx basic_rg/brg.cmx 
-complete_rg/crgBrg.cmo: common/marks.cmx common/entity.cmx \
-    complete_rg/crg.cmx lib/cps.cmx basic_rg/brg.cmx complete_rg/crgBrg.cmi 
-complete_rg/crgBrg.cmx: common/marks.cmx common/entity.cmx \
-    complete_rg/crg.cmx lib/cps.cmx basic_rg/brg.cmx complete_rg/crgBrg.cmi 
-toplevel/meta.cmo: common/entity.cmx 
-toplevel/meta.cmx: common/entity.cmx 
-toplevel/metaOutput.cmi: toplevel/meta.cmx 
-toplevel/metaOutput.cmo: lib/nUri.cmi toplevel/meta.cmx lib/log.cmi \
-    common/entity.cmx lib/cps.cmx toplevel/metaOutput.cmi 
-toplevel/metaOutput.cmx: lib/nUri.cmx toplevel/meta.cmx lib/log.cmx \
-    common/entity.cmx lib/cps.cmx toplevel/metaOutput.cmi 
-toplevel/metaLibrary.cmi: toplevel/meta.cmx 
-toplevel/metaLibrary.cmo: toplevel/metaOutput.cmi toplevel/metaLibrary.cmi 
-toplevel/metaLibrary.cmx: toplevel/metaOutput.cmx toplevel/metaLibrary.cmi 
-toplevel/metaAut.cmi: toplevel/meta.cmx automath/aut.cmx 
-toplevel/metaAut.cmo: common/options.cmx lib/nUri.cmi toplevel/meta.cmx \
-    common/entity.cmx lib/cps.cmx automath/aut.cmx toplevel/metaAut.cmi 
-toplevel/metaAut.cmx: common/options.cmx lib/nUri.cmx toplevel/meta.cmx \
-    common/entity.cmx lib/cps.cmx automath/aut.cmx toplevel/metaAut.cmi 
-toplevel/metaBag.cmi: toplevel/meta.cmx basic_ag/bag.cmx 
-toplevel/metaBag.cmo: toplevel/meta.cmx lib/cps.cmx basic_ag/bag.cmx \
-    toplevel/metaBag.cmi 
-toplevel/metaBag.cmx: toplevel/meta.cmx lib/cps.cmx basic_ag/bag.cmx \
-    toplevel/metaBag.cmi 
-toplevel/metaBrg.cmi: toplevel/meta.cmx basic_rg/brg.cmx 
-toplevel/metaBrg.cmo: toplevel/meta.cmx common/entity.cmx lib/cps.cmx \
-    basic_rg/brg.cmx toplevel/metaBrg.cmi 
-toplevel/metaBrg.cmx: toplevel/meta.cmx common/entity.cmx lib/cps.cmx \
-    basic_rg/brg.cmx toplevel/metaBrg.cmi 
-toplevel/top.cmo: text/txtParser.cmi text/txtLexer.cmx text/txt.cmx \
-    lib/time.cmx common/output.cmi common/options.cmx lib/nUri.cmi \
-    toplevel/metaOutput.cmi toplevel/metaLibrary.cmi toplevel/metaBrg.cmi \
-    toplevel/metaBag.cmi toplevel/metaAut.cmi toplevel/meta.cmx lib/log.cmi \
-    common/library.cmi common/hierarchy.cmi common/entity.cmx \
-    complete_rg/crgXml.cmi complete_rg/crgTxt.cmi complete_rg/crgBrg.cmi \
-    complete_rg/crgAut.cmi complete_rg/crg.cmx lib/cps.cmx \
-    basic_rg/brgUntrusted.cmi basic_rg/brgReduction.cmi \
-    basic_rg/brgOutput.cmi basic_rg/brg.cmx basic_ag/bagUntrusted.cmi \
-    basic_ag/bagType.cmi basic_ag/bagOutput.cmi basic_ag/bag.cmx \
-    automath/autProcess.cmi automath/autParser.cmi automath/autOutput.cmi \
-    automath/autLexer.cmx automath/aut.cmx 
-toplevel/top.cmx: text/txtParser.cmx text/txtLexer.cmx text/txt.cmx \
-    lib/time.cmx common/output.cmx common/options.cmx lib/nUri.cmx \
-    toplevel/metaOutput.cmx toplevel/metaLibrary.cmx toplevel/metaBrg.cmx \
-    toplevel/metaBag.cmx toplevel/metaAut.cmx toplevel/meta.cmx lib/log.cmx \
-    common/library.cmx common/hierarchy.cmx common/entity.cmx \
-    complete_rg/crgXml.cmx complete_rg/crgTxt.cmx complete_rg/crgBrg.cmx \
-    complete_rg/crgAut.cmx complete_rg/crg.cmx lib/cps.cmx \
-    basic_rg/brgUntrusted.cmx basic_rg/brgReduction.cmx \
-    basic_rg/brgOutput.cmx basic_rg/brg.cmx basic_ag/bagUntrusted.cmx \
-    basic_ag/bagType.cmx basic_ag/bagOutput.cmx basic_ag/bag.cmx \
-    automath/autProcess.cmx automath/autParser.cmx automath/autOutput.cmx \
-    automath/autLexer.cmx automath/aut.cmx 
+components/lib/cps.cmo: 
+components/lib/cps.cmx: 
+components/lib/share.cmo: 
+components/lib/share.cmx: 
+components/lib/log.cmi: 
+components/lib/log.cmo: components/lib/cps.cmx components/lib/log.cmi 
+components/lib/log.cmx: components/lib/cps.cmx components/lib/log.cmi 
+components/lib/time.cmo: components/lib/log.cmi 
+components/lib/time.cmx: components/lib/log.cmx 
+components/common/options.cmo: components/lib/cps.cmx 
+components/common/options.cmx: components/lib/cps.cmx 
+components/common/hierarchy.cmi: 
+components/common/hierarchy.cmo: components/lib/cps.cmx \
+    components/common/hierarchy.cmi 
+components/common/hierarchy.cmx: components/lib/cps.cmx \
+    components/common/hierarchy.cmi 
+components/common/output.cmi: 
+components/common/output.cmo: components/common/options.cmx \
+    components/lib/log.cmi components/common/output.cmi 
+components/common/output.cmx: components/common/options.cmx \
+    components/lib/log.cmx components/common/output.cmi 
+components/common/entity.cmo: components/common/options.cmx \
+    components/automath/aut.cmx 
+components/common/entity.cmx: components/common/options.cmx \
+    components/automath/aut.cmx 
+components/common/marks.cmo: components/common/entity.cmx 
+components/common/marks.cmx: components/common/entity.cmx 
+components/common/alpha.cmi: components/common/entity.cmx 
+components/common/alpha.cmo: components/common/entity.cmx \
+    components/common/alpha.cmi 
+components/common/alpha.cmx: components/common/entity.cmx \
+    components/common/alpha.cmi 
+components/common/library.cmi: components/common/entity.cmx 
+components/common/library.cmo: components/common/hierarchy.cmi \
+    components/common/entity.cmx components/lib/cps.cmx \
+    components/common/library.cmi 
+components/common/library.cmx: components/common/hierarchy.cmx \
+    components/common/entity.cmx components/lib/cps.cmx \
+    components/common/library.cmi 
+components/text/txt.cmo: 
+components/text/txt.cmx: 
+components/text/txtParser.cmi: components/text/txt.cmx 
+components/text/txtParser.cmo: components/text/txt.cmx \
+    components/common/options.cmx components/text/txtParser.cmi 
+components/text/txtParser.cmx: components/text/txt.cmx \
+    components/common/options.cmx components/text/txtParser.cmi 
+components/text/txtLexer.cmo: components/text/txtParser.cmi \
+    components/common/options.cmx components/lib/log.cmi 
+components/text/txtLexer.cmx: components/text/txtParser.cmx \
+    components/common/options.cmx components/lib/log.cmx 
+components/text/txtTxt.cmi: components/text/txt.cmx 
+components/text/txtTxt.cmo: components/text/txt.cmx components/lib/cps.cmx \
+    components/text/txtTxt.cmi 
+components/text/txtTxt.cmx: components/text/txt.cmx components/lib/cps.cmx \
+    components/text/txtTxt.cmi 
+components/automath/aut.cmo: 
+components/automath/aut.cmx: 
+components/automath/autProcess.cmi: components/automath/aut.cmx 
+components/automath/autProcess.cmo: components/automath/aut.cmx \
+    components/automath/autProcess.cmi 
+components/automath/autProcess.cmx: components/automath/aut.cmx \
+    components/automath/autProcess.cmi 
+components/automath/autOutput.cmi: components/automath/autProcess.cmi \
+    components/automath/aut.cmx 
+components/automath/autOutput.cmo: components/lib/log.cmi \
+    components/lib/cps.cmx components/automath/autProcess.cmi \
+    components/automath/aut.cmx components/automath/autOutput.cmi 
+components/automath/autOutput.cmx: components/lib/log.cmx \
+    components/lib/cps.cmx components/automath/autProcess.cmx \
+    components/automath/aut.cmx components/automath/autOutput.cmi 
+components/automath/autParser.cmi: components/automath/aut.cmx 
+components/automath/autParser.cmo: components/common/options.cmx \
+    components/automath/aut.cmx components/automath/autParser.cmi 
+components/automath/autParser.cmx: components/common/options.cmx \
+    components/automath/aut.cmx components/automath/autParser.cmi 
+components/automath/autLexer.cmo: components/common/options.cmx \
+    components/lib/log.cmi components/automath/autParser.cmi 
+components/automath/autLexer.cmx: components/common/options.cmx \
+    components/lib/log.cmx components/automath/autParser.cmx 
+components/basic_ag/bag.cmo: components/lib/log.cmi \
+    components/common/entity.cmx components/lib/cps.cmx 
+components/basic_ag/bag.cmx: components/lib/log.cmx \
+    components/common/entity.cmx components/lib/cps.cmx 
+components/basic_ag/bagOutput.cmi: components/lib/log.cmi \
+    components/basic_ag/bag.cmx 
+components/basic_ag/bagOutput.cmo: components/common/options.cmx \
+    components/lib/log.cmi components/common/hierarchy.cmi \
+    components/common/entity.cmx components/basic_ag/bag.cmx \
+    components/basic_ag/bagOutput.cmi 
+components/basic_ag/bagOutput.cmx: components/common/options.cmx \
+    components/lib/log.cmx components/common/hierarchy.cmx \
+    components/common/entity.cmx components/basic_ag/bag.cmx \
+    components/basic_ag/bagOutput.cmi 
+components/basic_ag/bagEnvironment.cmi: components/basic_ag/bag.cmx 
+components/basic_ag/bagEnvironment.cmo: components/lib/log.cmi \
+    components/common/entity.cmx components/basic_ag/bag.cmx \
+    components/basic_ag/bagEnvironment.cmi 
+components/basic_ag/bagEnvironment.cmx: components/lib/log.cmx \
+    components/common/entity.cmx components/basic_ag/bag.cmx \
+    components/basic_ag/bagEnvironment.cmi 
+components/basic_ag/bagSubstitution.cmi: components/basic_ag/bag.cmx 
+components/basic_ag/bagSubstitution.cmo: components/lib/share.cmx \
+    components/basic_ag/bag.cmx components/basic_ag/bagSubstitution.cmi 
+components/basic_ag/bagSubstitution.cmx: components/lib/share.cmx \
+    components/basic_ag/bag.cmx components/basic_ag/bagSubstitution.cmi 
+components/basic_ag/bagReduction.cmi: components/basic_ag/bag.cmx 
+components/basic_ag/bagReduction.cmo: components/lib/log.cmi \
+    components/common/entity.cmx components/lib/cps.cmx \
+    components/basic_ag/bagSubstitution.cmi components/basic_ag/bagOutput.cmi \
+    components/basic_ag/bagEnvironment.cmi components/basic_ag/bag.cmx \
+    components/basic_ag/bagReduction.cmi 
+components/basic_ag/bagReduction.cmx: components/lib/log.cmx \
+    components/common/entity.cmx components/lib/cps.cmx \
+    components/basic_ag/bagSubstitution.cmx components/basic_ag/bagOutput.cmx \
+    components/basic_ag/bagEnvironment.cmx components/basic_ag/bag.cmx \
+    components/basic_ag/bagReduction.cmi 
+components/basic_ag/bagType.cmi: components/common/entity.cmx \
+    components/basic_ag/bag.cmx 
+components/basic_ag/bagType.cmo: components/lib/share.cmx \
+    components/lib/log.cmi components/common/hierarchy.cmi \
+    components/common/entity.cmx components/lib/cps.cmx \
+    components/basic_ag/bagReduction.cmi components/basic_ag/bagOutput.cmi \
+    components/basic_ag/bagEnvironment.cmi components/basic_ag/bag.cmx \
+    components/basic_ag/bagType.cmi 
+components/basic_ag/bagType.cmx: components/lib/share.cmx \
+    components/lib/log.cmx components/common/hierarchy.cmx \
+    components/common/entity.cmx components/lib/cps.cmx \
+    components/basic_ag/bagReduction.cmx components/basic_ag/bagOutput.cmx \
+    components/basic_ag/bagEnvironment.cmx components/basic_ag/bag.cmx \
+    components/basic_ag/bagType.cmi 
+components/basic_ag/bagUntrusted.cmi: components/common/entity.cmx \
+    components/basic_ag/bag.cmx 
+components/basic_ag/bagUntrusted.cmo: components/lib/log.cmi \
+    components/common/entity.cmx components/basic_ag/bagType.cmi \
+    components/basic_ag/bagEnvironment.cmi components/basic_ag/bag.cmx \
+    components/basic_ag/bagUntrusted.cmi 
+components/basic_ag/bagUntrusted.cmx: components/lib/log.cmx \
+    components/common/entity.cmx components/basic_ag/bagType.cmx \
+    components/basic_ag/bagEnvironment.cmx components/basic_ag/bag.cmx \
+    components/basic_ag/bagUntrusted.cmi 
+components/basic_rg/brg.cmo: components/common/entity.cmx 
+components/basic_rg/brg.cmx: components/common/entity.cmx 
+components/basic_rg/brgOutput.cmi: components/lib/log.cmi \
+    components/common/library.cmi components/basic_rg/brg.cmx 
+components/basic_rg/brgOutput.cmo: components/common/options.cmx \
+    components/lib/log.cmi components/common/library.cmi \
+    components/common/hierarchy.cmi components/common/entity.cmx \
+    components/lib/cps.cmx components/basic_rg/brg.cmx \
+    components/basic_rg/brgOutput.cmi 
+components/basic_rg/brgOutput.cmx: components/common/options.cmx \
+    components/lib/log.cmx components/common/library.cmx \
+    components/common/hierarchy.cmx components/common/entity.cmx \
+    components/lib/cps.cmx components/basic_rg/brg.cmx \
+    components/basic_rg/brgOutput.cmi 
+components/basic_rg/brgEnvironment.cmi: components/basic_rg/brg.cmx 
+components/basic_rg/brgEnvironment.cmo: components/common/entity.cmx \
+    components/basic_rg/brg.cmx components/basic_rg/brgEnvironment.cmi 
+components/basic_rg/brgEnvironment.cmx: components/common/entity.cmx \
+    components/basic_rg/brg.cmx components/basic_rg/brgEnvironment.cmi 
+components/basic_rg/brgSubstitution.cmi: components/basic_rg/brg.cmx 
+components/basic_rg/brgSubstitution.cmo: components/basic_rg/brg.cmx \
+    components/basic_rg/brgSubstitution.cmi 
+components/basic_rg/brgSubstitution.cmx: components/basic_rg/brg.cmx \
+    components/basic_rg/brgSubstitution.cmi 
+components/basic_rg/brgReduction.cmi: components/lib/log.cmi \
+    components/common/entity.cmx components/basic_rg/brg.cmx 
+components/basic_rg/brgReduction.cmo: components/lib/share.cmx \
+    components/common/output.cmi components/lib/log.cmi \
+    components/common/entity.cmx components/lib/cps.cmx \
+    components/basic_rg/brgOutput.cmi components/basic_rg/brgEnvironment.cmi \
+    components/basic_rg/brg.cmx components/basic_rg/brgReduction.cmi 
+components/basic_rg/brgReduction.cmx: components/lib/share.cmx \
+    components/common/output.cmx components/lib/log.cmx \
+    components/common/entity.cmx components/lib/cps.cmx \
+    components/basic_rg/brgOutput.cmx components/basic_rg/brgEnvironment.cmx \
+    components/basic_rg/brg.cmx components/basic_rg/brgReduction.cmi 
+components/basic_rg/brgType.cmi: components/lib/log.cmi \
+    components/common/entity.cmx components/basic_rg/brgReduction.cmi \
+    components/basic_rg/brg.cmx 
+components/basic_rg/brgType.cmo: components/lib/share.cmx \
+    components/lib/log.cmi components/common/hierarchy.cmi \
+    components/common/entity.cmx components/lib/cps.cmx \
+    components/basic_rg/brgSubstitution.cmi \
+    components/basic_rg/brgReduction.cmi components/basic_rg/brgOutput.cmi \
+    components/basic_rg/brgEnvironment.cmi components/basic_rg/brg.cmx \
+    components/basic_rg/brgType.cmi 
+components/basic_rg/brgType.cmx: components/lib/share.cmx \
+    components/lib/log.cmx components/common/hierarchy.cmx \
+    components/common/entity.cmx components/lib/cps.cmx \
+    components/basic_rg/brgSubstitution.cmx \
+    components/basic_rg/brgReduction.cmx components/basic_rg/brgOutput.cmx \
+    components/basic_rg/brgEnvironment.cmx components/basic_rg/brg.cmx \
+    components/basic_rg/brgType.cmi 
+components/basic_rg/brgUntrusted.cmi: components/common/entity.cmx \
+    components/basic_rg/brgType.cmi components/basic_rg/brg.cmx 
+components/basic_rg/brgUntrusted.cmo: components/lib/log.cmi \
+    components/common/entity.cmx components/basic_rg/brgType.cmi \
+    components/basic_rg/brgReduction.cmi \
+    components/basic_rg/brgEnvironment.cmi components/basic_rg/brg.cmx \
+    components/basic_rg/brgUntrusted.cmi 
+components/basic_rg/brgUntrusted.cmx: components/lib/log.cmx \
+    components/common/entity.cmx components/basic_rg/brgType.cmx \
+    components/basic_rg/brgReduction.cmx \
+    components/basic_rg/brgEnvironment.cmx components/basic_rg/brg.cmx \
+    components/basic_rg/brgUntrusted.cmi 
+components/complete_rg/crg.cmo: components/common/entity.cmx 
+components/complete_rg/crg.cmx: components/common/entity.cmx 
+components/complete_rg/crgOutput.cmi: components/complete_rg/crg.cmx 
+components/complete_rg/crgOutput.cmo: components/common/hierarchy.cmi \
+    components/common/entity.cmx components/complete_rg/crg.cmx \
+    components/lib/cps.cmx components/complete_rg/crgOutput.cmi 
+components/complete_rg/crgOutput.cmx: components/common/hierarchy.cmx \
+    components/common/entity.cmx components/complete_rg/crg.cmx \
+    components/lib/cps.cmx components/complete_rg/crgOutput.cmi 
+components/complete_rg/crgXml.cmi: components/common/library.cmi \
+    components/complete_rg/crg.cmx 
+components/complete_rg/crgXml.cmo: components/common/library.cmi \
+    components/common/hierarchy.cmi components/common/entity.cmx \
+    components/complete_rg/crg.cmx components/lib/cps.cmx \
+    components/common/alpha.cmi components/complete_rg/crgXml.cmi 
+components/complete_rg/crgXml.cmx: components/common/library.cmx \
+    components/common/hierarchy.cmx components/common/entity.cmx \
+    components/complete_rg/crg.cmx components/lib/cps.cmx \
+    components/common/alpha.cmx components/complete_rg/crgXml.cmi 
+components/complete_rg/crgTxt.cmi: components/text/txt.cmx \
+    components/complete_rg/crg.cmx 
+components/complete_rg/crgTxt.cmo: components/text/txtTxt.cmi \
+    components/text/txt.cmx components/common/options.cmx \
+    components/common/hierarchy.cmi components/common/entity.cmx \
+    components/complete_rg/crg.cmx components/lib/cps.cmx \
+    components/complete_rg/crgTxt.cmi 
+components/complete_rg/crgTxt.cmx: components/text/txtTxt.cmx \
+    components/text/txt.cmx components/common/options.cmx \
+    components/common/hierarchy.cmx components/common/entity.cmx \
+    components/complete_rg/crg.cmx components/lib/cps.cmx \
+    components/complete_rg/crgTxt.cmi 
+components/complete_rg/crgAut.cmi: components/complete_rg/crg.cmx \
+    components/automath/aut.cmx 
+components/complete_rg/crgAut.cmo: components/common/options.cmx \
+    components/common/entity.cmx components/complete_rg/crg.cmx \
+    components/lib/cps.cmx components/automath/aut.cmx \
+    components/complete_rg/crgAut.cmi 
+components/complete_rg/crgAut.cmx: components/common/options.cmx \
+    components/common/entity.cmx components/complete_rg/crg.cmx \
+    components/lib/cps.cmx components/automath/aut.cmx \
+    components/complete_rg/crgAut.cmi 
+components/complete_rg/crgBrg.cmi: components/complete_rg/crg.cmx \
+    components/basic_rg/brg.cmx 
+components/complete_rg/crgBrg.cmo: components/common/marks.cmx \
+    components/common/entity.cmx components/complete_rg/crg.cmx \
+    components/lib/cps.cmx components/basic_rg/brg.cmx \
+    components/complete_rg/crgBrg.cmi 
+components/complete_rg/crgBrg.cmx: components/common/marks.cmx \
+    components/common/entity.cmx components/complete_rg/crg.cmx \
+    components/lib/cps.cmx components/basic_rg/brg.cmx \
+    components/complete_rg/crgBrg.cmi 
+components/toplevel/meta.cmo: components/common/entity.cmx 
+components/toplevel/meta.cmx: components/common/entity.cmx 
+components/toplevel/metaOutput.cmi: components/toplevel/meta.cmx 
+components/toplevel/metaOutput.cmo: components/toplevel/meta.cmx \
+    components/lib/log.cmi components/common/entity.cmx \
+    components/lib/cps.cmx components/toplevel/metaOutput.cmi 
+components/toplevel/metaOutput.cmx: components/toplevel/meta.cmx \
+    components/lib/log.cmx components/common/entity.cmx \
+    components/lib/cps.cmx components/toplevel/metaOutput.cmi 
+components/toplevel/metaLibrary.cmi: components/toplevel/meta.cmx 
+components/toplevel/metaLibrary.cmo: components/toplevel/metaOutput.cmi \
+    components/toplevel/metaLibrary.cmi 
+components/toplevel/metaLibrary.cmx: components/toplevel/metaOutput.cmx \
+    components/toplevel/metaLibrary.cmi 
+components/toplevel/metaAut.cmi: components/toplevel/meta.cmx \
+    components/automath/aut.cmx 
+components/toplevel/metaAut.cmo: components/common/options.cmx \
+    components/toplevel/meta.cmx components/common/entity.cmx \
+    components/lib/cps.cmx components/automath/aut.cmx \
+    components/toplevel/metaAut.cmi 
+components/toplevel/metaAut.cmx: components/common/options.cmx \
+    components/toplevel/meta.cmx components/common/entity.cmx \
+    components/lib/cps.cmx components/automath/aut.cmx \
+    components/toplevel/metaAut.cmi 
+components/toplevel/metaBag.cmi: components/toplevel/meta.cmx \
+    components/basic_ag/bag.cmx 
+components/toplevel/metaBag.cmo: components/toplevel/meta.cmx \
+    components/lib/cps.cmx components/basic_ag/bag.cmx \
+    components/toplevel/metaBag.cmi 
+components/toplevel/metaBag.cmx: components/toplevel/meta.cmx \
+    components/lib/cps.cmx components/basic_ag/bag.cmx \
+    components/toplevel/metaBag.cmi 
+components/toplevel/metaBrg.cmi: components/toplevel/meta.cmx \
+    components/basic_rg/brg.cmx 
+components/toplevel/metaBrg.cmo: components/toplevel/meta.cmx \
+    components/common/entity.cmx components/lib/cps.cmx \
+    components/basic_rg/brg.cmx components/toplevel/metaBrg.cmi 
+components/toplevel/metaBrg.cmx: components/toplevel/meta.cmx \
+    components/common/entity.cmx components/lib/cps.cmx \
+    components/basic_rg/brg.cmx components/toplevel/metaBrg.cmi 
+components/toplevel/top.cmo: components/text/txtParser.cmi \
+    components/text/txtLexer.cmx components/text/txt.cmx \
+    components/lib/time.cmx components/common/output.cmi \
+    components/common/options.cmx components/toplevel/metaOutput.cmi \
+    components/toplevel/metaLibrary.cmi components/toplevel/metaBrg.cmi \
+    components/toplevel/metaBag.cmi components/toplevel/metaAut.cmi \
+    components/toplevel/meta.cmx components/lib/log.cmi \
+    components/common/library.cmi components/common/hierarchy.cmi \
+    components/common/entity.cmx components/complete_rg/crgXml.cmi \
+    components/complete_rg/crgTxt.cmi components/complete_rg/crgBrg.cmi \
+    components/complete_rg/crgAut.cmi components/complete_rg/crg.cmx \
+    components/lib/cps.cmx components/basic_rg/brgUntrusted.cmi \
+    components/basic_rg/brgReduction.cmi components/basic_rg/brgOutput.cmi \
+    components/basic_rg/brg.cmx components/basic_ag/bagUntrusted.cmi \
+    components/basic_ag/bagType.cmi components/basic_ag/bagOutput.cmi \
+    components/basic_ag/bag.cmx components/automath/autProcess.cmi \
+    components/automath/autParser.cmi components/automath/autOutput.cmi \
+    components/automath/autLexer.cmx components/automath/aut.cmx 
+components/toplevel/top.cmx: components/text/txtParser.cmx \
+    components/text/txtLexer.cmx components/text/txt.cmx \
+    components/lib/time.cmx components/common/output.cmx \
+    components/common/options.cmx components/toplevel/metaOutput.cmx \
+    components/toplevel/metaLibrary.cmx components/toplevel/metaBrg.cmx \
+    components/toplevel/metaBag.cmx components/toplevel/metaAut.cmx \
+    components/toplevel/meta.cmx components/lib/log.cmx \
+    components/common/library.cmx components/common/hierarchy.cmx \
+    components/common/entity.cmx components/complete_rg/crgXml.cmx \
+    components/complete_rg/crgTxt.cmx components/complete_rg/crgBrg.cmx \
+    components/complete_rg/crgAut.cmx components/complete_rg/crg.cmx \
+    components/lib/cps.cmx components/basic_rg/brgUntrusted.cmx \
+    components/basic_rg/brgReduction.cmx components/basic_rg/brgOutput.cmx \
+    components/basic_rg/brg.cmx components/basic_ag/bagUntrusted.cmx \
+    components/basic_ag/bagType.cmx components/basic_ag/bagOutput.cmx \
+    components/basic_ag/bag.cmx components/automath/autProcess.cmx \
+    components/automath/autParser.cmx components/automath/autOutput.cmx \
+    components/automath/autLexer.cmx components/automath/aut.cmx 

diff --git a/helm/software/lambda-delta/Makefile b/helm/software/lambda-delta/Makefile
index 6a0724a871b0cd77719f8b32c59e22ecb5364432..17ed69d21720b40cb4ed97ee81d78df71518ac29 100644 (file)
--- a/helm/software/lambda-delta/Makefile
+++ b/helm/software/lambda-delta/Makefile
@@ -1,10 +1,10 @@
 MAIN = helena
 
-REQUIRES = unix str
+REQUIRES = unix str helm-ng_kernel
 
-KEEP = README automath/*.aut
+KEEP = README
 
-CLEAN = etc/log.txt
+CLEAN = etc/log.txt etc/profile.txt
 
 TAGS = test-si test-si-fast hal xml-si-crg xml-si profile
 

diff --git a/helm/software/lambda-delta/Makefile.common b/helm/software/lambda-delta/Makefile.common
index 9e2ef7f24cc20ba9f44a6a079860ae009368d4a2..25e67cc1be2949042799dfc6b30411b68ad2807e 100644 (file)
--- a/helm/software/lambda-delta/Makefile.common
+++ b/helm/software/lambda-delta/Makefile.common
@@ -1,4 +1,9 @@
 H=@
+ifeq ($(origin OCAMLPATH), undefined)
+   OCAMLFIND = OCAMLPATH=../components/METAS ocamlfind
+else
+   OCAMLFIND = ocamlfind
+endif
 
 LDDLURL = http://helm.cs.unibo.it/lambda-delta/static/lddl
 LDDLDIR = /projects/helm/public_html/lambda-delta/static/lddl
@@ -10,13 +15,13 @@ DIRECTORIES = $(addprefix $(SRC)/,$(shell cat $(SRC)/Make))
 
 INCLUDES = $(DIRECTORIES:%=-I %) 
 
-OCAMLDEP  = ocamlfind ocamldep -native $(INCLUDES)
-OCAMLOPT  = ocamlfind opt -linkpkg -package "$(REQUIRES)" $(INCLUDES)
+OCAMLDEP  = $(OCAMLFIND) ocamldep -native $(INCLUDES)
+OCAMLOPT  = $(OCAMLFIND) opt -rectypes -linkpkg -package "$(REQUIRES)" $(INCLUDES)
 OCAMLLEX  = ocamllex.opt
 OCAMLYACC = ocamlyacc -v
 XMLLINT   = xmllint --noout
 XSLT      = xsltproc
-TAR       = tar -czf etc/$(MAIN:%=%.tgz)
+#TAR       = tar -czf etc/$(MAIN:%=%.tgz)
 
 define DIR_TEMPLATE
    MODULES += $$(addprefix $(1)/,$$(shell cat $(1)/Make))
@@ -59,16 +64,16 @@ $(MAIN).opt: $(OBJECTS)
        $(H)$(OCAMLDEP) $^ > .depend.opt
 
 clean:
-       @echo "  CLEAN . $(DIRECTORIES)"
+       @echo "  CLEAN"
        $(H)find -name "*~" | xargs $(RM) $(CLEAN)
 
 lint: $(XMLS)
        @echo XMLLINT --valid
        $(H)$(XMLLINT) --valid $^ 
 
-tgz: clean
-       @echo "  TAR -czf $(MAIN:%=%.tgz) . $(DIRECTORIES)" 
-       $(H)find -name "Make*" | xargs $(TAR) $(KEEP)
+#tgz: clean
+#      @echo "  TAR -czf $(MAIN:%=%.tgz) . $(DIRECTORIES)" 
+#      $(H)find -name "Make*" | xargs $(TAR) $(KEEP)
 
 %.ml %.mli: %.mly
        @echo "  OCAMLYACC $<"

diff --git a/helm/software/lambda-delta/components/lib/Make b/helm/software/lambda-delta/components/lib/Make
index 5b884ad1b685c03637021b9040c890ab4bd7b59f..45d5eac3bfb6fd6c7770fd850026dcbaa04d74cf 100644 (file)
--- a/helm/software/lambda-delta/components/lib/Make
+++ b/helm/software/lambda-delta/components/lib/Make
@@ -1 +1 @@
-nUri cps share log time
+cps share log time

diff --git a/helm/software/lambda-delta/components/lib/nUri.ml b/helm/software/lambda-delta/components/lib/nUri.ml
deleted file mode 120000 (symlink)
index 8987637..0000000
--- a/helm/software/lambda-delta/components/lib/nUri.ml
+++ /dev/null
@@ -1 +0,0 @@
-../../components/ng_kernel/nUri.ml
\ No newline at end of file

diff --git a/helm/software/lambda-delta/components/lib/nUri.mli b/helm/software/lambda-delta/components/lib/nUri.mli
deleted file mode 120000 (symlink)
index e6205cd..0000000
--- a/helm/software/lambda-delta/components/lib/nUri.mli
+++ /dev/null
@@ -1 +0,0 @@
-../../components/ng_kernel/nUri.mli
\ No newline at end of file