From 0224be8436aa97ef8b996eee44b708947d1812d0 Mon Sep 17 00:00:00 2001
From: Anil Madhavapeddy <anil@recoil.org>
Date: Sun, 3 Feb 2019 10:11:44 +0000
Subject: [PATCH 1/2] Remove old compatibility packages for `cstruct.lwt`,
 `cstruct.async`, `cstruct.ppx` and `cstruct.unix`.

These were deprecated in cstruct.3.0.0 in favour of counter part
libraries with a dash in the name (`cstruct-lwt`, `cstruct-async`,
`cstruct.unix`) or `ppx_cstruct` for the PPX extension.

Keeping these around makes it harder to embed in a duniverse, since
old users of the name will result in a dependency cycle.  There
are very few packages still using it though, and this release will
flush them out...
---
 CHANGES.md             |  9 +++++++++
 META.cstruct.template  | 21 ---------------------
 ppx_test/with-lwt/dune |  3 +--
 3 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 META.cstruct.template

diff --git a/CHANGES.md b/CHANGES.md
index 42e6cdec..b0dae2dd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+v3.4.0 2019-02-02
+-----------------
+
+- Remove old compatibility packages for `cstruct.lwt`, `cstruct.async`,
+  `cstruct.ppx` and `cstruct.unix`.  These were deprecated in
+  cstruct.3.0.0 in favour of counter part libraries with a dash
+  in the name (`cstruct-lwt`, `cstruct-async`, `cstruct.unix`)
+  or `ppx_cstruct` for the PPX extension. (@avsm)
+
 v3.3.0 2019-01-22
 -----------------
 
diff --git a/META.cstruct.template b/META.cstruct.template
deleted file mode 100644
index 6ec2923c..00000000
--- a/META.cstruct.template
+++ /dev/null
@@ -1,21 +0,0 @@
-# JBUILDER_GEN
-
-package "unix" (
-  description = "Deprecated. Use cstruct-unix"
-  requires = "cstruct-unix"
-)
-
-package "lwt" (
-  description = "Deprecated. Use cstruct-lwt"
-  requires = "cstruct-lwt"
-)
-
-package "async" (
-  description = "Deprecated. Use cstruct-async"
-  requires = "cstruct-async"
-)
-
-package "ppx" (
- description = "Deprecated. Use ppx_cstruct"
- requires = "ppx_cstruct"
-)
diff --git a/ppx_test/with-lwt/dune b/ppx_test/with-lwt/dune
index d4fa2aaf..79b9e954 100644
--- a/ppx_test/with-lwt/dune
+++ b/ppx_test/with-lwt/dune
@@ -1,5 +1,4 @@
 (executables
  (names ppx_cstruct_and_lwt)
- (preprocess
-  (pps lwt.ppx ppx_cstruct))
+ (preprocess (pps lwt_ppx ppx_cstruct))
  (libraries cstruct lwt lwt.unix))

From dba30516fd068236e2a90837b24b8b10b0533cf6 Mon Sep 17 00:00:00 2001
From: Anil Madhavapeddy <anil@recoil.org>
Date: Sun, 3 Feb 2019 10:43:41 +0000
Subject: [PATCH 2/2] deactivate the appveyor msvc test until cmdliner fix is
 in

see https://github.com/dbuenzli/cmdliner/issues/104
---
 appveyor.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 45f0ca29..f05f5008 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,8 +8,7 @@ environment:
     CYG_ROOT: C:\cygwin64
     PACKAGE: cstruct
   matrix:
-    - OPAM_SWITCH: 4.05.0+msvc32c
-    - OPAM_SWITCH: 4.04.2+mingw64c
+    - OPAM_SWITCH: 4.07.1+mingw64c
 
 install:
   - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/$env:FORK_USER/ocaml-ci-scripts/$env:FORK_BRANCH/appveyor-install.ps1"))