Skip to content

Commits on Source 10

Show whitespace changes
Inline Side-by-side
.gitignore
View file @ 2d9cccf8
......@@ -21,6 +21,7 @@ src_ext/camlp4
src_ext/findlib
src_ext/ocamlbuild
src_ext/topkg
src_ext/seq
src_ext/*.*stamp
src_ext/*.tbz
src_ext/*.tar.gz
......
.travis-ci.sh
View file @ 2d9cccf8
......@@ -41,6 +41,7 @@ case "$TARGET" in
# Git should be configured properly to run the tests
git config --global user.email "travis@example.com"
git config --global user.name "Travis CI"
git config --global gc.autoDetach false
# Disable bubblewrap wrapping, it's not available within Docker
cat <<EOF >>~/.opamrc
......@@ -105,7 +106,7 @@ EOF
fi
./configure --prefix ~/local -no-graph -no-debugger ${CONFIGURE_SWITCHES:-}
if [[ $OPAM_TEST -eq 1 ]] ; then
make -j world.opt
make -j 4 world.opt
else
make world.opt
fi
......@@ -177,7 +178,7 @@ export OCAMLRUNPARAM=b
else
# Note: these tests require a "system" compiler and will use the one in $OPAMBSROOT
OPAMEXTERNALSOLVER="$EXTERNAL_SOLVER" make tests ||
(tail -2000 _build/default/tests/fulltest-*.log; echo "-- TESTS FAILED --"; exit 1)
(tail -n 2000 _build/default/tests/fulltest-*.log; echo "-- TESTS FAILED --"; exit 1)
fi
)
......
CHANGES
View file @ 2d9cccf8
......@@ -2,6 +2,9 @@ Changes prefixed with "(*)" are potentially breaking to scripts or existing
repositories (changes that are automatically handled by the format upgrade tools
are not marked).
2.0.1:
* Fixes and documentation
2.0.0
* Fixes and documentation
* Add `opam admin add-hashes` helper to add more secure hashes to the repository
......
appveyor.yml
View file @ 2d9cccf8
......@@ -14,9 +14,9 @@ environment:
matrix:
- CYG_ROOT: cygwin
CYG_ARCH: x86
- CYG_ROOT: cygwin64
CYG_ARCH: x86_64
DEP_MODE: lib-pkg
# - CYG_ROOT: cygwin64
# CYG_ARCH: x86_64
# DEP_MODE: lib-pkg
- OCAML_PORT: msvc
DEP_MODE: lib-pkg
- OCAML_PORT: msvc64
......
appveyor_build.cmd
View file @ 2d9cccf8
......@@ -116,18 +116,10 @@ if %ERRORLEVEL% equ 1 (
if not exist bootstrap\nul (
"%CYG_ROOT%\bin\bash.exe" -lc "cd $APPVEYOR_BUILD_FOLDER && make compiler" || exit /b 1
for /f "delims=" %%U in ('type bootstrap\installed-tarball') do echo %%U %DEP_MODE%> bootstrap\installed-tarball
if "%CYG_ARCH%%OCAML_PORT%" equ "x86_64" (
"%CYG_ROOT%\bin\bash.exe" -lc "cd $APPVEYOR_BUILD_FOLDER && rebase -b 0x7cd20000 bootstrap/ocaml/lib/ocaml/stublibs/dllunix.so" || exit /b 1
"%CYG_ROOT%\bin\bash.exe" -lc "cd $APPVEYOR_BUILD_FOLDER && rebase -b 0x7cd20000 bootstrap/ocaml/lib/ocaml/stublibs/dllthreads.so" || exit /b 1
)
if exist bootstrap\ocaml-*.tar.gz del bootstrap\ocaml-*.tar.gz
if "%OCAML_PORT%" neq "" if exist bootstrap\flexdll-*.tar.gz del bootstrap\flexdll-*.tar.gz
del bootstrap\ocaml\bin\*.byte.exe
if "%OCAML_PORT%" equ "" (
del bootstrap\ocaml\lib\ocaml\expunge.exe
) else (
del bootstrap\ocaml\lib\expunge.exe
)
for /f %%D in ('dir /b/ad bootstrap\ocaml-*') do (
rd /s/q bootstrap\%%D
rem Directory needs to exist, as the Cygwin bootstraps OCAMLLIB refers to it
......
configure
View file @ 2d9cccf8
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
configure.ac
View file @ 2d9cccf8
AC_INIT(opam,2.0.0)
AC_INIT(opam,2.0.1)
AC_COPYRIGHT(Copyright 2012-2017 OcamlPro SAS)
AC_CONFIG_MACRO_DIR([m4])
......@@ -214,6 +214,8 @@ AS_IF([test "x${enable_certificate_check}" = "xno"], [
AC_CHECK_PROGS(FETCH,[curl wget],no)
AC_CHECK_TOOL(JBUILDER,jbuilder)
AC_CHECK_TOOL(PATCH,patch)
AC_CHECK_TOOL(BUNZIP2,bunzip2)
AS_IF([test "${OCAML_OS_TYPE}" = "Win32"],[
AC_MSG_CHECKING([for a workable solution for ln -s])
......@@ -230,8 +232,10 @@ if test x"$FETCH" = x"curl" ; then
elif test x"$FETCH" = x"wget" ; then
AC_SUBST(fetch, "wget $wget_certificate_check -O \$(2) \$(1)")
elif test x"${enable_checks}" != x"no" ; then
if ! ${MAKE:-make} -q -C src_ext has-archives 2>/dev/null ; then
AC_MSG_ERROR([You must have either curl or wget installed.])
fi
fi
AS_IF([test "x${with_private_runtime}" != "xno"],[
AS_IF([test ${WIN32} -eq 1 -a "x${CCOMP_TYPE}" = "xcc"],[
......@@ -277,7 +281,7 @@ AC_CHECK_OCAML_PKG([mccs])
AC_CHECK_OCAML_PKG([cppo])
AS_IF([test "x${with_mccs}" = "xno" && test "x$OCAML_PKG_mccs" != "xno"],
[AC_MSG_ERROR([Option --without-mccs is not supported. You need to uninstall the 'mccs' package])])
[AC_MSG_ERROR([Option --without-mccs is not available without uninstalling the 'mccs' package])])
dnl -- that's what we would like to do, but no way to disable mccs in jbuilder
dnl -- if it's installed, at the moment
......@@ -286,6 +290,23 @@ dnl AC_CHECK_OCAML_PKG([mccs]),
dnl [echo "checking for OCaml findlib package mccs... disabled"
dnl AC_SUBST(OCAML_PKG_mccs,"no")])
AS_IF([test "x$MCCS_ENABLED" = "xtrue"],[
AS_IF([test "x${CCOMP_TYPE}" != "xmsvc"],[
AC_PROG_CXX
# Curiously, CXX=g++ && GXX= seems to be how autoconf "signals" that no C++
# compiler was found.
AS_IF([test "x$CXX" = "xg++" -a "x$GXX" != "xyes"],[
AS_IF([test "x$MCCS_DEFAULT" = "xyes"],[
AC_SUBST(MCCS_ENABLED,false)
],[
AS_IF([test "x${enable_checks}" != "xno"],[
AC_MSG_ERROR([A C++ compiler is required to build mccs])
])
])
])
])
])
dnl echo
dnl echo "extlib........................ ${OCAML_PKG_extlib}"
......@@ -306,20 +327,7 @@ AS_IF([test "x${enable_checks}" != "xno" && {
test "x$OCAML_PKG_dose3_common" = "xno" ||
test "x$OCAML_PKG_opam_file_format" = "xno" ||
test "x$OCAML_PKG_cppo" = "xno" ||
test "x$OCAML_PKG_mccs$MCCS_ENABLED$MCCS_DEFAULT" = "xnotrue"; }],[
AS_IF([test "x$MCCS_ENABLED" = "xtrue" -a "x${CCOMP_TYPE}" != "xmsvc"],[
AC_PROG_CXX
# Curiously, CXX=g++ && GXX= seems to be how autoconf "signals" that no C++
# compiler was found.
AS_IF([test "x$CXX" = "xg++" -a "x$GXX" != "xyes"],[
AS_IF([test "x$MCCS_DEFAULT" = "xyes"],[
AC_SUBST(MCCS_ENABLED,false)
],[
AC_MSG_ERROR([A C++ compiler is required to build mccs])
])
])
])
test "x$OCAML_PKG_mccs$MCCS_ENABLED" = "xnotrue";}],[
echo "============================================================================"
echo "Some dependencies are missing. If you are just interested in the stand-alone"
echo "'opam' binary, run 'make lib-ext' to download and include them."
......@@ -365,10 +373,11 @@ bindir="`eval echo ${bindir}`"
mandir="`eval echo ${mandir}`"
mandir="`eval echo ${mandir}`"
AS_IF([{ test "x$MCCS_ENABLED" = "xfalse" && test "x${hasalldeps}" = "x"; } ||
{ test "x$OCAML_PKG_mccs" = "xno" && test "x${hasalldeps}" = "xtrue"; }],
[echo "Opam will be built WITHOUT a built-in solver"],
[echo "Opam will be built WITH a built-in solver"])
AS_IF([test "x$MCCS_ENABLED" = "xfalse"],[
echo "Opam will be built WITHOUT a built-in solver"
],[
echo "Opam will be built WITH a built-in solver"
])
echo
echo Executables will be installed in ${bindir}
echo Manual pages will be installed in ${mandir}
debian/changelog
View file @ 2d9cccf8
opam (2.0.1-1) unstable; urgency=medium
* New upstream release
* Remove patch integrated by upstream:
- 0001-Configure-user-identity-in-the-test-Git-repository.patch
* Do not try to build (and ship) dev-manual.pdf as it is not
provided in upstream's tarball anymore
* Add patch to fix spelling errors in manpages and binaries
- 0002-Fix-spelling-error-in-manpage.patch
* Update copyright file
* Rename opam-docs package into opam-doc
* Ship README.md and CHANGES files in opam-installer
-- Mehdi Dogguy <mehdi@debian.org> Sun, 02 Dec 2018 14:37:00 +0100
opam (2.0.0-5) unstable; urgency=medium
* Team upload.
......
debian/clean
View file @ 2d9cccf8
doc/dev-manual/dev-manual.pdf
META
Makefile.config
config.log
......
debian/control
View file @ 2d9cccf8
......@@ -48,7 +48,7 @@ Depends:
${ocaml:Depends},
${shlibs:Depends},
${misc:Depends},
opam-docs (= ${source:Version}),
opam-doc (= ${source:Version}),
build-essential,
aspcud | mccs | packup,
opam-installer,
......@@ -83,13 +83,15 @@ Description: package manager for OCaml
* You want to create your own packages yourself, put them on your own
repository, with minimal effort.
Package: opam-docs
Package: opam-doc
Architecture: all
Section: doc
Depends:
${ocaml:Depends},
${shlibs:Depends},
${misc:Depends}
Breaks: opam-docs
Replaces: opam-docs
Description: package manager for OCaml (documentation)
OPAM stands for OCaml PAckage Manager. It aims to suit to a vast number
of users and use cases, and has unique features:
......
debian/copyright
View file @ 2d9cccf8
......@@ -2,7 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: https://opam.ocaml.org/
Files: *
Copyright: © 2012-2014 OcamlPro
Copyright: © 2012-2018 OcamlPro
© 2012 INRIA
License: LGPL-3 with linking exception
......@@ -36,14 +36,9 @@ License: FSFUL
gives unlimited permission to copy, distribute and modify it.
Files: tests/* doc/*
Copyright: © 2011-2012 OcamlPro
Copyright: © 2011-2018 OcamlPro
License: LGPL-3 with linking exception
Files: src/core/opamJson.ml
Copyright: © 2012 Daniel C. Bünzli
License: BSD-3
License: LGPL-3 with linking exception
As a special exception to the GNU Lesser General Public License, you
may link, statically or dynamically, a "work that uses the Library"
......
debian/opam-docs.doc-base deleted 100644 → 0
View file @ 71eb5609
Document: opam-dev-man
Title: OPAM, developer manual
Author: Thomas Gazanaire
Abstract: Developer Manual of OPAM
Section: Programming/OCaml
Format: PDF
Files: /usr/share/doc/opam-docs/dev-manual.pdf
debian/opam-docs.docs deleted 100644 → 0
View file @ 71eb5609
usr/doc/opam-installer/README.md
usr/doc/opam-installer/CHANGES
doc/dev-manual/dev-manual.pdf
debian/opam-installer.install
View file @ 2d9cccf8
usr/bin/opam-installer
usr/lib/opam-installer
usr/share/man/man1/opam-installer.1
usr/doc/opam-installer/README.md usr/share/doc/opam-installer
usr/doc/opam-installer/CHANGES usr/share/doc/opam-installer
debian/patches/0001-Configure-user-identity-in-the-test-Git-repository.patch deleted 100644 → 0
View file @ 71eb5609
From: Nicolas Braud-Santoni <nicolas@braud-santoni.eu>
Date: Fri, 3 Aug 2018 18:20:49 +0800
Subject: Configure user identity in the test Git repository
Fixes OPAM issue #3494:
https://github.com/ocaml/opam/issues/3494
Origin: vendor
Forwarded: https://github.com/ocaml/opam/pull/3495
Reviewed-by: Raja Boujbel <raja.boujbel@ocamlpro.com>
Last-Update: 2018-08-03
Applied-Upstream: 885480dafb4272e7fe1d221b358496b44fa1c79b
---
tests/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile b/tests/Makefile
index 873f51f..f17da71 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -94,7 +94,8 @@ git:
define GIT_INIT
git init && echo '*.sh text eol=lf'> .gitattributes && $(if $1,touch $1 && )\
- git add -A && git commit -m "Initial commit"
+ git add -A && git config --local user.name 'OPAM test environment' &&\
+ git config --local user.email noreply@ocaml.com && git commit -m "Initial commit"
endef
init:
debian/patches/0002-Fix-spelling-error-in-manpage.patch 0 → 100644
View file @ 2d9cccf8
From: Mehdi Dogguy <mehdi@debian.org>
Date: Sun, 2 Dec 2018 13:56:15 +0100
Subject: Fix spelling-error-in-manpage
---
CHANGES | 2 +-
doc/pages/External_solvers.md | 2 +-
doc/pages/FAQ.md | 2 +-
doc/pages/Manual.md | 12 ++++++------
doc/pages/Specifying_Solver_Preferences.md | 2 +-
doc/pages/Usage.md | 2 +-
src/client/opamAdminCommand.ml | 2 +-
src/client/opamCommands.ml | 12 ++++++------
src/client/opamConfigCommand.mli | 2 +-
src/client/opamInitDefaults.mli | 2 +-
src/core/opamProcess.ml | 2 +-
src/format/opamFile.ml | 2 +-
src/format/opamVariable.ml | 2 +-
src/state/opamGlobalState.mli | 2 +-
src/state/opamStateConfig.mli | 2 +-
src/state/opamStateTypes.mli | 2 +-
src/state/shellscripts/bwrap.sh | 2 +-
17 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/CHANGES b/CHANGES
index 88e2b6e..ed62783 100644
--- a/CHANGES
+++ b/CHANGES
@@ -287,7 +287,7 @@ are not marked).
1.2.1
* Non-system compiler definitions without source are now allowed
-* Better handling of compiler "base" packages allows to move build instructions
+* Better handling of compiler "base" packages allows one to move build instructions
from compiler definitions to packages
* Rewritten action resolution mechanism to be based on atomic actions.
Actions are not aborted anymore on first failure when there is no
diff --git a/doc/pages/External_solvers.md b/doc/pages/External_solvers.md
index 63ce79b..6aa071a 100644
--- a/doc/pages/External_solvers.md
+++ b/doc/pages/External_solvers.md
@@ -70,7 +70,7 @@ When you request to install a (set of) package(s), in general you do not expect
### Specifying preferences for opam
-`opam` allows to specify your criteria on the command line, using the `--criteria` option, that will apply only to the current command.
+`opam` allows one to specify your criteria on the command line, using the `--criteria` option, that will apply only to the current command.
For example if you are a very conservative user, you might try issueing the following command:
```
opam install --criteria="-removed,-changed" ...
diff --git a/doc/pages/FAQ.md b/doc/pages/FAQ.md
index 4414767..597ac4b 100644
--- a/doc/pages/FAQ.md
+++ b/doc/pages/FAQ.md
@@ -100,7 +100,7 @@ enabled. Note, however, that:
#### 🐫 Why does ``opam init`` need to add stuff to my init scripts / why is ``eval $(opam env)`` needed?
This is not strictly needed, but by updating your `PATH` and a few specific
-environment variables, allows to:
+environment variables, allows one to:
1. Automatically find executables installed in opam (current switch)
2. Ensure the OCaml tools are going to look at the right places for installed
diff --git a/doc/pages/Manual.md b/doc/pages/Manual.md
index 79c7965..dd70ef8 100644
--- a/doc/pages/Manual.md
+++ b/doc/pages/Manual.md
@@ -92,7 +92,7 @@ selected.
The current switch can be selected in the following ways:
- globally, using `opam switch <switch>`. <span class="opam">opam</span> will use that switch for all
- further commands, except when overriden in one of the following ways.
+ further commands, except when overridden in one of the following ways.
- for local switches, which are external to the opam root, when in the directory
where the switch resides or a descendant.
- by setting the `OPAMSWITCH=<switch>` environment variable, to set it within a
@@ -410,7 +410,7 @@ three scopes:
#### Pre-defined variables
The following variables are dynamically defined by opam, but can still be
-overriden from configuration. You can get the list of currently defined
+overridden from configuration. You can get the list of currently defined
variables by running:
```
@@ -679,7 +679,7 @@ repositories or initial distributions or packages.
#### repo
<a id="Repospecification"></a>
-The `repo` file is placed at the root of a repository, and allows to specify
+The `repo` file is placed at the root of a repository, and allows one to specify
some specifics of the repository. It has the following optional fields:
* <a id="repofield-opam-version">`opam-version: <string>`</a>:
@@ -730,7 +730,7 @@ The default, built-in initial config of <span class="opam">opam</span> can be se
- <a id="opamrcfield-init-scripts">`init-scripts: [ [ <string> <string> ] { <filter> } ... ]`</a>:
These scripts will be written verbatim into the hook directory
(`~/.opam/opam-init/hooks`) upon initialisation. The first string is the file
- name of the script, the second its raw contents, and the filter allows to
+ name of the script, the second its raw contents, and the filter allows one to
limit the creation of the script to specific configurations.
- [`jobs:`](#configfield-jobs),
[`download-command:`](#configfield-download-command),
@@ -963,7 +963,7 @@ files.
class="opam">opam</span> ecosystem, for various systems. Each
`[ <string> ... ] { <filter> }` element declares the strings to the left as
identifiers to required system-managed packages, while the filter to the right
- allows to select the systems they will be active on.
+ allows one to select the systems they will be active on.
The filters typically use variables [`arch`](#opamvar-arch),
[`os`](#opamvar-os), [`os-distribution`](#opamvar-os-distribution),
@@ -986,7 +986,7 @@ files.
- <a id="opamfield-post-messages">
`post-messages: [ <string> { <filter> } ... ]`</a>:
- allows to print specific messages to the user after the end of installation.
+ allows one to print specific messages to the user after the end of installation.
The special boolean variable `failure` is defined in the scope of the filter,
and can be used to print messages in case there was an error (typically, a
hint on how it can be resolved, or a link to an open issue). `success` is also
diff --git a/doc/pages/Specifying_Solver_Preferences.md b/doc/pages/Specifying_Solver_Preferences.md
index 45f54b1..24b4547 100644
--- a/doc/pages/Specifying_Solver_Preferences.md
+++ b/doc/pages/Specifying_Solver_Preferences.md
@@ -34,7 +34,7 @@ When you request to install a (set of) package(s), in general you do not expect
### Specifying preferences for opam
-Recent versions of `opam` allow to specify your criteria on the command line, using the `--criteria` option, that will apply only to the current command.
+Recent versions of `opam` allow one to specify your criteria on the command line, using the `--criteria` option, that will apply only to the current command.
For example if you are a very conservative user, you might try issueing the following command:
```
opam install --criteria="-removed,-changed" ...
diff --git a/doc/pages/Usage.md b/doc/pages/Usage.md
index 1bd0686..e7bbf5d 100644
--- a/doc/pages/Usage.md
+++ b/doc/pages/Usage.md
@@ -111,7 +111,7 @@ Creating a new switch requires re-compiling OCaml, unless you use the
### opam pin
-This command allows to pin a package to a specific version, but has been
+This command allows one to pin a package to a specific version, but has been
extended to allow much more than that.
The syntax is
diff --git a/src/client/opamAdminCommand.ml b/src/client/opamAdminCommand.ml
index db100ac..65c8fd4 100644
--- a/src/client/opamAdminCommand.ml
+++ b/src/client/opamAdminCommand.ml
@@ -685,7 +685,7 @@ let env_arg =
comma-separated 'var=value' bindings, when resolving variables. \
This is used e.g. when computing available packages: if undefined, \
availability of packages is not taken into account. Note that, \
- unless overriden, variables like 'root' or 'opam-version' may be \
+ unless overridden, variables like 'root' or 'opam-version' may be \
taken from the current opam installation. What is defined in \
$(i,~/.opam/config) is always ignored.")
diff --git a/src/client/opamCommands.ml b/src/client/opamCommands.ml
index a7c7aab..bef842d 100644
--- a/src/client/opamCommands.ml
+++ b/src/client/opamCommands.ml
@@ -175,13 +175,13 @@ let init =
repository).";
`P "The initial repository and defaults can be set through a \
configuration file found at $(i,~/.opamrc) or $(i,/etc/opamrc).";
- `P "Additionally, this command allows to customise some aspects of opam's \
+ `P "Additionally, this command allows one to customise some aspects of opam's \
shell integration, when run initially (avoiding the interactive \
dialog), but also at any later time.";
`S "ARGUMENTS";
`S "OPTIONS";
`S "CONFIGURATION FILE";
- `P "Any field from the built-in initial configuration can be overriden \
+ `P "Any field from the built-in initial configuration can be overridden \
through $(i,~/.opamrc), $(i,/etc/opamrc), or a file supplied with \
$(i,--config). The default configuration for this version of opam \
can be obtained using $(b,--show-default-opamrc).";
@@ -282,7 +282,7 @@ let init =
let no_sandboxing =
mk_flag ["disable-sandboxing"]
"Use a default configuration with sandboxing disabled (note that this \
- may be overriden by `opamrc' if $(b,--no-opamrc) is not specified or \
+ may be overridden by `opamrc' if $(b,--no-opamrc) is not specified or \
$(b,--config) is used). Use this at your own risk, without sandboxing \
it is possible for a broken package script to delete all your files."
in
@@ -1558,7 +1558,7 @@ let repository =
package definitions anymore. With $(b,--all), makes opam forget about \
these repositories completely.";
"set-repos", `set_repos, ["NAME..."],
- "Explicitely selects the list of repositories to look up package \
+ "Explicitly selects the list of repositories to look up package \
definitions from, in the specified priority order (overriding previous \
selection and ranks), according to the specified scope.";
"set-url", `set_url, ["NAME"; "ADDRESS"; "[QUORUM]"; "[FINGERPRINTS]"],
@@ -1586,7 +1586,7 @@ let repository =
repositories, or all configured repositories with $(b,--all).";
] @ mk_subdoc ~defaults:["","list"] commands @ [
`S scope_section;
- `P "These flags allow to choose what selections are changed by $(b,add), \
+ `P "These flags allow one to choose what selections are changed by $(b,add), \
$(b,remove), $(b,set-repos). If no flag in this section is specified \
the updated selections default to the current switch. Multiple scopes \
can be selected, e.g. $(b,--this-switch --set-default).";
@@ -2306,7 +2306,7 @@ let pin ?(unpin_only=false) () =
used locally.";
`P "If (or $(i,-)) is specified, the package is pinned without a source \
archive. The package name can be omitted if the target is a directory \
- containing one or more valid package definitions (this allows to do \
+ containing one or more valid package definitions (this allows one to do \
e.g. $(i,opam pin add .) from a source directory.";
`P "If $(i,PACKAGE) has the form $(i,name.version), the pinned package \
will be considered as version $(i,version) by opam. Beware that this \
diff --git a/src/client/opamConfigCommand.mli b/src/client/opamConfigCommand.mli
index c77fc00..299949c 100644
--- a/src/client/opamConfigCommand.mli
+++ b/src/client/opamConfigCommand.mli
@@ -24,7 +24,7 @@ val env:
csh:bool -> sexp:bool -> fish:bool -> inplace_path:bool ->
unit
-(** Like [env] but allows to specify the precise env to print rather than
+(** Like [env] but allows one to specify the precise env to print rather than
compute it from a switch state *)
val print_eval_env: csh:bool -> sexp:bool -> fish:bool -> env -> unit
diff --git a/src/client/opamInitDefaults.mli b/src/client/opamInitDefaults.mli
index 06419db..36843f4 100644
--- a/src/client/opamInitDefaults.mli
+++ b/src/client/opamInitDefaults.mli
@@ -9,7 +9,7 @@
(**************************************************************************)
(** This module defines a few defaults, used at 'opam init', that bind opam to
- its default OCaml repository at https://opam.ocaml.org. All can be overriden
+ its default OCaml repository at https://opam.ocaml.org. All can be overridden
through the init command flags or an init config file. *)
open OpamTypes
diff --git a/src/core/opamProcess.ml b/src/core/opamProcess.ml
index 42ff6ad..9475bfd 100644
--- a/src/core/opamProcess.ml
+++ b/src/core/opamProcess.ml
@@ -131,7 +131,7 @@ let string_of_info ?(color=`yellow) info =
[cmd] with arguments [args]. If [stdout_file] or [stderr_file] are
set, the channels are redirected to the corresponding files. The
outputs are discarded is [verbose] is set to false. The current
- environment can also be overriden if [env] is set. The environment
+ environment can also be overridden if [env] is set. The environment
which is used to run the process is recorded into [env_file] (if
set). *)
let create ?info_file ?env_file ?(allow_stdin=true) ?stdout_file ?stderr_file ?env ?(metadata=[]) ?dir
diff --git a/src/format/opamFile.ml b/src/format/opamFile.ml
index 4743c3e..9ca4c34 100644
--- a/src/format/opamFile.ml
+++ b/src/format/opamFile.ml
@@ -2257,7 +2257,7 @@ module OPAMSyntax = struct
(* Post-processing functions used for some fields (optional, because we
don't want them when linting). It's better to do them in the same pass
- as parsing, because it allows to get file positions, which we lose
+ as parsing, because it allows one to get file positions, which we lose
afterwards *)
(* Allow 'flag:xxx' tags as flags, for compat *)
diff --git a/src/format/opamVariable.ml b/src/format/opamVariable.ml
index 832ad00..9cc2fcd 100644
--- a/src/format/opamVariable.ml
+++ b/src/format/opamVariable.ml
@@ -57,7 +57,7 @@ module Full = struct
in
{ scope; variable }
- (* Read the variables overriden through the environment *)
+ (* Read the variables overridden through the environment *)
let read_from_env v =
let var_str = to_string (variable v) in
let undash = OpamStd.String.map (function '-' -> '_' | c -> c) in
diff --git a/src/state/opamGlobalState.mli b/src/state/opamGlobalState.mli
index 4a298d8..3b879e1 100644
--- a/src/state/opamGlobalState.mli
+++ b/src/state/opamGlobalState.mli
@@ -39,7 +39,7 @@ val switch_exists: 'a global_state -> switch -> bool
val installed_versions: 'a global_state -> name -> switch list package_map
(** Default list of repositories to get packages from, ordered by decreasing
- priority. This can be overriden by switch-specific selections, and does not
+ priority. This can be overridden by switch-specific selections, and does not
have to include all configured repositories. *)
val repos_list: 'a global_state -> repository_name list
diff --git a/src/state/opamStateConfig.mli b/src/state/opamStateConfig.mli
index c8d3e98..e6995ad 100644
--- a/src/state/opamStateConfig.mli
+++ b/src/state/opamStateConfig.mli
@@ -50,7 +50,7 @@ include OpamStd.Config.Sig
and type 'a options_fun := 'a options_fun
(** Get the initial opam root value (from default, env or optional argument).
- This allows to get it before doing the init, which is useful to get the
+ This allows one to get it before doing the init, which is useful to get the
configuration file used to fill some options to init() *)
val opamroot: ?root_dir:dirname -> unit -> dirname
diff --git a/src/state/opamStateTypes.mli b/src/state/opamStateTypes.mli
index c00cebc..0e64378 100644
--- a/src/state/opamStateTypes.mli
+++ b/src/state/opamStateTypes.mli
@@ -54,7 +54,7 @@ type +'lock global_state = {
config: OpamFile.Config.t;
(** The main configuration file. A note of caution: this corresponds to the
configuration as loaded from the file: to get the current options, which
- may be overriden through the command-line or environment, see
+ may be overridden through the command-line or environment, see
OpamStateConfig *)
global_variables:
diff --git a/src/state/shellscripts/bwrap.sh b/src/state/shellscripts/bwrap.sh
index 3d29e3e..dae7898 100755
--- a/src/state/shellscripts/bwrap.sh
+++ b/src/state/shellscripts/bwrap.sh
@@ -27,7 +27,7 @@ add_mounts() {
done
}
-# remove some unusual pathes (/nix/stored and /rw/usrlocal )
+# remove some unusual paths (/nix/stored and /rw/usrlocal )
# use OPAM_USER_PATH_RO variable to add them
# the OPAM_USER_PATH_RO format is the same as PATH
# ie: export OPAM_USER_PATH_RO=/nix/store:/rw/usrlocal
debian/patches/series
View file @ 2d9cccf8
0001-Configure-user-identity-in-the-test-Git-repository.patch
0002-Add-a-test-target.patch
0002-Fix-spelling-error-in-manpage.patch
debian/rules
View file @ 2d9cccf8
......@@ -29,8 +29,6 @@ build-arch: .configure_stamp
build-indep: .configure_stamp
$(MAKE) man
$(RM) -f doc/dev-manual/dev-manual.pdf
$(MAKE) -C doc/dev-manual
.PHONY: override_dh_auto_test
override_dh_auto_test:
......@@ -47,10 +45,6 @@ override_dh_installdocs:
dh_installdocs -p opam --link-doc=opam-installer
dh_installdocs --remaining-packages
.PHONY: override_dh_compress
override_dh_compress:
dh_compress -X.pdf
.PHONY: override_dh_missing
override_dh_missing:
dh_missing --fail-missing
doc/Makefile
View file @ 2d9cccf8
......@@ -24,8 +24,8 @@ ifndef OPAM_INSTALLER
OPAM_INSTALLER = $(JBUILDER) exec -- opam-installer
endif
.PHONY: man html dev-manual pages
all: man dev html pages
.PHONY: man html pages
all: man html pages
man:
rm -rf man
......@@ -56,9 +56,6 @@ man-html: man
echo '</ul>' >>$@/index.html
echo '</body></html>' >>$@/index.html
dev:
$(MAKE) -C dev-manual
html:
rm -rf html
cd .. && $(JBUILDER) build @doc
......@@ -79,4 +76,3 @@ pages: $(PAGES:.md=.html)
clean:
rm -rf dependencies.dot man html/ocamldoc man-html pages/*.html html/index.html
$(MAKE) -C dev-manual clean