aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar notin <notin@85f007b7-540e-0410-9357-904b9bb8a0f7>2009-04-24 18:28:56 +0000
committerGravatar notin <notin@85f007b7-540e-0410-9357-904b9bb8a0f7>2009-04-24 18:28:56 +0000
commit6e1041ad146ab3cf90cfdfad237ee1f6816a3db6 (patch)
treebfd088cda16b5b460d2f16471c90bd811bc99618
parentac4ba8bbc899c3d3db1f1f5e0592ee419ed92994 (diff)
Report de la révision #12104 (Maj lien site web de Coq)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12105 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--config/coq_config.mli5
-rwxr-xr-xconfigure12
-rw-r--r--ide/coqide.ml6
-rw-r--r--ide/preferences.ml4
-rw-r--r--tools/coqdoc/cdglobals.ml2
-rw-r--r--tools/coqdoc/main.ml2
-rw-r--r--tools/coqdoc/output.ml4
7 files changed, 25 insertions, 10 deletions
diff --git a/config/coq_config.mli b/config/coq_config.mli
index 85d25ad73..5294ee6f1 100644
--- a/config/coq_config.mli
+++ b/config/coq_config.mli
@@ -63,3 +63,8 @@ val has_coqide : string
val has_natdynlink : bool
val natdynlinkflag : string (* special cases of natdynlink (e.g. MacOS 10.5) *)
+
+val wwwcoq : string
+val wwwrefman : string
+val wwwstdlib : string
+
diff --git a/configure b/configure
index 7476485fd..0187e1f21 100755
--- a/configure
+++ b/configure
@@ -136,6 +136,7 @@ reals=all
arch_spec=no
coqide_spec=no
browser_spec=no
+wwwcoq_spec=no
with_geoproof=false
with_doc=all
with_doc_spec=no
@@ -224,6 +225,9 @@ while : ; do
-browser|--browser) browser_spec=yes
BROWSER=$2
shift;;
+ -coqwebsite|--coqwebsite) wwwcoq_spec=yes
+ WWWCOQ=$2
+ shift;;
-with-doc|--with-doc) with_doc_spec=yes
case "$2" in
yes|all) with_doc=all;;
@@ -366,6 +370,10 @@ if [ "$browser_spec" = "no" ]; then
esac
fi
+if [ "$wwwcoq_spec" = "no" ]; then
+ WWWCOQ="http://www.lix.polytechnique.fr/coq/"
+fi
+
#########################################
# Objective Caml programs
@@ -865,6 +873,7 @@ echo " Documentation : None"
fi
echo " CoqIde : $COQIDE"
echo " Web browser : $BROWSER"
+echo " Coq web site : $WWWCOQ"
echo ""
echo " Paths for true installation:"
@@ -1007,6 +1016,9 @@ let state_magic_number = $STATEMAGIC
let exec_extension = "$EXE"
let with_geoproof = ref $with_geoproof
let browser = "$BROWSER"
+let wwwcoq = "$WWWCOQ"
+let wwwrefman = wwwcoq ^ "distrib/" ^ version ^ "/refman/"
+let wwwstdlib = wwwcoq ^ "distrib/" ^ version ^ "/stdlib/"
END_OF_COQ_CONFIG
diff --git a/ide/coqide.ml b/ide/coqide.ml
index 6175dc5a8..449f84bcc 100644
--- a/ide/coqide.ml
+++ b/ide/coqide.ml
@@ -3120,7 +3120,7 @@ with _ := Induction for _ Sort _.\n",61,10, Some GdkKeysyms._S);
~callback:
(fun () ->
let av = session_notebook#current_term.analyzed_view in
- browse av#insert_message (!current.doc_url ^ "main.html")) in
+ browse av#insert_message (!current.doc_url)) in
let _ = help_factory#add_item "Browse Coq _Library"
~callback:
(fun () ->
@@ -3317,8 +3317,8 @@ with _ := Induction for _ Sort _.\n",61,10, Some GdkKeysyms._S);
let about_full_string =
"\nCoq is developed by the Coq Development Team\
\n(INRIA - CNRS - University Paris 11 and partners)\
- \nWeb site: http://coq.inria.fr\
- \nFeature wish or bug report: http://logical.saclay.inria.fr/coq-bugs\
+ \nWeb site: " ^ Coq_config.wwwcoq ^
+ "\nFeature wish or bug report: http://logical.saclay.inria.fr/coq-bugs\
\n\
\nCredits for CoqIDE, the Integrated Development Environment for Coq:\
\n\
diff --git a/ide/preferences.ml b/ide/preferences.ml
index aa9938eb3..5093c9632 100644
--- a/ide/preferences.ml
+++ b/ide/preferences.ml
@@ -135,8 +135,8 @@ let (current:pref ref) =
(* text_font = Pango.Font.from_string "sans 12";*)
text_font = Pango.Font.from_string "Monospace 10";
- doc_url = "http://coq.inria.fr/doc/";
- library_url = "http://coq.inria.fr/library/";
+ doc_url = Coq_config.wwwrefman;
+ library_url = Coq_config.wwwstdlib;
show_toolbar = true;
contextual_menus_on_goal = true;
diff --git a/tools/coqdoc/cdglobals.ml b/tools/coqdoc/cdglobals.ml
index c81dcec17..b3f0739d1 100644
--- a/tools/coqdoc/cdglobals.ml
+++ b/tools/coqdoc/cdglobals.ml
@@ -54,7 +54,7 @@ let toc = ref false
let page_title = ref ""
let title = ref ""
let externals = ref true
-let coqlib = ref "http://coq.inria.fr/library/"
+let coqlib = ref Coq_config.wwwstdlib
let coqlib_path = ref Coq_config.coqlib
let raw_comments = ref false
let parse_comments = ref false
diff --git a/tools/coqdoc/main.ml b/tools/coqdoc/main.ml
index bbfd93fd4..da65466dd 100644
--- a/tools/coqdoc/main.ml
+++ b/tools/coqdoc/main.ml
@@ -56,7 +56,7 @@ let usage () =
prerr_endline " --verbose verbose mode";
prerr_endline " --no-externals no links to Coq standard library";
prerr_endline " --coqlib <url> set URL for Coq standard library";
- prerr_endline " (default is http://coq.inria.fr/library/)";
+ prerr_endline (" (default is " ^ Coq_config.wwwstdlib ^ ")");
prerr_endline " --boot run in boot mode";
prerr_endline " --coqlib_path <dir> set the path where Coq files are installed";
prerr_endline " -R <dir> <coqdir> map physical dir to Coq dir";
diff --git a/tools/coqdoc/output.ml b/tools/coqdoc/output.ml
index 86f3bda7e..9fda0d0ca 100644
--- a/tools/coqdoc/output.ml
+++ b/tools/coqdoc/output.ml
@@ -395,8 +395,6 @@ module Html = struct
printf "<div id=\"main\">\n\n"
end
- let self = "http://coq.inria.fr"
-
let trailer () =
if !index && !current_module <> "Index" then
printf "</div>\n\n<div id=\"footer\">\n<hr/><a href=\"index.html\">Index</a>";
@@ -412,7 +410,7 @@ module Html = struct
else
begin
printf "<hr/>This page has been generated by ";
- printf "<a href=\"%s\">coqdoc</a>\n" self;
+ printf "<a href=\"%s\">coqdoc</a>\n" Coq_config.wwwcoq;
printf "</div>\n\n</div>\n\n</body>\n</html>"
end