Merge GH #574/#577: Fix PKCS 11 amalgamation, add notion of external includes

5 files changed, 19 insertions, 6 deletions

diff --git a/src/lib/prov/pkcs11/info.txt b/src/lib/prov/pkcs11/info.txt
index 37a7f0d4d..2715c7cda 100644
--- a/src/lib/prov/pkcs11/info.txt
+++ b/src/lib/prov/pkcs11/info.txt
@@ -10,10 +10,13 @@ pk_pad
 
 <header:internal>
 p11_mechanism.h
+</header:internal>
+
+<header:external>
 pkcs11.h
 pkcs11f.h
 pkcs11t.h
-</header:internal>
+</header:external>
 
 <header:public>
 p11.h
diff --git a/src/lib/prov/pkcs11/p11.h b/src/lib/prov/pkcs11/p11.h
index df077f62b..c18c07d59 100644
--- a/src/lib/prov/pkcs11/p11.h
+++ b/src/lib/prov/pkcs11/p11.h
@@ -50,7 +50,7 @@
    #pragma pack(push, cryptoki, 1)
 #endif
 
-#include <botan/internal/pkcs11.h>
+#include "pkcs11.h"
 
 #if defined(_MSC_VER)
    #pragma pack(pop, cryptoki)
diff --git a/src/lib/prov/pkcs11/pkcs11.h b/src/lib/prov/pkcs11/pkcs11.h
index b42d46875..c66b0bca9 100644
--- a/src/lib/prov/pkcs11/pkcs11.h
+++ b/src/lib/prov/pkcs11/pkcs11.h
@@ -184,7 +184,7 @@ extern "C" {
 /* All the various Cryptoki types and #define'd values are in the
  * file pkcs11t.h.
  */
-#include <botan/internal/pkcs11t.h>
+#include "pkcs11t.h"
 
 #define __PASTE(x,y)      x##y
 
@@ -201,7 +201,7 @@ extern "C" {
 /* pkcs11f.h has all the information about the Cryptoki
  * function prototypes.
  */
-#include <botan/internal/pkcs11f.h>
+#include "pkcs11f.h"
 
 #undef CK_NEED_ARG_LIST
 #undef CK_PKCS11_FUNCTION_INFO
@@ -221,7 +221,7 @@ extern "C" {
 /* pkcs11f.h has all the information about the Cryptoki
  * function prototypes.
  */
-#include <botan/internal/pkcs11f.h>
+#include "pkcs11f.h"
 
 #undef CK_NEED_ARG_LIST
 #undef CK_PKCS11_FUNCTION_INFO
@@ -247,7 +247,7 @@ struct CK_FUNCTION_LIST {
 /* pkcs11f.h has all the information about the Cryptoki
  * function prototypes.
  */
-#include <botan/internal/pkcs11f.h>
+#include "pkcs11f.h"
 
 };
 
diff --git a/src/scripts/ci/appveyor.yml b/src/scripts/ci/appveyor.yml
index e4c5fd1dd..29100e415 100644
--- a/src/scripts/ci/appveyor.yml
+++ b/src/scripts/ci/appveyor.yml
@@ -10,10 +10,14 @@ environment:
       MODE: --enable-shared
     - COMPILER: msvc-12.0
       MODE: --disable-shared
+    - COMPILER: msvc-12.0
+      MODE: --via-amalgamation
     - COMPILER: msvc-14.0
       MODE: --enable-shared
     - COMPILER: msvc-14.0
       MODE: --disable-shared
+    - COMPILER: msvc-14.0
+      MODE: --via-amalgamation
 
 install:
   - if %compiler% == msvc-12.0 (
diff --git a/src/scripts/install.py b/src/scripts/install.py
index 1d4d27b76..d87e69b49 100755
--- a/src/scripts/install.py
+++ b/src/scripts/install.py
@@ -147,6 +147,12 @@ def main(args = None):
         copy_file(os.path.join(build_include_dir, include),
                   os.path.join(target_include_dir, include))
 
+    build_external_include_dir = os.path.join(options.build_dir, 'include', 'external')
+
+    for include in sorted(os.listdir(build_external_include_dir)):
+        copy_file(os.path.join(build_external_include_dir, include),
+                  os.path.join(target_include_dir, include))
+
     static_lib = process_template('%{lib_prefix}%{libname}.%{static_suffix}')
     copy_file(os.path.join(out_dir, static_lib),
               os.path.join(lib_dir, os.path.basename(static_lib)))