77af5b3a88
Add Usexp.Loc.in_file
...
Moved from Loc
2018-04-24 01:46:57 +07:00
03e439e449
Decouple sexp from Import
2018-04-24 00:17:58 +07:00
5147de3873
Decouple hint handling in sexp parser from Import
2018-04-24 00:17:19 +07:00
6dee7c9c39
Remove dependence on Improt in Path
2018-04-23 23:53:54 +07:00
980f5037cc
Move maybe_quoted to string module
2018-04-23 23:51:22 +07:00
9aa827ac35
Replace all code_errorf with code_error
2018-04-23 23:48:24 +07:00
59eda906b0
Convert locs to sexps
...
Done in a crappy way for now because the converters haven't yet made it to Usexp
2018-04-23 23:47:55 +07:00
24041593da
Move Code_error to Stdune.Exn
...
This exception is useful outside of jbuilder
2018-04-23 14:04:15 +07:00
98b2ea795c
Move String_map to stdune
2018-04-23 12:43:20 +07:00
530dbfeb81
Move String_set to stdune
2018-04-23 12:08:09 +07:00
13b770962d
Remove the ?extra_targets argument of Build.run
...
Instead, use Hidden_targets
2018-04-18 17:00:11 +01:00
bd7f793792
Add Arg_spec.Hidden_targets
...
Same as Hidden_deps: allows to declare targets than don't appear on
the command line.
2018-04-18 17:00:11 +01:00
3e1495e47e
Add entry module for configurator
...
Only expose the public api (v1) in it
2018-04-17 22:25:45 +07:00
1d33f81298
Extract #define's using @whitequark's hack
2018-04-17 22:25:45 +07:00
e0d7570752
Do not run compiled programs to extract #define's
...
Running a program to extract a #define value doesn't work in a cross compilation
environment. Nevertheless, we can extract #define constants by invoking the
preprocessor directly using the -E flag and doing some parsing to extract
values.
As a consequence, we now ignore the link_flags argument. As we're not going to
be linking any executables. We aren't removing the argument altogether since
it's technically a breaking change. The user will instead see a deprecation
warning when ~link_flags is provided.
2018-04-17 22:24:40 +07:00
5a89767184
Merge pull request #707 from Chris00/master
...
Add Configurator.V1.write_as_sexp
2018-04-17 22:20:55 +07:00
1dbf960d41
Skip alias modules in the map
2018-04-17 15:51:29 +01:00
ec9ff813ad
Fallback to implementation if there is no mli
2018-04-17 15:51:29 +01:00
40624e744b
Build transitive dependencies with ocamldep
...
This uses two different extensions:
- `.d` corresponds to the raw `ocamldep` output.
- `.all-deps` corresponds to this output, merged with the dependencies
of all the interfaces mentioned in the earlier.
This also means that `.all-deps` files will contain output from multiple
files.
2018-04-17 15:51:29 +01:00
7e1b521d7b
Add Configurator.V1.write_flags
...
See https://github.com/ocaml/dune/pull/696/files#r181721525
2018-04-17 16:07:38 +02:00
9414913286
Add test to make sure that ${null} isn't a target
2018-04-17 10:58:53 +07:00
69b76f0c8e
Add ?prelude argument when import constants
...
A user can now define their own macros to use with extracting compile time info
2018-04-17 00:26:23 +07:00
75bc824f97
Get rid of the -ocamlc arg altogether
2018-04-12 18:05:40 +07:00
86e4df847b
Warn the user when DUNE_CONFIGURATOR is overwritten with -ocamlc
2018-04-12 00:16:36 +07:00
22576fac7e
Fix compatibility for ocaml without Sys.getenv_opt
2018-04-11 22:37:25 +07:00
d65845abb8
Pass ocamlc explicitly to configurator using DUNE_CONFIGURATOR
2018-04-11 21:26:51 +07:00
a3a9a1c719
Move current configurator API to V1 module
2018-04-11 09:43:37 +07:00
bd52821556
Mark internal (unstable) libraries as such
...
Add an internal description in the synopsis and also a comment in the ocamldoc
2018-04-10 23:02:14 +07:00
e832b7230d
Add public_name's to all dune sub libraries
...
These will all live under the jbuilder package
2018-04-10 22:05:52 +07:00
0bbbf5320f
Merge pull request #686 from rgrinberg/remove-has-dot-merlin
...
Remove ~has_dot_merlin flag
2018-04-10 20:07:06 +07:00
62bbd5d30e
Merge pull request #671 from rgrinberg/pr/653
...
Cosmetic changes for default package entry point.
2018-04-10 20:04:28 +07:00
c5633c9c34
Fix indentation
2018-04-10 11:51:04 +07:00
9acf617563
Remove ~has_dot_merlin flag
...
it was introduced to avoid generaitng a needless .merlin file for utop levels.
But now that we have a better mechanism for that, it serves no purpose.
2018-04-10 02:01:33 +07:00
3c7672c696
Report the ppx runtime deps as external dependencies
2018-04-09 06:31:52 +08:00
22b024a977
More hacks for external-lib-deps
...
Fix #644
2018-04-09 06:31:52 +08:00
1215fe2f8a
Remove unused Lib.Compile.make
2018-04-09 06:31:52 +08:00
0104309f25
Use Arg_spec.Hidden_deps
2018-04-09 06:31:52 +08:00
85c8fff7f5
Add Arg_spec.Hidden_deps
2018-04-09 06:31:52 +08:00
606ad1b10f
Pass around library dependencies as static values
...
This way we know more of the compilation DAG statically. This helps
for parallelism as well as for `jbuilder external-lib-deps`
2018-04-09 06:31:52 +08:00
9e75552c6b
Add Cm_kind.Dict.make_all
2018-04-09 05:59:12 +08:00
9b1adee13c
Record library dependencies using Build.prefix_rules
2018-04-09 05:59:12 +08:00
950a37b1ad
Generate select rules explicitely in gen_rules
2018-04-09 05:59:12 +08:00
75269117cd
Use static requires in merlin
2018-04-09 05:59:12 +08:00
c0c69b44db
Update configurator to use Exn.raise_with_backtrace
2018-04-06 23:34:02 +08:00
52a3833e0e
Add Exn.raise_with_backtrace
2018-04-06 22:26:49 +08:00
10c5447608
Print backtrace in case of uncaught exception
...
Otherwise uncaught by configurator are hard to debug
2018-04-06 21:26:15 +08:00
6688144a74
Add Char module to stdune
2018-04-06 11:51:03 +08:00
41047e36d1
Merge pull request #677 from rgrinberg/4.02.3-configurator-fixes
...
4.02.3 configurator fixes
2018-04-06 10:23:27 +08:00
f19d5c69ee
Add Char compatibility module for 4.02.3
...
This is needed for configurator
2018-04-05 23:35:45 +08:00
9f9a770b13
Disable warning 50 for configurator on 4.02.3
2018-04-05 23:35:22 +08:00
651d12df5d
Implement manual printers for Meta type
2018-04-05 23:02:57 +08:00
4314dd7db3
Add some primitives to make writing formatters easier
...
* ocaml_list
* quoted
* const
* record
2018-04-05 23:02:25 +08:00
a1812fccd5
Add INSIDE_DUNE to detect when we are running from unside Dune
...
And use the following defaults: -j 1 --root . --display quiet
2018-04-03 11:43:07 +08:00
31858c9680
Don't on side-effects for setting up the environment
...
Instead of making sure we set global variables and call Unix.putenv in
the right order, pass the environment explicitely everywhere.
2018-04-03 11:43:07 +08:00
77c717b9af
Cosmetic changes for default package entry point.
2018-04-03 00:54:30 +08:00
f29ff0945d
Place module list on its own line (take 2)
...
See eb05f4f643https://github.com/ocaml/dune/pull/367#issuecomment-352209790 .
2018-04-03 00:13:36 +08:00
ff211b18a7
Fix lazy loading of rules
...
We must load package rules when a file in the _mld dir is requested
2018-04-02 23:15:56 +08:00
85d69b8e1a
Remove Odoc.pkg_odoc
...
This function is only used once
2018-04-02 19:47:13 +08:00
01fab4c1c3
Add Stdune.Or_exn
2018-03-30 16:55:44 -04:00
ba439b534d
Fix previous commit
2018-03-30 16:47:29 -04:00
cd2cfb44e8
Register a few more dependencies statically
...
This is needed for "external-lib-deps" and it improves parallelism.
2018-03-30 13:16:23 -04:00
341de6e50f
Fix check for empty libraries
2018-03-30 11:22:53 -04:00
e65213e303
Fix Main.external_lib_deps
2018-03-29 15:33:18 -04:00
c7b9c2cd3e
Fix #661 : better error when a public library is defined twice
2018-03-29 15:04:14 -04:00
ad00c1509f
Fix #657
2018-03-27 17:25:25 -04:00
808644533f
Don't color the whitespace in --display=short
2018-03-24 12:25:27 +00:00
8fd04e5a9f
Use doc_dir rather than dir
...
dir is the source directory which is useless to us
2018-03-24 00:54:33 +08:00
aea0131b11
Don't pass library include flags to odoc
...
We should pass directories where we store .odoc files instead
2018-03-24 00:38:34 +08:00
141e979611
Merge pull request #649 from rgrinberg/PATH-x
...
Set the target's PATH when cross compiling
2018-03-24 00:13:53 +08:00
8859a644e9
When executing in the target, use the host's PATH variable
2018-03-23 22:39:06 +08:00
fae5e78fc2
Change Meta.load to return the simplified meta
...
It's always simplified anyway
2018-03-23 10:12:34 +08:00
9f3eb956d3
Add Env.update
2018-03-22 22:42:42 +08:00
a83c15b085
Alphabetical listings in odoc
...
List sub libraries and their modules in alphabetical order
2018-03-22 20:40:46 +08:00
f8225b1e7b
Replace blank c compilers with dummy values
...
This is how we treat the assembler.
2018-03-22 00:03:35 +08:00
96222ee681
Don't error out when asm is a blank value
...
Treat it as missing instead
2018-03-22 00:03:35 +08:00
994fb12651
Tweak order in Map.of_list error ( #645 )
...
We should show the key that came earlier in the list first
2018-03-20 14:08:02 -04:00
d2c85e3329
Use dummy value for asm when absent
...
On bytecode only systems, this parameter may be absent. We use a dummy in such
situations. A dummy value is used so that users do not get immediate erros when
using an absent value.
2018-03-21 00:53:37 +08:00
f5f151dc19
Inspect OCAMLPATH when not using `ocamlfind` ( #642 )
2018-03-20 12:43:51 -04:00
cc02277095
Handle duplicate environment variables
...
Fixes #638
2018-03-20 22:02:49 +08:00
2e636ef43e
Merge pull request #636 from ocaml/fix-path-sep-on-cygwin
...
Use ; as path separator for OCAMLPATH on Cygwin
2018-03-20 09:22:54 +08:00
a8072f08bc
Rework the sub system select ( #632 )
...
Split the select_backends between two functions:
- one for backends that support extensions
- one for backends that support replacement
it might be possible to support both at once, but for now this is
enough and it's simpler.
2018-03-19 20:47:51 -04:00
fae09828af
Use ; as path separator for OCAMLPATH on Cygwin
...
Since this is what ocamlfind expects
2018-03-19 19:25:50 -04:00
3f22d9f82b
Do not pass -runtime-variant _pic on Windows ( #635 )
2018-03-19 19:13:02 -04:00
53ec04adfe
fix
2018-03-18 16:32:20 -04:00
bdb03925d1
Add Lib.Compile.compile_and_link_flags
2018-03-18 16:22:56 -04:00
945583ff43
Add Arg_spec.of_result{,_map}
2018-03-18 16:22:05 -04:00
09ff33951b
Change the type of Build.of_result and add Build.of_result_map
2018-03-18 16:21:59 -04:00
997d541c50
Make Top_closure more polymorphic
2018-03-18 16:21:46 -04:00
e638c04cb2
Add Jbuild.Lib_deps.of_pps
2018-03-18 16:20:32 -04:00
d15974c4ea
Add Option.some
2018-03-18 16:20:19 -04:00
2c59032181
A file might be part of several packages
2018-03-19 01:24:17 +08:00
c685e8ac6d
Remove useless load_dir
2018-03-19 01:24:04 +08:00
b5fad14f16
Less Path.Set.t -> Path.t list conversions
2018-03-19 01:19:41 +08:00
30c59cc476
Use dynamic dependencies for the package deps
2018-03-19 01:19:31 +08:00
9043280160
Allow dynamic dependencies for aliases
2018-03-19 01:19:20 +08:00
a55cde2969
fix
2018-03-19 01:19:09 +08:00
73873b31bc
Recursive package deps
2018-03-19 01:18:55 +08:00
1b8fbfc149
Use an alias name that is less likely to clash with user aliases
2018-03-19 01:18:45 +08:00
1a4037f8d1
Define the package_install alias at once
...
This is slightly more efficient that calling `add_alias_deps` for each
file.
2018-03-19 01:17:57 +08:00
ee5dd505fb
comment
2018-03-19 01:17:47 +08:00
b187d6e4ba
Add the (package ..) dependency type
...
Add a (package <name>) dependency type which adds a dependency on all the
installable files of a package.
2018-03-19 01:05:55 +08:00
4a0f4c0ff9
Fix encoding of inline_tests
...
Encode optional fields as records where optional keys that are None will be
omitted in the resultant sexp. This will match reading the keys back with field_o
2018-03-18 22:48:42 +08:00
7a26c18e20
New odoc rules
2018-03-18 17:44:08 +08:00
86768475b2
Install rules for mlds
2018-03-18 17:00:28 +08:00
25d52d1e3a
Add Lib.Map
2018-03-18 13:42:01 +08:00
0a57a02819
Add documentation stanza
2018-03-18 13:42:01 +08:00
8f967dbca5
Merge pull request #627 from rgrinberg/pkg-lib-map
...
Add a map from package names to libraries to super context
2018-03-18 13:25:48 +08:00
93d33592c6
Fix Atom.is_valid
2018-03-17 14:23:43 +00:00
da7874ebdf
Fix Atom.is_valid
2018-03-17 14:23:43 +00:00
5a5ba64503
Fix 4.02.3 compat in usexp
...
Do not use Char.equal
2018-03-17 14:23:43 +00:00
f39b302a8d
Fix Atom definition of Usexp
...
Fix the is_valid function to only validate atoms that don't contain spaces,
parens, comment characters.
2018-03-17 14:23:43 +00:00
9b5ac4060f
Add a map from package names to libraries to super context
...
Will be used for odoc and installation
2018-03-16 13:49:33 +08:00
69c5a4a79d
Implement Lib.package
...
Gets the opam package of a library for a public or installed library
2018-03-16 11:11:48 +08:00
b59dab57da
Include the package in the public status of libraries
2018-03-16 11:11:18 +08:00
07385a15ed
Remove double extending the env with context's env
2018-03-16 01:45:52 +08:00
68cf393c5f
Use Bin.path_sep
2018-03-16 01:45:39 +08:00
2634477def
Change Action to include the context's exec env
2018-03-16 00:44:23 +08:00
3c7e6adc73
Merge pull request #619 from rgrinberg/install-run-fixes
...
Tweaks to Actions
2018-03-15 19:10:13 +08:00
db55b4e880
Merge pull request #618 from rgrinberg/scope-encode
...
Move they '@' scope encoding to common module
2018-03-15 19:09:56 +08:00
9a1910cf6f
Add context for alias actions
2018-03-15 18:25:21 +08:00
bd457ea549
Use Env.t over string array in another place
2018-03-15 18:24:41 +08:00
dea2ac77ca
No optional args for context
2018-03-15 18:24:36 +08:00
a62e92a0ee
Move they '@' scope encoding to common module
...
This encoding will also be used by odoc so it's best to share it
2018-03-15 14:50:34 +08:00
25158fc702
Share Ordered_set_lang.Make(String)(String)
2018-03-15 14:25:04 +08:00
286f93a963
indentation
2018-03-15 14:24:55 +08:00
3b1bef8b9c
ocamlX_flags --> ocamlX_cflags
2018-03-14 12:02:56 +00:00
521a36dcef
Merge pull request #603 from diml/universe
...
Allow to depend on the universe
2018-03-14 13:02:23 +07:00
28208a1c12
Merge pull request #612 from rgrinberg/rename-result-private-lib
...
Rename the result private library
2018-03-14 12:59:36 +07:00
48ca91e013
Move the results lib into Caml
...
The result name is taken by other libs hence it breaks `jbuilder utop`. Hence we
simply move it our stdlib overlay. The -open flag is used to avoid having to
modify vendored code.
2018-03-14 12:09:20 +08:00
6fc1e0659a
Workaround non-precise mtime on OSX
2018-03-13 19:15:06 +00:00
e2adf9d44a
Allow to depend on the universe
...
Fix #255
2018-03-13 19:12:57 +00:00
8e4c9fce4c
Import the Sexp parser generator ( #608 )
2018-03-13 19:06:34 +00:00
d6a6a817f7
Move Io to stdune
...
This allows configurator to drop the dependency on jbuilder itself
2018-03-13 20:27:07 +07:00
12511a68ea
Merge pull request #607 from rgrinberg/private-public-overlap-take2
...
Disallow public/private overlap
2018-03-13 03:39:55 +07:00
ca5c383b3b
Fix locations reported by the parser ( #609 )
...
The start position of atoms wasn't saved by the parser.
2018-03-12 18:41:49 +00:00
e57a706960
Use the use-site location for errors from pps
2018-03-12 18:07:05 +00:00
7e361d596e
Let Report_error print the location for Private_deps_not_allowed
2018-03-12 17:58:54 +00:00
178e26cfd9
Use a more informative name
2018-03-12 17:56:24 +00:00
69209d7243
Remove extra parentheses
2018-03-12 17:53:00 +00:00
753badd481
Fix private deps check for ppx runtime dependencies
2018-03-13 00:11:12 +07:00
0823f9d803
allow_private_deps flag
...
Flag to guard public dependencies from acquiring private ones
2018-03-12 23:38:48 +07:00
2f7db648ed
Merge pull request #601 from rgrinberg/env-context
...
Move env var handling outside of Context.t
2018-03-12 19:13:33 +07:00
f74817e00d
Fill the loc field of rules
2018-03-12 12:02:55 +00:00
eef3633d9a
Tweak error messages
2018-03-12 18:45:47 +07:00
4a68db622d
Change representation to map from assoc list
2018-03-12 18:45:47 +07:00
161be3af1c
Stage Var.compare
2018-03-12 18:45:47 +07:00
1f99d0fb70
Simplify Env.get
...
we already have Var.equal now
2018-03-12 18:45:47 +07:00
f4955cdc22
Remove env_extra from Context.t
...
Rely on diffing
2018-03-12 18:45:47 +07:00
79d47ab68e
Simplify Env.t
...
Use assoc list
2018-03-12 18:45:47 +07:00
26d6b03c66
Make unix representation more efficient
...
By not allocation a closure on every update
2018-03-12 18:45:47 +07:00
e604c69510
Remove env_extra in Action
...
It's simply to just use Env.t everywhere. Also, there's no need to have the env
in the execution context since it's not used for anything. Only the env that is
passed directly is used.
2018-03-12 18:45:47 +07:00
f1baaa23a8
Add Env.add
...
Just add 1 binding to Env
2018-03-12 18:45:47 +07:00
3193e4902d
Make Process.run take Env.t directly
2018-03-12 18:45:47 +07:00
4b191b2b03
s/Env.get_var/Env.get/
2018-03-12 18:45:47 +07:00
206cc69fd9
Simplify Context.create
...
There's no need for a base_env parameter as it's always Env.initial
2018-03-12 18:45:47 +07:00
35d4153641
Make Env.t abstract
2018-03-12 18:43:02 +07:00
8458bf3b15
Move env related functions to Env module
2018-03-12 18:43:02 +07:00
feba0827b8
Allow to link executables as static or shared objects ( #23 )
...
- Setup the rules to use the `-output-complete-obj` option of OCaml
- Introduce a `best` mode in addition to `byte` and `native`
- Extend the `modes` field of executables to mean "linking modes", and add linking modes for static and shared objects
2018-03-12 11:40:53 +00:00
5286b42f58
Fix #597
2018-03-10 08:25:45 +07:00
b219f28a8a
Format fix
2018-03-09 20:43:57 +00:00
1feab6b2a6
Allow to specify additional libraries for the test runner ( #600 )
2018-03-09 19:51:02 +00:00
b604871aab
Limit number of simultaneously opened fds ( #578 )
...
Non-optimal solution: only handles the common case.
2018-03-08 18:28:14 +00:00
b029d32dfb
fix String_with_vars.sexp_of_t ( #595 )
2018-03-07 15:01:46 +00:00
0f0b154de6
Remove ranlib, doesn't seem to be available on Windows
2018-03-07 09:40:08 +00:00
98bb8adf83
fix
2018-03-07 09:40:08 +00:00
cc845e5fdb
Make all variables accessible in jbuild files
2018-03-07 09:40:08 +00:00
21a980a5d1
Update configurator
2018-03-07 09:40:08 +00:00
6ee6ed35d2
Ocamlc_config --> Ocaml_config
2018-03-07 09:40:08 +00:00
3bc21617b2
Refactor ocamlc_config
2018-03-07 09:40:08 +00:00
0b6a7eee2f
Recent versions of ocaml expose 'ext_exe'
2018-03-07 09:40:08 +00:00
9c178480ea
Update configurator
2018-03-07 09:40:08 +00:00
d415ed5f6c
Expose a few more variables
2018-03-07 09:40:08 +00:00
1ff05d52e2
Refactor a bit the variables in super_context.ml
2018-03-07 09:40:08 +00:00
a95fd29dba
Move Ocamlc_config to its own library and refactor it a bit
2018-03-07 09:40:08 +00:00
dfdb6c09f4
Allow to set the library path at configure time ( #575 )
...
This allow to drop the dependency on ocamlfind
2018-03-06 14:56:24 +00:00
232acdd92f
Libraries and executables can allow overlapping dependencies
2018-03-06 12:59:01 +00:00
a5f9a9e063
Detect overlapping libraries
2018-03-06 12:59:01 +00:00
c8355b454c
Generalize Ordered_set_lang to return a custom map
...
This simplifes all the conversion from and to Module.Name.Map.t
2018-03-06 18:45:38 +07:00
ddefafa58b
Introduce private type for module name
2018-03-06 18:45:38 +07:00
6eace337bc
typo
2018-03-05 18:06:41 +00:00
cd6812f269
Accept and ignore ppx.driver fields ( #588 )
2018-03-05 17:59:56 +00:00
4857ed444a
Reduce interleaving in the scheduler ( #586 )
2018-03-05 17:52:21 +00:00
5ded45faf0
Merge pull request #584 from rgrinberg/improve-error-modules
...
Improve error in modules partition
2018-03-05 23:47:19 +07:00
348d2b1a1e
display tweaks
2018-03-05 16:24:24 +00:00
719cf5eea0
Improve error in modules partition
...
Specify how to fix the error (by writing modules fields)
2018-03-05 23:11:45 +07:00
3edc029bf4
ws
2018-03-05 15:05:24 +00:00
75fe147da9
Merge pull request #577 from rgrinberg/menhir-own-module
...
Move menhir rules to own module
2018-03-05 21:30:17 +07:00
a1beb25d12
Add a bit more doc to Build
2018-03-05 14:14:09 +00:00
1a4362b0b1
Document Arg_spec a bit more
2018-03-05 14:00:29 +00:00
4c2768e805
style + doc
2018-03-05 14:00:21 +00:00
6d5c2de689
Change menhir flags to use ordered set language
...
Consistent with how flags are handled elsewhere in jbuilder
2018-03-05 20:03:16 +07:00
f06519e231
Implement menhir rules from scrath
...
Rather than changing them to user_rules and then compiling those.
2018-03-05 19:56:27 +07:00
288de19920
Move menhir rules to own module
2018-03-05 18:32:25 +07:00
09aa2cd1cf
Merge pull request #574 from diml/workaround-broken-builtins
...
Add a simple workaround for #563
2018-03-05 16:34:34 +07:00
7c287a5e0a
Change Package.Name.t to interned type
2018-03-03 20:41:29 +07:00
d1feb062b6
Add a workaround for broken META file for builtin packages
...
Fixes #563
2018-03-03 11:33:40 +00:00
ff05369868
Introduce package name private type
2018-03-03 01:44:03 +07:00
e4aac2da97
Improve error message for missing scopes
2018-03-02 15:55:48 +07:00
de99d84f73
Ignore errors while generating the .merlin file
...
Fix #568
Fix #51
2018-03-01 23:34:43 +00:00
1b279f30bf
Make Merlin.t abstract
2018-03-01 23:30:06 +00:00
39ac04a535
Add Build.catch
2018-03-01 23:30:06 +00:00
2e7f881d4c
Fix #567
...
The alias module needs an implementation for non-jbuilder users.
2018-03-01 20:47:08 +00:00
7790d6bd4c
Fix DB.all returning non unique libs ( #565 )
...
DB.all will return duplicate libraries in cases when it has 2 names for the same
library. This fix changes all to return a set of values. This is to indicate and
guarantee the uniqueness.
2018-03-01 11:53:27 +00:00
66a907be58
Merge pull request #467 from ocaml/import-configurator
...
Import configurator
2018-03-01 12:28:32 +07:00
d5ebd0e9be
Allow to capture the library a backend is attached to
2018-02-28 19:08:03 +00:00
17f4567014
Still build a Lib.t value for hidden libraries
...
This makes everything else simpler
2018-02-28 19:08:03 +00:00
3e73397638
Port configurator to dune
2018-02-28 23:37:20 +07:00
9b6abc4014
Initial import of configurator
...
This is the original source imported
2018-02-28 23:36:35 +07:00
070fd95cac
Add configurator build
...
For now the library is private
2018-02-28 23:33:16 +07:00
55675598c4
Extend ocamlc_config for configurator
...
* Add make to create ocamlc_config.t
* Add function to get bindings
2018-02-28 23:32:24 +07:00
9a6d9a3aa9
Extend stdlib for configurator
2018-02-28 23:31:24 +07:00
45535f7afd
Extracted SC.PP as Preprocessing ( #560 )
2018-02-28 12:26:34 +00:00
d01a684f71
Move SC.Doc to Odoc module
...
It longer has a rason to exist in super context.
2018-02-28 17:24:37 +07:00
02c5b005dd
Move intallation and META rules to install_rules module
2018-02-28 12:21:25 +07:00
5ecf354127
Add a sub-system for inline tests ( #547 )
...
To support frameworks such as ppx_inline_test, ppx_expect and qtest
2018-02-27 19:06:12 +00:00
c324736d11
Support upcoming ppxlib (was "ppx_base") ( #554 )
2018-02-27 12:56:47 +00:00
4dc8d2456f
Pass obj_dir explicitely to Exe.build_and_link and don't return it
...
The only place where we used the default value was gen_rules
2018-02-26 16:05:48 +00:00
138c920069
Add support for sub-systems
...
- Add a Sub_system module that allows to register sub-systems
that are implemented in a single file
- Add a Syntax module to deal with versioned syntaxes
Other changes:
- Add location to all library dependencies in jbuild files, to report
properly located errors
- Change the type of functions in Lib to return (_, exn) result
rather than (_, Lib.Error.t With_required_by.t) result, which was
hard to use
- Remove With_required_by.t as it was unused
- Rename With_required_by to Dep_path
- Cleanup a bit the Exe module, move a lot of stuff that was specific to
executable stanzas in gen_rules.ml
- Add String_with_vars.Unexpanded.sexp_of_t
- Rework a bit the code in Lib, in particular factorize the code
for taking the transitive closure of libraries
- Add an ?extra_vars argument to functions that expand variables
in Super_context
- Fix the printing of dependency path
- Merge the handling of dependency path between the build system and
the Lib module
2018-02-26 16:05:48 +00:00
95c254a6a0
Revert "Add support for upcoming ppx_base. ( #541 )"
...
This reverts commit 032cb62af6
2018-02-26 21:07:02 +07:00
31ea39949b
Make prefix_rules accessible through Super_context
2018-02-26 15:54:15 +07:00
0c30689404
Make Ocamldep.rules already_used arg optional
...
String_set.empty is a good default value
2018-02-26 15:53:19 +07:00
6e7d297ea3
Introduce short syntax for sexps
2018-02-26 15:53:19 +07:00
5a73753095
Extend interned module with a Table type
2018-02-26 15:53:19 +07:00
9943acb4dc
Add utility functions to result
...
all and concat_map
2018-02-26 15:53:19 +07:00
e77bd30681
prefix_rules should append rather than overwrite the prefix
2018-02-26 15:53:19 +07:00
3fd3d5b44c
Don't pass lib_name if lib is already passed
...
We can easily get the library name
2018-02-26 14:55:40 +07:00
290bcceb17
s/capitalize_ascii/capitalize/
2018-02-26 01:39:16 +07:00
1cb005bb50
Add a way to customize obj dir for executables
...
Use this function to simplify the obj dir for the utop runner
2018-02-26 01:30:02 +07:00
b4e0c04368
Revert "Use _utop.ml to avoid creating a separate dir for utop rules"
...
This reverts commit 9ec894eda0
2018-02-26 01:30:02 +07:00
3fd3eb8a12
Split src/import.ml into a new library src/stdune ( #548 )
...
- make sure type t always come first
- Map.map, Map.fold, ... never pass the key to the callback while Map.mapi, Map.foldi, ... do
- removed the ~key and ~data labels, I find them useless and annoying
- Set.elements --> Set.to_list
- Map.bindings --> Map.to_list
- Map.of_alist --> Map.of_list
- added Ordering.t for comparison functions
- renamed Inl/Inr to Left/Right. The latter seems clearer
- moved List.longest to String.longest
- added a Pp module with a nicer API than Format
2018-02-25 16:35:25 +00:00
4cf7dc558b
Fix generation of the alias module with 4.02 ( #549 )
2018-02-25 12:58:40 +00:00
fbafb3d47a
Make Atom.t private and consequences ( #524 )
2018-02-24 23:33:26 +00:00
361773fdb6
Remove gen_dot_merlin flag
...
It's no longer necessary after switching to the new Exe api. The new API will
not generate a .merlin file for utop.
2018-02-24 18:25:14 +07:00
4c9da64290
Merge pull request #537 from rgrinberg/use-fake-module-name
...
Use .utop.ml to avoid creating a separate dir for utop rules
2018-02-23 12:10:28 +07:00
032cb62af6
Add support for upcoming ppx_base. ( #541 )
2018-02-22 20:38:27 +00:00
9ec894eda0
Use _utop.ml to avoid creating a separate dir for utop rules
2018-02-22 17:34:39 +07:00
41b5017eb2
Fix #534
2018-02-21 13:35:47 +00:00
80ed205e38
Refactor utop module to use the new exe module
2018-02-21 16:44:31 +07:00
db345be90b
Trivial fix
2018-02-20 18:55:52 +00:00
2a531c5d24
Detect when a module is used by several stanzas ( #532 )
...
- print a warning
- don't generate several rules for the .d files
- Added tests for multiple rules for .ml.d
2018-02-20 16:44:25 +00:00
19f1c6f6b3
Add an Exe module to build and link executables ( #533 )
2018-02-20 16:38:22 +00:00
d8e4145dba
Warn instead of error on harmless fake modules
...
E.g. (modules (:standard \ does_not_exist)) is harmless
2018-02-20 20:23:28 +07:00
9e4cc84370
Refactor library management ( #516 )
...
Lib module
----------
We have a new module Lib that replaces Lib, parts of Lib_db and parts
of Findlib. It is used to manage all libraries (internal and
extrernal). Lib.t represent a completely resolved library, i.e. where
all the dependencies have been resolved. Lib.Compile is used to
provide what is necessary to build the library itself. Lib.Meta
provides what is necessary to generate the META file for the library.
We also have library databases represented as Lib.DB.t. A library
database is simply a mapping from names to Lib.t values and and
created from a resolve function that looks up a name and return a
Lib.Info.t. A Lib.Info.t is the same as a Lib.t except that
dependencies are not resolved.
A library database can have a parent database that is used to lookup
names that are not found in the current database. In practice we have
the following hierarchy:
1. For every scope, we have a library database that holds all the
libraries of this scope. In this DB, a library can be referred by
either it's name or public name
2. the parent of each of these databases is a database that holds all
the public libraries of the workspace. In this DB libraries must be
referred by their public name
3. the parent of this DB is for installed libraries
(1) databases are accessible via Scope.libs
(Super_context.find_scope_by_{name,dir} sctx xxx)
(2) is accessible via Super_context.public_libs sctx
(3) is accessible via Super_context.installed_libs sctx
The dependencies of a library are always resolved inside the DB it is
part of. When we compute a transitive closure, we check that we don't
have two libraries from two different DB with the same name. So for
instance linting Base should now supported.
Jbuild.Scope_info
-----------------
Jbuild.Scope was renamed Jbuild.Scope_info
Scope module
------------
This replaces Lib_db. A Scope.t is now just a pair of a
Jbuild.Scope_info.t and a Lib.DB.t. Scope.DB.t is an object used to
lookup scopes by either name or directory.
We no longer have an external scope or special anonymous
scope. Instead one should use Super_context.installed_libs or
Super_context.public_libs depending on the context.
2018-02-20 11:46:10 +00:00
26dc6d2b13
Share some computations on pps when preprocessing modules
2018-02-19 16:04:47 +00:00
a6e6136f3a
Merge pull request #521 from rgrinberg/build-only-public-docs
...
Change @doc to only build public docs
2018-02-19 19:00:27 +07:00
55e8dd99e2
Move reading/reading ocamlc -config to own module
2018-02-18 10:14:38 +07:00
75ab3946f6
Distinguish quoted and unquoted variables
...
Now only quoted strings support concatenation of text and a split-variable.
2018-02-17 23:44:32 +01:00
d28c6e4456
Change @doc to only build public docs
...
Private docs can still be built using the new @doc-private alias
2018-02-16 16:22:28 +07:00
5669f57907
Fix display when output is not a tty ( #518 )
2018-02-15 14:04:00 +00:00
67c9363c7d
Use more precise combinators "atom" and "quoted_string"
2018-02-15 00:45:06 +01:00
b48a9fec53
Usexp: Properly quote atoms when pretty printing
2018-02-15 00:43:08 +01:00
8e9ec4a52a
Do not accept the quoted form "->" in place of ->
2018-02-15 00:43:08 +01:00
0cbd1c7450
Usexp: factorize pp of atoms & fix serialization
2018-02-15 00:43:08 +01:00
453ce1eb56
String_with_vars: Use a functor to create generic expansion fun
...
This required to remove the labeled ~dir arguments in Action because
one would have had to use the same label for the expansion context in
String_with_vars, which would have been odd for generic expansion
functions.
2018-02-15 00:43:08 +01:00
a91cf637ae
Trigger an error for unquoted concatenations with list variables
...
Thus x${v} where v is a variable that returns several values must
necessarily be quoted: "x${v}".
2018-02-15 00:43:08 +01:00
754aa59cc3
String_with_vars: Distinguish quoted and unquoted strings
...
This implies that an atom can only contain a single variable, such as
${@}, and not something like xxx${@}xxx. The internal representation
was changed not to be able to represent the latter.
2018-02-15 00:43:08 +01:00
cc9c71661e
Fix Jérémie Dimino remarks
2018-02-15 00:43:08 +01:00
f9e17f76e0
Requires that atoms are unquoted is some contexts
2018-02-15 00:43:08 +01:00
73f529ae82
Rename String to Quoted_string
2018-02-15 00:43:08 +01:00
75ad9736f8
Move usexp in src/ as it diverged from parsexp
2018-02-15 00:43:08 +01:00
c27cb3541e
Let the parser distinguish quoted strings
...
Fixes https://github.com/ocaml/dune/issues/408
2018-02-15 00:43:08 +01:00
e8e3698e15
String_with_vars: represent quoted vars differently from unquoted ones
...
Define the representation for quoted variables, adapt the test of
strings made of a single variable, and add a constructor.
[String_with_vars.t] is not yet able to use that representation
because the necessary information is not available from the parser.
2018-02-15 00:43:08 +01:00
3e2dc2517d
Document the interface of String_with_vars
2018-02-15 00:43:08 +01:00
c569984af1
Rewrite the findlib predicate stuff
...
- intern predicate names
- add a Variant module
2018-02-13 19:04:30 +00:00
77ef63773f
4.02 compat
2018-02-13 19:04:21 +00:00
a1f70209bf
Fix previous commit
2018-02-13 18:52:58 +00:00
bd0593c11a
Fix printing of errors ( #513 )
...
The status line wasn't properly cleared
2018-02-13 18:31:21 +00:00
dfb8afb46e
Compute the transitive closure of findlib packages lazily ( #507 )
...
We are now computing the transitive closure of findlib packages
lazily. This simplify the code and prepare for subsequent changes to
library management.
Fix #484 at the same time
2018-02-13 17:49:07 +00:00
8e27f1966d
Fix #485 ( #512 )
2018-02-13 15:56:59 +00:00
2fb65c05ba
Fix #330 ( #510 )
2018-02-13 12:49:50 +00:00
0d62c34e42
Make Lib.t abstract ( #498 )
...
* Make Lib.t abstract
This requires removing the external/internal separation in most places in the
source code. Briefly, these are:
* Special casing of external libs for incremental compilation in jsoo
* .merlin generation
* stamp file generation
* transitive closure having a flag for walking external libs
* checking if a lib is a driver (checking various names)
These cases are fixed by introducing an src_dir, obj_dir abstractions, and the
ability to check if a library is local.
2018-02-13 18:36:15 +08:00
2b442c6019
Change .merlin generation to not use PKG
...
We know the build directory of exteranl packages, hence we should simply use it
as the build and source dir (B and S respectively).
2018-02-13 00:08:45 +08:00
8781c81bd3
Fix the top closure for internal libs
...
keying by the private name isn't enough. We include the dir in the key, because
private names are unique per dir.
2018-02-12 19:55:39 +08:00
baa009a0fb
Fix map of private installable libraries
...
It should be keyed by a unique name because the old key - the internal name,
isn't unique. Also take this change to fix the instalable -> installable typo.
2018-02-12 19:55:39 +08:00
0873ae2b10
Remove primed Lib_db.find_scope ( #505 )
...
Two versions aren't really necessary as mostly the primed version was used.
2018-02-10 22:38:28 +08:00
fd6e8ad91f
Remove {anonymous,external}_scope from Super_context
...
These were re-exported to avoid access libs directly, but there's already an
accessor to do that, so these functions weren't used consistently anyway.
2018-02-10 00:15:26 +08:00
dad2458879
install all sources
2018-02-08 23:09:55 +08:00
e22dee5f75
tweaks
2018-02-08 11:01:54 +00:00
c33269b914
Deduplicate closure and closed_ppx_runtime_deps_of ( #499 )
2018-02-08 10:58:02 +00:00
b3838284c6
Better support for mli/rei only modules ( #489 )
2018-02-08 10:12:46 +00:00
f083b6a2cd
Get rid of useless find_internal' function
...
It was only used to define find_internal
2018-02-08 11:58:40 +08:00
763feda683
Move the addition of <lib>.a dependencies to Lib.archive_files ( #493 )
...
Move the addition of <lib>.a dependencies to Lib.archive_files
And refactor a bit the code
2018-02-08 03:21:11 +08:00
b46cef533a
Make Findlib.package abstract
2018-02-07 18:10:05 +00:00
f949588742
Actions printed by "jbuilder rules" are now using relative paths
...
This seems more natural
2018-02-07 18:10:05 +00:00
a794de8b2b
Refactoring
2018-02-07 14:19:58 +00:00
b17b476048
Set the obj_dir for executables
2018-02-07 12:34:01 +00:00
0f0c0c2997
Compatibility layer: add link from `obj.cmi` -> `.foo.objs/obj.cmi`
2018-02-07 12:33:57 +00:00
fda3c7f680
Implement #427
2018-02-07 12:33:52 +00:00
fae08c79be
Allow to set the concurrency level from the config file
2018-02-07 12:11:27 +00:00
0570e09f9a
Add a configuration file and a quiet mode ( #490 )
2018-02-07 11:38:21 +00:00
4e4f651b37
Don't stop on the first error ( #477 )
...
Before, jbuilder used to stop its execution after an error was
encountered. Now it continues until all branches have been explored.
To implement this feature, Future was rewritten as a Fiber module with
a simpler semantic.
This patch contains various other refactorings.
2018-02-06 14:39:03 +00:00
d4c9eb6ba0
Do not pass -I <stdlib-dir> ( #488 )
2018-02-06 11:49:44 +00:00
80c0bfc879
Split calls to ocamldep ( #486 )
...
Instead of doing a single call to ocamldep, do one per file. This is
needed to support "menhir --infer".
This should also make compilation go further when there are files with
syntax errors.
2018-02-06 11:48:04 +00:00
a1c02df143
Build_system.prefix_rules ( #479 )
...
* Build_system.prefix_rules
Add a way to implicitly add a build prefix to all rules added by the given
function
* Make sure that on_load_dir callbacks handle the prefix right
* Make sure that prefix_rules prefixes don't contain targets
* Move prefix validation to user facing function
* document prefix_rules
2018-02-05 18:38:42 +08:00
e61142e885
Merge pull request #460 from ocaml/fix-promote-tests-on-osx
...
Fix bad interaction between promotion and incremental builds on OSX
2018-02-01 20:15:18 +08:00
f17e61dd3a
Fix #469
2018-02-01 10:17:51 +00:00
143145b19c
Remove old stuff about updated files
...
This dates from the time we were using timestamps for incremental
compilation.
2018-02-01 08:23:36 +00:00
b9c4dd2339
Remove files from the digest cache when promoting them.
...
This is to avoid problems with incremental compilation on OSX.
Fix #456
2018-02-01 08:23:25 +00:00
3bf3c91105
Verify that scope by path lookup uses valid dirs
...
The dirs must be sub directories of the anonymous_scope path. Which is the build
root of the context of the lib db.
2018-01-31 19:18:55 +08:00
4272d34fa6
Fix scoping related odoc rules
...
the lib component isn't just a library name. It can contain the scope as well
which we should resolve correctly
2018-01-31 03:43:39 +08:00
Rudi Grinberg
Jeremie Dimino
Etienne Millon
Christophe Troestler
Thomas Refis
Anton Bachin
David Allsopp
Jérémie Dimino
François Bobot
Xavier Clerc
Hugo Heuzard
Grégoire Henry