Skip to content

Commit 744da2c

Browse files
nojbdra27
nojb
authored and
dra27
committed
Add META files
1 parent 719a0f5 commit 744da2c

19 files changed

Lines changed: 129 additions & 5 deletions

File tree

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ VERSION typo.missing-header
5050
api_docgen/*.mld typo.missing-header
5151
api_docgen/alldoc.tex typo.missing-header
5252
tools/mantis2gh_stripped.csv typo.missing-header
53+
META typo.missing-header
5354

5455
*.adoc typo.long-line=may typo.very-long-line=may
5556

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ _build
134134

135135
/otherlibs/*/.dep
136136
/otherlibs/dynlink/extract_crc
137+
/otherlibs/dynlink/META
137138
/otherlibs/dynlink/dynlink_platform_intf.mli
138139
/otherlibs/dynlink/byte/dynlink.mli
139140
/otherlibs/dynlink/native/dynlink.mli

‎Changes‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,12 @@ OCaml 5.0
290290
from +compiler-libs, as the debugger does.
291291
(David Allsopp, review by Sébastien Hinderer)
292292

293+
- #11007: META files for the stdlib, compiler-libs and other libraries (unix,
294+
dynlink, str, runtime_events, threads, ocamldoc) are now installed along with
295+
the compiler.
296+
(David Allsopp, Florian Angeletti, Nicolás Ojeda Bär and Sébastien Hinderer,
297+
review by Daniel Bünzli, Kate Deplaix, Anil Madhavapeddy and Gabriel Scherer)
298+
293299
### Build system:
294300

295301
* #10893: Remove configuration options --disable-force-safe-string and

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true"
14681468
"$(INSTALL_COMPLIBDIR)"
14691469
endif
14701470
$(INSTALL_DATA) \
1471-
compilerlibs/*.cma \
1471+
compilerlibs/*.cma compilerlibs/META \
14721472
"$(INSTALL_COMPLIBDIR)"
14731473
$(INSTALL_DATA) \
14741474
$(BYTESTART) $(TOPLEVELSTART) \

‎compilerlibs/META‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
version = "[distributed with OCaml]"
2+
description = "compiler-libs support library"
3+
directory= "+compiler-libs"
4+
5+
package "common" (
6+
requires = "compiler-libs"
7+
version = "[distributed with OCaml]"
8+
description = "Common compiler routines"
9+
archive(byte) = "ocamlcommon.cma"
10+
archive(native) = "ocamlcommon.cmxa"
11+
)
12+
13+
package "bytecomp" (
14+
requires = "compiler-libs.common"
15+
version = "[distributed with OCaml]"
16+
description = "Bytecode compiler"
17+
archive(byte) = "ocamlbytecomp.cma"
18+
archive(native) = "ocamlbytecomp.cmxa"
19+
)
20+
21+
package "optcomp" (
22+
requires = "compiler-libs.common"
23+
version = "[distributed with OCaml]"
24+
description = "Native-code compiler"
25+
archive(byte) = "ocamloptcomp.cma"
26+
archive(native) = "ocamloptcomp.cmxa"
27+
exists_if = "ocamloptcomp.cma"
28+
)
29+
30+
package "toplevel" (
31+
requires = "compiler-libs.bytecomp"
32+
version = "[distributed with OCaml]"
33+
description = "Toplevel interactions"
34+
archive(byte) = "ocamltoplevel.cma"
35+
)
36+
37+
package "native-toplevel" (
38+
requires = "compiler-libs.optcomp dynlink"
39+
version = "[distributed with OCaml]"
40+
description = "Toplevel interactions"
41+
archive(native) = "ocamltoplevel.cmxa"
42+
exists_if = "ocamltoplevel.cmxa"
43+
)

‎configure‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configure.ac‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ AC_SUBST([mklib])
129129
AC_SUBST([supports_shared_libraries])
130130
AC_SUBST([natdynlink])
131131
AC_SUBST([natdynlinkopts])
132+
AC_SUBST([natdynlink_archive])
132133
AC_SUBST([cmxs])
133134
AC_SUBST([debug_runtime])
134135
AC_SUBST([instrumented_runtime])
@@ -179,6 +180,7 @@ AC_SUBST([QS])
179180
AC_CONFIG_FILES([Makefile.build_config])
180181
AC_CONFIG_FILES([Makefile.config])
181182
AC_CONFIG_FILES([stdlib/sys.ml])
183+
AC_CONFIG_FILES([otherlibs/dynlink/META])
182184
AC_CONFIG_FILES([manual/src/version.tex])
183185
AC_CONFIG_FILES([manual/src/html_processing/src/common.ml])
184186
AC_CONFIG_HEADERS([runtime/caml/m.h])
@@ -1200,6 +1202,9 @@ AS_CASE([$enable_native_compiler,$arch],
12001202
AS_IF([! $native_compiler], [natdynlink=false])
12011203

12021204
AS_IF([$natdynlink], [cmxs="cmxs"], [cmxs="cmx"])
1205+
AS_IF([$natdynlink],
1206+
[natdynlink_archive="dynlink.cmxa"],
1207+
[natdynlink_archive=""])
12031208

12041209
AC_DEFINE_UNQUOTED([OCAML_OS_TYPE], ["$ostype"])
12051210

‎ocamldoc/META‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
requires = "compiler-libs"
2+
version = "[distributed with OCaml]"
3+
description = "ocamldoc plugin interface"
4+
directory= "+ocamldoc"

‎ocamldoc/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ install:
219219
$(MKDIR) "$(INSTALL_LIBDIR)/ocamldoc"
220220
$(INSTALL_PROG) $(OCAMLDOC) "$(INSTALL_BINDIR)"
221221
$(INSTALL_DATA) \
222-
ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) \
222+
ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) META \
223223
"$(INSTALL_LIBDIR)/ocamldoc"
224224
$(INSTALL_DATA) \
225225
$(OCAMLDOC_LIBCMIS) \

‎otherlibs/Makefile.otherlibs.common‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ endif
103103
$(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).cmxs $(LIBNAME).$(A))
104104
$(MKDIR) "$(INSTALL_LIBDIR_LIBNAME)"
105105
$(INSTALL_DATA) \
106-
$(LIBNAME).cma $(CMIFILES) \
106+
$(LIBNAME).cma $(CMIFILES) META \
107107
"$(INSTALL_LIBDIR_LIBNAME)/"
108108
ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true"
109109
$(INSTALL_DATA) \

0 commit comments

Comments
 (0)