From fcfb0cebeebbef1084e8d5e5e4ee3a83be81326c Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgner@informatik.hu-berlin.de>
Date: Mon, 14 Sep 2015 22:45:13 +0200
Subject: [PATCH] build cross compiled installer with innosetup

---
 .travis.yml         | 27 ++++++++++++++++++++-------
 win32/OpenSC.iss.in |  8 ++++----
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b45779f1..dc5493f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,12 @@
 language: C
 
+sudo: required
+
 env:
   global:
-   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
-   #   via the "travis encrypt" command using the project repo's public key
-   - secure: "UkHn7wy4im8V1nebCWbAetnDSOLRUbOlF6++ovk/7Bnso1/lnhXHelyzgRxfD/oI68wm9nnRV+RQEZ9+72Ug1CyvHxyyxxkwal/tPeHH4B/L+aGdPi0id+5OZSKIm77VP3m5s102sJMJgH7DFd03+nUd0K26p0tk8ad4j1geV4c="
+    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+    #   via the "travis encrypt" command using the project repo's public key
+    - secure: "UkHn7wy4im8V1nebCWbAetnDSOLRUbOlF6++ovk/7Bnso1/lnhXHelyzgRxfD/oI68wm9nnRV+RQEZ9+72Ug1CyvHxyyxxkwal/tPeHH4B/L+aGdPi0id+5OZSKIm77VP3m5s102sJMJgH7DFd03+nUd0K26p0tk8ad4j1geV4c="
 
 matrix:
   include:
@@ -26,6 +28,11 @@ matrix:
 before_install:
   - if [ $TRAVIS_OS_NAME == linux ]; then
       sudo apt-get update || true;
+      if [ ! -z "$HOST" ]; then
+        export DISPLAY=:99.0;
+        sudo /etc/init.d/xvfb start;
+        /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16;
+      fi
     fi
 
 install:
@@ -33,9 +40,9 @@ install:
       if [ -z "$HOST" ]; then
         sudo apt-get install libpcsclite-dev xsltproc docbook-xsl;
       elif [ "${HOST}" == i686-w64-mingw32 ]; then
-        sudo apt-get install mingw-w64 binutils-mingw-w64-i686 gcc-mingw-w64-i686;
+        sudo apt-get install wine mingw-w64 binutils-mingw-w64-i686 gcc-mingw-w64-i686;
       elif [ "${HOST}" == x86_64-w64-mingw32 ]; then
-        sudo apt-get install mingw-w64 binutils-mingw-w64-x86-64 gcc-mingw-w64-x86-64;
+        sudo apt-get install wine mingw-w64 binutils-mingw-w64-x86-64 gcc-mingw-w64-x86-64;
       fi
     fi
 
@@ -44,9 +51,11 @@ before_script:
   - if [ -z "$HOST" ]; then
       ./configure $ENABLE_DOC --enable-dnie-ui;
     else
+      wget http://files.jrsoftware.org/is/5/isetup-5.5.6.exe;
+      wine isetup-5.5.6.exe /SILENT /VERYSILENT /SP- /SUPPRESSMSGBOXES /NORESTART;
       unset CC;
       unset CXX;
-      ./configure --host=$HOST --disable-openssl;
+      ./configure --host=$HOST --disable-openssl --prefix=${TRAVIS_BUILD_DIR}/win32/opensc;
     fi
 
 addons:
@@ -66,7 +75,11 @@ script:
         make;
       fi;
     fi
-  - if [ -z "$HOST" -a "${COVERITY_SCAN_BRANCH}" != 1 -a "$TRAVIS_OS_NAME" != "osx" ]; then
+  - if [ -z "$HOST" -a "${COVERITY_SCAN_BRANCH}" != 1 ]; then
       make check;
       make dist;
     fi
+  - if [ ! -z "$HOST" -a "${COVERITY_SCAN_BRANCH}" != 1 ]; then
+      make install;
+      wine "C:/Program Files (x86)/Inno Setup 5/ISCC.exe" win32/OpenSC.iss;
+    fi
diff --git a/win32/OpenSC.iss.in b/win32/OpenSC.iss.in
index 6bb6e3ba..f95764a5 100644
--- a/win32/OpenSC.iss.in
+++ b/win32/OpenSC.iss.in
@@ -45,7 +45,7 @@ DefaultGroupName=OpenSC
 Source: opensc\share\opensc\*.profile; DestDir: {app}\profiles
 Source: opensc\bin\*.dll; DestDir: {sys}; Flags: overwritereadonly replacesameversion ignoreversion uninsnosharedfileprompt restartreplace
 Source: opensc\bin\*.exe; DestDir: {app}; Flags: overwritereadonly replacesameversion ignoreversion
-Source: engine_pkcs11\*.dll; DestDir: {sys}; Components: OpenSSL_engine; Flags: overwritereadonly replacesameversion ignoreversion
+;Source: engine_pkcs11\*.dll; DestDir: {sys}; Components: OpenSSL_engine; Flags: overwritereadonly replacesameversion ignoreversion
 Source: opensc\etc\opensc.conf; DestDir: {app};
 ;Source: www.opensc-project.org.url; DestDir: {app}
 [Icons]
@@ -54,6 +54,6 @@ Source: opensc\etc\opensc.conf; DestDir: {app};
 [Registry]
 Root: HKLM; Subkey: Software\OpenSC Project\OpenSC; ValueType: string; ValueName: ConfigFile; ValueData: {app}\opensc.conf; Flags: uninsdeletekey; Components:
 Root: HKLM; Subkey: Software\OpenSC Project\OpenSC; ValueType: string; ValueName: ProfileDir; ValueData: {app}\profiles; Flags: uninsdeletekey; Components:
-[Components]
-Name: OpenSC; Description: OpenSC core library; Flags: fixed; Types: custom compact full
-Name: OpenSSL_engine; Description: OpenSSL engine for using PKCS11 modules; Types: custom full
+;[Components]
+;Name: OpenSC; Description: OpenSC core library; Flags: fixed; Types: custom compact full
+;Name: OpenSSL_engine; Description: OpenSSL engine for using PKCS11 modules; Types: custom full