Package the sources as flexdll

The flexdll package is intended for use when building OCaml in
"bootstrapped" flexdll mode and installs the required source files to
the share folder in an opam switch.

flexdll.opam is now the primary source for the version number for the
package, and both version.ml and version.rc are compiled using the
number taken from there.

Author: dra27

Makefile

@@ -5,7 +5,8 @@
 ##
 
 
-VERSION = 0.43
+VERSION = \
+  $(eval VERSION := $$(shell sed -ne 's/^version: *"\(.*\)"/\1/p' flexdll.opam))$(VERSION)
 
 all: flexlink.exe support
 
@@ -33,7 +34,7 @@ MIN64CC = $(MINGW64_PREFIX)gcc
 CYGWIN64_PREFIX = x86_64-pc-cygwin-
 CYG64CC = $(CYGWIN64_PREFIX)gcc
 
-version.ml: Makefile
+version.ml: Makefile flexdll.opam
 	echo "let version = \"$(VERSION)\"" > version.ml
 	echo "let mingw_prefix = \"$(MINGW_PREFIX)\"" >> version.ml
 	echo "let mingw64_prefix = \"$(MINGW64_PREFIX)\"" >> version.ml
@@ -183,10 +184,10 @@ WINDRES_FLAGS = \
   -D FLEXDLL_VS_VERSION_INFO=$(FLEXDLL_VS_VERSION_INFO) \
   -D FLEXDLL_FULL_VERSION=\\\"$(FLEXDLL_FULL_VERSION)\\\"
 
-version.res: version.rc Makefile
+version.res: version.rc flexdll.opam
 	$(RES_PREFIX) rc /nologo $(RC_FLAGS) $<
 
-version_res.o: version.rc Makefile
+version_res.o: version.rc flexdll.opam
 	$(TOOLPREF)windres $(WINDRES_FLAGS) -i $< -o $@
 
 flexdll_msvc.obj: flexdll.c flexdll.h
@@ -262,7 +263,7 @@ package_src:
 	rm -Rf flexdll-$(VERSION)
 	mkdir flexdll-$(VERSION)
 	mkdir flexdll-$(VERSION)/test
-	cp -a $(filter-out version.ml,$(OBJS:Compat.ml=Compat.ml.in)) Makefile msvs-detect $(COMMON_FILES) version.rc flexdll-$(VERSION)/
+	cp -a $(filter-out version.ml,$(OBJS:Compat.ml=Compat.ml.in)) Makefile msvs-detect $(COMMON_FILES) version.rc flexdll.install flexdll.opam flexdll-$(VERSION)/
 	cp -aR test/Makefile test/*.c flexdll-$(VERSION)/test/
 	tar czf $(PACKAGE) flexdll-$(VERSION)
 	rm -Rf flexdll-$(VERSION)

appveyor_build.sh

@@ -211,7 +211,7 @@ if [ "$ARTEFACTS" = 'yes' ] ; then
 
     make package_bin installer
     SUFFIX="$(git describe)"
-    VERSION="$(sed -ne 's/^VERSION *= *//p' Makefile)"
+    VERSION="$(sed -ne 's/^version: *"\(.*\)"/\1/p' Makefile)"
     if [ "$SUFFIX" != "$VERSION" ] ; then
       mv "flexdll-bin-$VERSION.zip" "flexdll-bin-$SUFFIX.zip"
       mv "flexdll-$VERSION-setup.exe" "flexdll-$SUFFIX-setup.exe"

flexdll.install

@@ -0,0 +1,14 @@
+share: [
+  "Makefile"
+  "cmdline.ml"
+  "coff.ml"
+  "Compat.ml.in"
+  "create_dll.ml"
+  "default.manifest"
+  "default_amd64.manifest"
+  "flexdll.c"
+  "flexdll.h"
+  "flexdll_initer.c"
+  "reloc.ml"
+  "version.rc"
+]

flexdll.opam

@@ -0,0 +1,11 @@
+opam-version: "2.0"
+version: "0.43"
+authors: "Alain Frisch"
+maintainer: "David Allsopp <david@tarides.com>"
+bug-reports: "https://github.com/ocaml/flexdll/issues"
+dev-repo: "git+https://github.com/ocaml/flexdll.git"
+homepage: "https://github.com/ocaml/flexdll#readme"
+license: "Zlib"
+synopsis: "FlexDLL Sources"
+description: "Source package for FlexDLL. Installs the required files for
+bootstrapping FlexDLL as part of an OCaml build."