M build/debug/pds/Makefile +1 -1
@@ 8,7 8,7 @@ OCAMLOPT_OPTS=$(OCAMLC_OPTS)
CAMLP4=
SRC_DIR=../../../src/pds
-PACKAGES=cmdliner containers pds_template process snabela toml
+PACKAGES=cmdliner containers pds_template process snabela toml
LIB_MODULES=
NON_LIB_MODULES=pds.ml
EXTERNAL_DEPS=../pds_template/pds_template.cma ../pds_template/pds_template.cmxa ../snabela/snabela.cma ../snabela/snabela.cmxa
M build/debug/snabela/Makefile +1 -1
@@ 8,7 8,7 @@ OCAMLOPT_OPTS=$(OCAMLC_OPTS)
CAMLP4=
SRC_DIR=../../../src/snabela
-PACKAGES=containers ppx_deriving ppx_deriving.eq ppx_deriving.show process sedlex
+PACKAGES=containers ppx_deriving ppx_deriving.eq ppx_deriving.show process sedlex
LIB_MODULES=snabela.ml
NON_LIB_MODULES=snabela_lexer.ml
EXTERNAL_DEPS=
M build/profile/pds/Makefile +1 -1
@@ 8,7 8,7 @@ OCAMLOPT_OPTS=$(OCAMLC_OPTS)
CAMLP4=
SRC_DIR=../../../src/pds
-PACKAGES=cmdliner containers pds_template process snabela toml
+PACKAGES=cmdliner containers pds_template process snabela toml
LIB_MODULES=
NON_LIB_MODULES=pds.ml
EXTERNAL_DEPS=../pds_template/pds_template.cma ../pds_template/pds_template.cmxa ../snabela/snabela.cma ../snabela/snabela.cmxa
M build/profile/snabela/Makefile +1 -1
@@ 8,7 8,7 @@ OCAMLOPT_OPTS=$(OCAMLC_OPTS)
CAMLP4=
SRC_DIR=../../../src/snabela
-PACKAGES=containers ppx_deriving ppx_deriving.eq ppx_deriving.show process sedlex
+PACKAGES=containers ppx_deriving ppx_deriving.eq ppx_deriving.show process sedlex
LIB_MODULES=snabela.ml
NON_LIB_MODULES=snabela_lexer.ml
EXTERNAL_DEPS=
M build/release/pds/Makefile +1 -1
@@ 8,7 8,7 @@ OCAMLOPT_OPTS=$(OCAMLC_OPTS)
CAMLP4=
SRC_DIR=../../../src/pds
-PACKAGES=cmdliner containers pds_template process snabela toml
+PACKAGES=cmdliner containers pds_template process snabela toml
LIB_MODULES=
NON_LIB_MODULES=pds.ml
EXTERNAL_DEPS=../pds_template/pds_template.cma ../pds_template/pds_template.cmxa ../snabela/snabela.cma ../snabela/snabela.cmxa
M build/release/snabela/META +1 -1
@@ 1,7 1,7 @@
name="snabela"
version="1.0.0"
description=""
-requires="containers,ppx_deriving,ppx_deriving.eq,ppx_deriving.show,process,sedlex,"
+requires="containers,ppx_deriving,ppx_deriving.eq,ppx_deriving.show,process,sedlex"
archive(byte)="snabela.cma"
archive(native)="snabela.cmxa"
linkopts=""
M build/release/snabela/Makefile +1 -1
@@ 8,7 8,7 @@ OCAMLOPT_OPTS=$(OCAMLC_OPTS)
CAMLP4=
SRC_DIR=../../../src/snabela
-PACKAGES=containers ppx_deriving ppx_deriving.eq ppx_deriving.show process sedlex
+PACKAGES=containers ppx_deriving ppx_deriving.eq ppx_deriving.show process sedlex
LIB_MODULES=snabela.ml
NON_LIB_MODULES=snabela_lexer.ml
EXTERNAL_DEPS=
M files/build_Makefile.tmpl +1 -1
@@ 10,7 10,7 @@ OCAMLOPT_OPTS=$(OCAMLC_OPTS)
CAMLP4=
SRC_DIR=@src_dir@
-PACKAGES=@#packages@@name@ @/packages@
+PACKAGES=@packages_str@
LIB_MODULES=@#lib_modules@@name@ @/lib_modules@
NON_LIB_MODULES=@#non_lib_modules@@name@ @/non_lib_modules@
EXTERNAL_DEPS=@#external_deps@@name@ @/external_deps@
M files/test_Makefile.tmpl +1 -1
@@ 2,7 2,7 @@40' @extra
OCAMLOPT_OPTS=$(OCAMLC_OPTS)
SRC_DIR=@src_dir@
-PACKAGES=@#packages@@name@ @/packages@
+PACKAGES=@packages_str@
TEST_MODULES=@#test_modules@@name@ @/test_modules@
EXTERNAL_DEPS=@#external_deps@@name@ @/external_deps@
EXTRA_COMPILER_OPTS=@extra_compiler_opts@
M opam/packages/pds/pds.99999/opam +1 -1
@@ 38,7 38,7 @@ homepage: "https://bitbucket.org/mimirop
url {
src: "http://acsl-pkgs.s3.amazonaws.com/pds-99999.tar.gz"
- checksum: "2fcc66cf15c23d6e229e5cb31c5bbe92"
+ checksum: "43bc8f0d4eddcaf1135e2c212f3a5fd9"
}
bug-reports: "https://bitbucket.org/mimirops/pds/issues"
dev-repo: "git@bitbucket.org:mimirops/pds.git"
M smoke-tests/success/simple-output/expected/build/debug/foo/Makefile +1 -1
@@ 7,7 7,7 @@ OCAMLOPT_OPTS=$(OCAMLC_OPTS)
CAMLP4=
SRC_DIR=../../../src/foo
-PACKAGES=hi
+PACKAGES=hi
LIB_MODULES=
NON_LIB_MODULES=
EXTERNAL_DEPS=
M smoke-tests/success/simple-output/expected/build/profile/foo/Makefile +1 -1
@@ 7,7 7,7 @@ OCAMLOPT_OPTS=$(OCAMLC_OPTS)
CAMLP4=
SRC_DIR=../../../src/foo
-PACKAGES=hi
+PACKAGES=hi
LIB_MODULES=
NON_LIB_MODULES=
EXTERNAL_DEPS=
M smoke-tests/success/simple-output/expected/build/release/foo/Makefile +1 -1
@@ 7,7 7,7 @@ OCAMLOPT_OPTS=$(OCAMLC_OPTS)
CAMLP4=
SRC_DIR=../../../src/foo
-PACKAGES=hi
+PACKAGES=hi
LIB_MODULES=
NON_LIB_MODULES=
EXTERNAL_DEPS=
M src/pds/pds.ml +4 -0
@@ 379,6 379,7 @@ let emit_ocaml_build lookup project_type
(Lookup.string ~use_global:true lookup build "extra_ocamldep_opts")
in
let meta_linkopts = get_meta_linkopts lookup build in
+ let packages_str = String.concat " " (Build_set.elements deps) in
let packages =
List.map
(fun n -> Snabela.Kv.(Map.of_list [("name", string n)]))
@@ 437,6 438,7 @@ let emit_ocaml_build lookup project_type
parallel. *)
; ("src_dir", string src_dir)
; ("packages", list packages)
+ ; ("packages_str", string packages_str)
; ("lib_modules", list lib_modules)
; ("non_lib_modules", list non_lib_modules)
; ("external_deps", list external_deps)
@@ 520,6 522,7 @@ let emit_test_makefile lookup test =
~default:""
(Lookup.string ~test:true lookup test "extra_compiler_opts")
in
+ let packages_str = String.concat " " (Build_set.elements deps) in
let packages =
List.map
(fun n -> Snabela.Kv.(Map.of_list [("name", string n)]))
@@ 546,6 549,7 @@ let emit_test_makefile lookup test =
Snabela.Kv.(Map.of_list
[ ("src_dir", string src_dir)
; ("packages", list packages)
+ ; ("packages_str", string packages_str)
; ("test_modules", list files)
; ("external_deps", list external_deps)
; ("extra_compiler_opts", string extra_compiler_opts)