Mise à jour terminée. Pour connaître les apports de la version 13.8.4 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/02/11/security-release-gitlab-13-8-4-released/
https://about.gitlab.com/releases/2021/02/05/gitlab-13-8-3-released/

Commit d69f3436 authored by Gérard Huet's avatar Gérard Huet

Installation clean-up with SCL interface

parent 346528dc
......@@ -26,22 +26,11 @@ for download and installation instructions.
git clone https://gitlab.inria.fr/huet/Heritage_Resources.git
2) Create your configuration file SETUP/CONFIGS/my_config.txt
2) Create your configuration file "config" in directory SETUP.
Look at the SETUP/CONFIGS directory to find examples. All fields are
explained in SETUP/config_help.txt.
Then make a symbolic link to your configuration file in SETUP dir:
cd SETUP
ln -s CONFIGS/my_config.txt ./config
The "config" link has to be located in the SETUP directory, the path
of my_config.txt is arbitrary, either outside the Platform area, or
possibly inside the CONFIGS directory if you plan to update regularly,
and signaling it to the developers in order to include it in the Git
distrib
3) Launch configuration in main dir
./configure
......
......@@ -78,7 +78,7 @@ open Viccheda (* [segment_all visual_width] etc. *)
;
(* At this point we have the sandhi inverser segmenting engine *)
(* separates tags of homophonous segments vertically *)
(* Separates tags of homophonous segments vertically *)
value fold_vert f = fold 1 where rec fold n = fun
[ [] -> ()
| [ x ] -> f n x
......@@ -88,14 +88,13 @@ value fold_vert f = fold 1 where rec fold n = fun
value print_morph pvs seg_num cached gen form n tag =
Morpho_html.print_graph_link pvs cached form (seg_num,n) gen tag
;
(* tags is the multi-tag of the form of a given phase *)
(* tags : Morphology.multitag) *)
(* tags : Morphology.multitag is the multi-tag of the form of a given phase *)
value print_tags pvs seg_num phase form tags =
let gen = generative phase
and cached = is_cache phase in
let ok_tags = if pvs = [] then tags
else trim_tags (generative phase) form (Canon.decode pvs) tags
(* NB Existence of the segment guarantees that [ok_tags] is not empty *)
(* NB Existence of the segment warrants that [ok_tags] is not empty *)
and ptag = print_morph pvs seg_num cached gen form in
fold_vert ptag ok_tags
;
......@@ -333,9 +332,9 @@ value rec print_first text cpts chunk_orig chunk chunk_ind =
value rec print_all text cpts chunks index = match chunks with
[ [] -> ()
| [ chunk :: rest ] -> do
{ print_first text cpts chunk chunk index
; print_all text cpts rest (succ (Word.length chunk))
}
{ print_first text cpts chunk chunk index
; print_all text cpts rest (succ (Word.length chunk))
}
]
;
value print_word last_ind text cpts (rword,phase,k,conflict) =
......
......@@ -10,7 +10,7 @@
(* CGI-bin lemmatizer for searching the inflected forms databases *)
(* This CGI is triggered by page [index_page] in [dico_dir]. *)
(* Reads its input in shell variable [QUERY_STRING] URI-encoded. *)
(* Prints an html document of lemma information on [stdout]. *)
(* Prints an HTML document of lemma information on [stdout]. *)
(*i Test: (csh): setenv QUERY_STRING "q=eti&c=Verb"; lemmatizer i*)
(*i Web: http://skt_server_url/cgi-bin/sktlemmatizer?q=eti&c=Verb i*)
......@@ -35,10 +35,8 @@ value prelude lang = do
; print_title_solid Mauve (Some lang) stem_title_en
}
;
value postlude lang = do
{ ()
; page_end lang True
}
value postlude lang =
page_end lang True
;
value abor = abort default_language
;
......
......@@ -21,7 +21,7 @@ module Morpho_out (Chan: sig value chan: ref out_channel; end)
value ps s = output_string Chan.chan.val s
;
value pl s = do { ps s; ps "\n" }
value pl s = ps (s ^ "\n")
;
value pr_word w = ps (Canon.decode w)
;
......@@ -96,9 +96,9 @@ value print_inv_morpho_link pvs pe pne pu form =
if pv = [] then print e
else do { ps (Canon.decode pvs ^ "-"); print e } in
print_inv_morpho (encaps pe) (encaps pne) pu form
(* possible overgeneration when derivative of a root non attested with pv
since only existential test in [Dispatcher.validate_pv]
eg anusandhiiyate should keep only [dhaa#1], not [dhaa#2], [dhii#1] or [dhyaa] *)
(* Possible overgeneration when derivative of a root non attested with pv
since only existential test in [Dispatcher.validate_pv]. Thus
[anusandhiiyate] should show [dhaa#1], not [dhaa#2], [dhii#1] or [dhyaa] *)
;
value print_inv_morpho_tad pv pe pne pu stem sfx_form (seg_num,sub)
generative (delta,morphs) =
......
......@@ -4641,7 +4641,7 @@ value build_dva entry =
value build_tri entry =
let decline case suff =
(case,fix (revcode "tr") suff)
and declinn case suff =
and declinf case suff =
(case,fix (revcode "tis") suff) in
enter entry
[ Declined Noun Mas
......@@ -4670,18 +4670,19 @@ value build_tri entry =
]
; Declined Noun Fem
[ (Plural,
[ declinn Voc "ras"
; declinn Nom "ras"
; declinn Acc "ras"
; declinn Ins ".rbhis"
; declinn Dat ".rbhyas"
; declinn Abl ".rbhyas"
; declinn Gen ".r.naam"
; declinn Loc ".r.su"
[ declinf Voc "ras"
; declinf Nom "ras"
; declinf Acc "ras"
; declinf Ins ".rbhis"
; declinf Dat ".rbhyas"
; declinf Abl ".rbhyas"
; declinf Gen ".r.naam"
; declinf Loc ".r.su"
])
]
; Bare Noun (code "tri")
]
; Bare Noun (code "tis.r") (* tis.rdhanva Whitney§482f *)
]
;
value build_catur entry =
let decline case suff =
......@@ -5575,25 +5576,25 @@ value compute_decls word genders =
;
value iic_indecl = (* should be lexicalized *)
(* indeclinable stems used as iic of non-avyayiibhaava cpd *)
[ "atra" (* atrabhavat *)
; "adhas" (* adha.hzaakha adhazcara.nam *)
; "antar" (* antarafga *)
; "alam" (* (gati) ala.mk.rta *)
; "iti" (* ityukta *)
; "upari" (* uparicara *)
[ "atra" (* atrabhavat *)
; "adhas" (* adha.hzaakha adhazcara.nam *)
; "antar" (* antarafga *)
; "alam" (* (gati) ala.mk.rta *)
; "iti" (* ityukta *)
; "upari" (* uparicara *)
; "ubhayatas" (* ubhayata.hsasya *)
; "tatra" (* tatrabhavat *)
; "na~n" (* na~nvaada *)
; "naanaa" (* naanaaruupa *)
; "param" (* para.mtapa *)
; "punar" (* punarukta *)
; "puras" (* (gati) pura.hstha *)
; "mithyaa" (* mithyaak.rta *)
; "tathaa" (* tathaagata *)
; "yathaa" (* yathaanirdi.s.ta *)
; "vinaa" (* vinaabhava *)
; "satraa" (* satraajit *)
; "saha" (* problematic -- overgenerates *)
; "tatra" (* tatrabhavat *)
; "na~n" (* na~nvaada *)
; "naanaa" (* naanaaruupa *)
; "param" (* para.mtapa *)
; "punar" (* punarukta *)
; "puras" (* (gati) pura.hstha *)
; "mithyaa" (* mithyaak.rta *)
; "tathaa" (* tathaagata *)
; "yathaa" (* yathaanirdi.s.ta *)
; "vinaa" (* vinaabhava *)
; "satraa" (* satraajit *)
; "saha" (* problematic -- overgenerates *)
; "saak.saat"
; "saaci"
]
......@@ -5676,8 +5677,8 @@ value enter_iic entry =
value compute_extra_iic = iter enter_iic
;
(* Glitch to allow Cvi construction to kridanta entries, even though
[Inflected.enter_form] called from [Parts] does not allow it *)
(* incomplete for compounds anyway: si.mh'avyaaghraami.siik.r *)
[Inflected.enter_form] called from [Parts] does not allow it. *)
(* Incomplete for compounds anyway: "si.mh'avyaaghraami.siik.r" *)
value iiv_krids =
[ "gupta"
; "yuddha"
......@@ -5703,18 +5704,18 @@ value enter_iiy entry =
;
value tasil_preserve () = do (* Whitney§1098 *)
(* needed since -tas etymology induces skipping the entry *)
{ enter1 "tad" (Indecl Tas (code "tatas")) (* tasil on tad \Pan{5,3,7} *)
; enter1 "ya#1" (Indecl Tas (code "yatas")) (* tasil on ya \Pan{5,3,7} *)
; enter1 "ku#1" (Indecl Tas (code "kutas")) (* tasil on ku \Pan{5,3,7-8} *)
; enter1 "abhi" (Indecl Tas (code "abhitas")) (* tasil on abhi \Pan{5,3,9} *)
; enter1 "pari" (Indecl Tas (code "paritas")) (* tasil on pari \Pan{5,3,9} *)
; enter1 "anti" (Indecl Tas (code "antitas")) (* tasil on pn \Pan{5,3,7} *)
; enter1 "adas" (Indecl Tas (code "amutas")) (* id *)
; enter1 "anya" (Indecl Tas (code "anyatas")) (* id *)
; enter1 "avara" (Indecl Tas (code "avaratas")) (* id *)
; enter1 "para" (Indecl Tas (code "paratas")) (* id *)
; enter1 "vizva" (Indecl Tas (code "vizvatas")) (* id *)
; enter1 "sva" (Indecl Tas (code "svatas")) (* id *)
{ enter1 "tad" (Indecl Tas (code "tatas")) (* tasil on tad \Pan{5,3,7} *)
; enter1 "ya#1" (Indecl Tas (code "yatas")) (* tasil on ya \Pan{5,3,7} *)
; enter1 "ku#1" (Indecl Tas (code "kutas")) (* tasil on ku \Pan{5,3,7-8} *)
; enter1 "abhi" (Indecl Tas (code "abhitas")) (* tasil on abhi \Pan{5,3,9} *)
; enter1 "pari" (Indecl Tas (code "paritas")) (* tasil on pari \Pan{5,3,9} *)
; enter1 "anti" (Indecl Tas (code "antitas")) (* tasil on pn \Pan{5,3,7} *)
; enter1 "adas" (Indecl Tas (code "amutas")) (* id *)
; enter1 "anya" (Indecl Tas (code "anyatas")) (* id *)
; enter1 "avara" (Indecl Tas (code "avaratas")) (* id *)
; enter1 "para" (Indecl Tas (code "paratas")) (* id *)
; enter1 "vizva" (Indecl Tas (code "vizvatas")) (* id *)
; enter1 "sva" (Indecl Tas (code "svatas")) (* id *)
; enter1 "puurva" (Indecl Tas (code "puurvatas")) (* id *)
; enter1 "aze.sa" (Indecl Tas (code "aze.satas")) (* tasil on privative cpd *)
}
......@@ -5746,7 +5747,7 @@ value compute_extra iic_only_stems = do
where decl = Declined Noun Mas [ (Singular,[ (Dat,code "bhuumaaya") ]) ]
; enter1 "sudhii" (* Monier *) decl
where decl = Declined Noun Mas [ (Singular,[ (Nom,code "sudhi") ]) ]
; enter1 "viz#2" (* vedic Whitney§218a *) decl
; enter1 "viz#2" (* Vedic Whitney§218a *) decl
where decl = Declined Noun Fem [ (Plural,[ (Loc,code "vik.su") ]) ]
; iter enter_iiy iic_avya
; tasil_preserve ()
......
......@@ -127,12 +127,8 @@ CAPTION is the localisation message on the site entry page.
SKTRESOURCES is the local path to the distribution directory where
the Heritage_Resources linguistic data have been installed.
When the config file is ready, store it in directory SETUP/CONFIGS as
xxx_config.txt with xxx the name of your site, and in directory SETUP
execute the command
ln -s CONFIGS/config.xxx.txt config
Then execute in directory Main the command
When the config file is ready, store it in directory SETUP, then execute
in directory Main the command
./configure
The localization is complete. More complex localizations may be obtained by changes of
......
......@@ -626,9 +626,9 @@ distrib: # distribution of ZEN, and of derived Heritage under HTML & PDF formats
cp -p $(MANUAL) DISTR/SITE # user's manual
# cp -p $(ROBOTS) DISTR/SITE # robots permissions
mkdir DISTR/$(STAT)
cp -p $(STAT)/regression_template DISTR/$(STAT) # for regression analysis suite
touch DISTR/dictionary # for make dictionary to succeed vacuously
touch DISTR/xmlmorphology # for make xmlmorphology to succeed vacuously
# cp -p $(STAT)/regression_template DISTR/$(STAT) # for regression analysis suite
# touch DISTR/dictionary # for make dictionary to succeed vacuously
# touch DISTR/xmlmorphology # for make xmlmorphology to succeed vacuously
# creates an archive SktPlatform.$(VERSION) with the full distribution (55Mb)
distrib_full: distrib# assumes distrib has been run, and thus directory DISTR exists
......@@ -651,7 +651,7 @@ distrib_full: distrib# assumes distrib has been run, and thus directory DISTR ex
cp -Rp $(DATASOURCE) DISTR/$(DATA) # Morphology introduction
cp -Rp CORPUS DISTR # Corpus - under development
cp -Rp $(STAT) DISTR # Statistical data, logs, notes
touch DISTR/dictionary # for make dictionary to succeed vacuously
# touch DISTR/dictionary # for make dictionary to succeed vacuously
mv DISTR SktPlatform.$(VERSION) # SktPlatform.$(VERSION) fresh
# deprecated: now we may use Git for distribution
......@@ -698,7 +698,7 @@ cold: # for first install
install_regression: # for initialisation of regression suite - su privilege
mkdir -p $(SERVERPUBLICDIR)$(VAR)
chmod a+rw $(SERVERPUBLICDIR)$(VAR)
cp -p $(STAT)/regression_template $(SERVERPUBLICDIR)$(VAR)/regression.txt
#TODO cp -p $(STAT)/regression_template $(SERVERPUBLICDIR)$(VAR)/regression.txt
chmod a+rw $(SERVERPUBLICDIR)$(VAR)/regression.txt
empty_caches: ML/reset_caches # caution: will reset the caches
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment