Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: OCamlPro/opam
base: 377425a98d
...
head fork: OCamlPro/opam
compare: 0.8.2
Commits on Oct 16, 2012
@samoht samoht Revert "Bump trunk version to 0.8.0"
This reverts commit 8a688ab.
576e19e
@samoht samoht Fix installation of OPAM when installing from opam c6e5948
@samoht samoht Remove autogenerated file a67b041
@samoht samoht Bump trunk version to 0.8.0 cd00969
@samoht samoht Revert "Bump trunk version to 0.8.0"
This reverts commit 8a688ab.
2c9f442
@samoht samoht Fix META file dbb5887
@samoht samoht Bump trunk version to 0.8.0 0fcda0d
@samoht samoht Update to dose 3.1.2 5356f04
@samoht samoht Apply the patches before substituting files 9ac285a
Commits on Oct 17, 2012
@samoht samoht Upgrade opam to dose 3.1.2 4cf7dd6
@samoht samoht First, substitute patches, then apply patches, then substitute files 4f6439b
@samoht samoht Merge branch 'master' of github.com:OCamlPro/opam
Conflicts:
	src/opamClient.ml
1b0ad74
@venator venator [fix] Adding the OpamRepositoryName module to installed libs ee4b38f
@samoht samoht Merge pull request #251 from venator/master
Installing the OpamRepositoryName lib
3083178
Commits on Oct 18, 2012
@avsm avsm the Jenkins scripts weren't initialising ocaml4 PATH early enough, so…
… the OPAM/config system-ocaml-version was incorrect. The PATH was set to ocaml4 only after the init before.

For some reason, the detections of 'incorrect system ocaml version' was not output here. Is this because of the `--yes` flag?
0375d31
@samoht samoht Merge pull request #252 from avsm/master
the Jenkins scripts weren't initialising ocaml4 PATH early enough
cdc6dec
@samoht samoht Big spring clean-up in the solver API. Now, all the cudf/debian thing…
…s only appear here, everywhere else we only use opam packages.
d5c5ad6
@samoht samoht Spring clean-up in the client API.
TODO:
* add back reinstall code
* do something about the heuristics
0abf22b
Commits on Oct 19, 2012
@samoht samoht Various fixes following the API change in the solver.
Install heuristic and hanlde of reinstall are still missing
74e5523
@samoht samoht More simplifications. We always give raw package names to the solver,…
… unless a version constraint is explicitely stated by the user.
6a66ed4
@samoht samoht Add back an install heuristic to always try to install the latest ver…
…sions of the packages
c079097
@samoht samoht Add back package minimization on installation. 741c029
@samoht samoht Add back the reinstall mechanism 9a0f723
@samoht samoht Install seems to work on real example (ie. on core).
As the state space grew quite large very easily, do not try to explore it completely if there are too many possibilites.

Upgrade seems to 'almost work'.

The reinstall thing is not yet completly implemented (need to effectively recompile the package when we build actions from universe diff).
7c62a16
Commits on Oct 28, 2012
@samoht samoht Fix libinstall target 1fb2cf9
Commits on Oct 30, 2012
@avsm avsm sync jenkins 5a75b7a
@chambart chambart Use server provided name when downloading files
It allows to detect the kind of file using the extension when the url is redirected ( like tarballs of tags on github )
641c07f
Pietro Abate Add python-based unit tests 742e2d6
Commits on Nov 03, 2012
@samoht samoht Merge pull request #271 from chambart/master
Allow to use github tag tarballs as compiler sources
8fc016f
Commits on Nov 05, 2012
@samoht samoht Merge pull request #273 from abate/unittest
Add python-based unit tests
c8f190e
Commits on Nov 06, 2012
@samoht samoht Fix reinstall 294c368
@samoht samoht More clever handling of optional dependencies.
Now the optional dependencies are automatically added to the depends field when it is installed. This ensure that the solver checks that the right package versions are installed, and also it should solve the case where we have an optional conjunction.

For instance:
depopts: [ "async" ("lwt" & "ssh") ]

is translated to:
depends += [ "lwt" & "ssh" ]

if either any version of lwt or ssh is installed.
75b997a
@samoht samoht Simplify the code for reinstall
Now reinstalling a package just means recompiling the packages dependings on the packages we want to reinstall, without trying to upgrade these packages at all.
caabd09
@samoht samoht Improve the heuristic to select a shorter range of versions to try.
For each package, we now try all the versions from min(currenlty-installed, installed-in-the-first-approximation) and max-version.
abdb5b7
@samoht samoht Enumerate the solution in the right order, so now we can always explo…
…re the first 10_000 states, even if the state space is bigger.
67a076c
@samoht samoht Update CHANGES e1e214a
@samoht samoht Merge branch 'master' of github.com:OCamlPro/opam 2368c70
@samoht samoht Cosmetic changes. Add some comments to explain the order in which we …
…explore the state space.
923a4ab
@samoht samoht [solver] explore the state space for at most 5 seconds ca54cb7
Commits on Nov 07, 2012
@samoht samoht [solver] fix the versions for packages which have nothing to do with …
…what we are upgrading
c84f44c
@samoht samoht [solver] More API clean-ups
split opamSolver into 3 files:
* opamCudf.ml contains the interaction with CUDF engine
* opamHeuristic.ml contains the heuristics implemented in OPAM (and which can be reuse for any CUDF-based system)
* opamSolver.ml contains the OPAM-specific interfaces with the solver
2e65e11
@samoht samoht [solver] use external solver if available
Original patch from @rdicosmo

So now, if opam detects 'aspcud' in the path (apt-get install aspcud) it tries to use it instead of the custom-made heuristics.
e709cd2
@samoht samoht Update CHANGES 5c5924c
@samoht samoht Rename OpamAlias -> OpamSwitch f926210
@samoht samoht Remove system-ocaml-version from ~/.opam/config as now this informati…
…on is stored into ~/.opam/compilers/system.comp:version
410bd35
@samoht samoht [client] Start splitting opamClient.ml into pieces.
opamClient.ml was 3k line-long, it was becoming difficult to maintain it properly.
da646bd
@samoht samoht Continue to split OpamClient.ml into pieces.
Now we have opamConfig.ml to handle configuration requests
b8fa1a1
@samoht samoht Re-organize the source files in a more consistent way. 32282c8
@samoht samoht Update META and opam.install.
Ideally these should be generated by ocp-build ...
e043a91
@samoht samoht Fix distclean rule now opamVersion.ml.in has changed location 237bc5c
@samoht samoht Continue to split opamClient.ml into pieces.
Now there is opamSolution.ml which deals with interfacing with asking the solver and applying the results.
e4fb4d0
@samoht samoht Update API doc a41c6cc
@samoht samoht Upgrade ~/.opam/config each time we upgrade opam to help preserving b…
…ackward-compatibility
de5e87a
@samoht samoht Update prerequesites
curl -J only works with curl >= 7.20.0, which is not available under leopard (but a newest version is in homebrew)
07bf28d
@samoht samoht [solver] Packages should appear either in wish_update or in wish_inst…
…all, not in both, otherwise the solver is confused.
50efa0d
@samoht samoht Sorting is not necessary 38d2f72
@samoht samoht Fix #270
Catch the exception if $HOME is not defined.
8eba6ab
@samoht samoht Fix #275
Don't really what happened there, but do not let the user in a inconstent state: in case of error, just roll-back to the current compiler switch.
59375dc
@samoht samoht Fix #277
Do not display scary messages on stdout when running 'patch --dryrun' (when guessing the -pX argument)
48936e4
@samoht samoht Fix #266
Build directories are now removed when builds are successful.
37c8570
@samoht samoht Fix #262
OpamParallel now writes errors of its child nodes in ~/.opam/opam.pid/$PID
cdf99ab
Commits on Nov 08, 2012
@samoht samoht Fix #264
This bring a more consistent semantics to install/reinstall.

So now you can install foo.bar even if foo is already installed (ie = explicit downgrade or upgrade)
And you can't reinstall foo.bar if foo is installed with version gna.
b5de575
@samoht samoht Prepare 0.8.0 release b3a3b92
@samoht samoht Fix 'opam update' for curl backends ... 2b6ea79
Commits on Nov 09, 2012
@samoht samoht Fix typo, thx to @pygatea c9823d6
@samoht samoht Small improvment in the brute-force state explorer. 77501f6
@samoht samoht Fix downloading of archive for rsync repositories. Regression introdu…
…ced by 641c07f
a077ed7
@samoht samoht Fix #285
Do not get stuck in a broken state: we always try to fix the lock errors, it's better to be a bit unsafe but not stuck.
6e86353
Commits on Nov 10, 2012
@rdicosmo rdicosmo Use current upstream source for cudf 251a223
Commits on Nov 12, 2012
@samoht samoht Merge pull request #290 from rdicosmo/hotfix
Use current upstream source for cudf
62936ee
@samoht samoht Fix library installation. 0ffbaba
@samoht samoht Fix update of git/rsync repositories.
This should fix #286
b5144f2
@samoht samoht Merge branch 'master' of github.com:OCamlPro/opam ddb70fc
@samoht samoht Better error message when ~/.opam/config is not found
This should fix #291
612ff5d
@samoht samoht Fix typo thx to @avsm 82c91a2
@samoht samoht `opam config -env -c` to output shell fragrments in a csh-compatible …
…way.

This should fix #287
2097911
@avsm avsm Merge branch 'master' of git://github.com/OCamlPro/opam 82b5447
@avsm avsm add source install for nlopt 0bd665b
@samoht samoht Merge pull request #292 from avsm/master
Sync jenkins scripts
6e77d8d
@samoht samoht Fix install of pinned packages
This commit fixes a regression introduced by e4fb4d0
f91f340
@samoht samoht Merge branch 'master' of github.com:OCamlPro/opam c56a3a2
@samoht samoht 'opam info *core*' works
This should fix #283
0754594
@samoht samoht Display a more understable error message in case the command to execu…
…te by OPAM is not found in the path.

This should help debugging confusing errors such as #293.
fa230f6
Commits on Nov 13, 2012
@samoht samoht When an installed package is not available anymore, try to keep it wh…
…en possible.
ad14ab8
@samoht samoht Fix documentation 60fa587
@samoht samoht Fix update of rsync repositories 9a39cd1
@samoht samoht More debugging 4645fc7
@samoht samoht Use 'which' instead of 'command -v'.
This should solve #294
bf52885
@samoht samoht When the system compiler is upgraded, reinstall the system switches.
This should fix #282
e9d3807
@samoht samoht Bump version number in trunk (0.8.1) 8a1b2c9
@samoht samoht Update CHANGES 801e94c
Commits on Nov 14, 2012
@samoht samoht Simplify substitution strings in OPAM files.
So now, we can write [ make "all" ] instead of [ "%{make}%" "all" ] (the latest notation is still available, so"--%{foo:enable}%-foo" continues to work).

This should fix #295
bc8d222
@samoht samoht Update CHANGES 05a66ab
@samoht samoht Bump trunk version to 0.8.2 480a51b
@samoht samoht Fix install file 4242151
@samoht samoht Update generated ./configure e081462
@samoht samoht Update trunk version to 0.8.2 4764fdd
@samoht samoht Fix typo (thx to Stephane Grognet) 01c8473
@samoht samoht Update API docs 5cc5143
Commits on Nov 15, 2012
@samoht samoht Ask to upgrade OPAM when a new version is available only if OPAM is i…
…nstalled using OPAM itself.

This should fix #297
bde42d8
@samoht samoht Display a warning the compiler descriptions have a wrong 'name' field 3f96721
@samoht samoht Display some warning if the compiler description filenames are not in…
… sync with their 'name'/'version' field.
1ef4805
@samoht samoht Be more robust in case some rubish appear in ~/.opam/config:switch. I…
…f this contains an unknown switch (it should normally not happen ...) then switch back to an existing compiler switch.
33a5794
@samoht samoht Turn down some error messages to logging messages (as this was not re…
…lated to an error actually).
fc307c5
@samoht samoht Be more robust when a switch 's' does not appear in ~/.opam/aliases b…
…ut there is a ~/.opam/s directory. This is the sign that something bad happened while installed 's', so we ~/.opam/s to come back in a stable state.
720daaf
@samoht samoht Continue 720daaf 5f13c04
@samoht samoht Cosmetic changes a11188b
@samoht samoht Fix an issue with 'opam reinstall' where packages were recompiled in …
…the reverse order
99f1e2f
@samoht samoht Update CHANGES b83a005
Commits on Nov 19, 2012
@samoht samoht Add OPAMROOT environment variable.
This enables:
* 'opam --root $dir config -env' to output the right $OPAMROOT variable;
* which means subsequents calls to 'opam' will use the right root path.

This help installing opam on multi-user computers (where root is set to /usr/lib/opam for instance).

This should fix #302
c57e9b0
Commits on Nov 22, 2012
@samoht samoht Remove curl -J option as it is not available on old curl
Replace it with custom-made file detection (thx to @chambard).

This should fix #288
45651c3
@samoht samoht Close the input channel early 2651e76
Commits on Nov 23, 2012
@samoht samoht Test whether to use curl or wget for src_ext in ./configure 6264fc7
@samoht samoht Update generated configure script 90c2084
Commits on Nov 28, 2012
Francois Berenger added shell script to compile and install OPAM from sources 768146f
@samoht samoht Merge pull request #312 from HappyCrow/install_from_src_shell_script
added shell script to compile and install OPAM from sources
79c3c15
@samoht samoht Add quick install instruction 21ecb3d
@samoht samoht Merge branch 'master' of github.com:OCamlPro/opam b241f0d
Commits on Nov 29, 2012
@avsm avsm sync jenkins 9361039
@avsm avsm update README 6da9ba3
@samoht samoht Merge pull request #315 from avsm/master
typos in readme
9f7b13d
Commits on Dec 03, 2012
@samoht samoht Add a hook to not delete the build dir.
Either using the command line: --keep-build-dir
Or by setting an environment variable: OPAMKEEPBUILDDIR

This should fix #313
5a1e391
@samoht samoht Merge branch 'master' of github.com:OCamlPro/opam 55db825
@samoht samoht Add a %{share}% variable (corresponding to ~/.opam/$switch/share).
This should fix #298
24b7a23
Commits on Dec 04, 2012
@jonludlam jonludlam Make sure Makefile respects the DESTDIR parameter 7d1e6c1
@samoht samoht Merge pull request #318 from jonludlam/add_destdir
Make sure Makefile respects the DESTDIR parameter
7c35da5
Commits on Dec 10, 2012
@samoht samoht Display an error message when trying to pin a non-existing package
This should fix #320
63a1d4f