Merge pull request #115 from nberth/fix-cross-compilation

Hack opam files generated for cross-compilation

Makefile.header

@@ -83,15 +83,25 @@ clean-execs:
 
 .PHONY: opam-cross
 
+# Generates opam files for cross-compilation.  We don't generate
+# specific files for js-only packages.  As a result we also forcibly
+# remove a dependency to `superbol-vscode-platform` (which is js-only)
+# from the platform-specific version of `superbol-studio-oss`. This is
+# ok as those files are only there to grab external dependencies
+# before cross-compiling.
 opam-cross:
 	drom dep --cross osx
 	rm -f opam/osx/*-js-*.opam
 	rm -f opam/osx/vscode-debug*.opam
 	rm -f opam/osx/*-vscode-*.opam
+	sed -i '/"superbol-vscode-platform-osx"/ d'	\
+		opam/osx/superbol-studio-oss-osx.opam
 	drom dep --cross windows
 	rm -f opam/windows/*-js-*.opam
 	rm -f opam/windows/vscode-debug*.opam
 	rm -f opam/windows/*-vscode-*.opam
+	sed -i '/"superbol-vscode-platform-windows"/ d'	\
+		opam/windows/superbol-studio-oss-windows.opam
 
 # emacs-lsp:
 emacs/lsp-superbol-customs.el: $(LSP_MODE_SRCDIR) package.json

opam/osx/superbol-studio-oss-osx.opam

@@ -48,7 +48,6 @@ install: [
 depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8.0"}
-  "superbol-vscode-platform-osx" {= version}
   "superbol-free-osx" {= version}
   "odoc" {with-doc}
 ]

opam/windows/superbol-studio-oss-windows.opam

@@ -48,7 +48,6 @@ install: [
 depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "2.8.0"}
-  "superbol-vscode-platform-windows" {= version}
   "superbol-free-windows" {= version}
   "odoc" {with-doc}
 ]