diff options
| author |  Stephane Glondu <steph@glondu.net> | 2014-07-27 10:02:38 +0200 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2014-07-27 10:02:38 +0200 |
| commit | 420f78b2caeaaddc6fe484565b2d0e49c66888e5 (patch) | |
| tree | 8b5450c5801a1592e0348ad0362f950e7bb958d4 /scripts | |
| parent | d2c5c5e616a6e118291fe1ce9965c731adac03a8 (diff) | |
Imported Upstream version 8.4pl4dfsgupstream/8.4pl4dfsg
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/coqc.ml | 16 | ||||
| -rw-r--r-- | scripts/coqmktop.ml | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/scripts/coqc.ml b/scripts/coqc.ml index 968bd0da..8cdac0c5 100644 --- a/scripts/coqc.ml +++ b/scripts/coqc.ml @@ -1,6 +1,6 @@ (************************************************************************) (* v * The Coq Proof Assistant / The Coq Development Team *) -(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2012 *) +(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2014 *) (* \VV/ **************************************************************) (* // * This file is distributed under the terms of the *) (* * GNU Lesser General Public License Version 2.1 *) @@ -57,18 +57,16 @@ let check_module_name s = let rec make_compilation_args = function | [] -> [] | file :: fl -> - let dirname = Filename.dirname file in - let basename = Filename.basename file in - let modulename = - if Filename.check_suffix basename ".v" then - Filename.chop_suffix basename ".v" + let name_no_suffix = + if Filename.check_suffix file ".v" then + Filename.chop_suffix file ".v" else - basename + file in + let modulename = Filename.basename name_no_suffix in check_module_name modulename; - let file = Filename.concat dirname modulename in (if !verbose then "-compile-verbose" else "-compile") - :: file :: (make_compilation_args fl) + :: name_no_suffix :: (make_compilation_args fl) (* compilation of files [files] with command [command] and args [args] *) diff --git a/scripts/coqmktop.ml b/scripts/coqmktop.ml index b75984e3..eaecda5d 100644 --- a/scripts/coqmktop.ml +++ b/scripts/coqmktop.ml @@ -1,6 +1,6 @@ (************************************************************************) (* v * The Coq Proof Assistant / The Coq Development Team *) -(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2012 *) +(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2014 *) (* \VV/ **************************************************************) (* // * This file is distributed under the terms of the *) (* * GNU Lesser General Public License Version 2.1 *) |