Add OpenSSL DLLs to Windows build

fathomssen · May 1, 2017 · 005bf99 · 005bf99
1 parent 476d85c
commit 005bf99
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -8,5 +8,5 @@
 	path = gui/qxtglobalshortcut5
 	url = https://github.com/fathomssen/qxtglobalshortcut5.git
 [submodule "build/macdeployqtfix"]
-	path = .travis/macdeployqtfix
+	path = deploy/macdeployqtfix
 	url = https://github.com/aurelien-rainone/macdeployqtfix.git
diff --git a/.travis.yml b/.travis.yml
@@ -91,10 +91,10 @@ after_success:
   - run $isLinux sudo make install
   - run $isLinux cd ..
   - run $isLinux export VERSION=${TRAVIS_TAG#v}
-  - run $isLinux .travis/deploy.linux.sh $PREFIX $VERSION
+  - run $isLinux deploy/deploy.linux.sh $PREFIX $VERSION
   # OS X
   - run $isOsX export PREFIX=redtimer-${TRAVIS_TAG}-${dist}-${distver}-${distname}
-  - run $isOsX .travis/deploy.osx.sh $PREFIX
+  - run $isOsX deploy/deploy.osx.sh $PREFIX
   # Both
   - export DEPLOYFILE=$PREFIX.*
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -33,6 +33,10 @@ after_build:
   - xcopy %BUILD%\gui\release\redtimer.exe %DIST%
   - xcopy %BUILD%\cli\release\redtimercli.exe %DIST%
   - xcopy %BUILD%\libqtredmine\release\qtredmine.dll %DIST%
+  # Copy SSL libraries
+  - 7z x deploy\openssl-*-win32.zip -oopenssl
+  - xcopy openssl\libeay32.dll %DIST%
+  - xcopy openssl\ssleay32.dll %DIST%
   # Copy Qt libraries
   - xcopy %QTDIR%\bin\libEGL.dll %DIST%
   - xcopy %QTDIR%\bin\libgcc_s_dw2-1.dll %DIST%

diff --git a/.travis/debian/copyright → deploy/debian/copyright b/.travis/debian/copyright → deploy/debian/copyright
diff --git a/.travis/deploy.linux.sh → deploy/deploy.linux.sh b/.travis/deploy.linux.sh → deploy/deploy.linux.sh
@@ -22,11 +22,11 @@ mkdir -p dist/opt/redtimer
 cp gui/redtimer dist/opt/redtimer
 cp cli/redtimercli dist/opt/redtimer
 cp gui/icons/clock_red.svg dist/opt/redtimer/redtimer.svg
-cp .travis/redtimer.desktop dist/opt/redtimer
+cp deploy/redtimer.desktop dist/opt/redtimer
 
 # Create AppImage
-.travis/linuxdeployqt.AppImage dist/opt/redtimer/redtimercli -qmldir=gui/qml -verbose=2
-.travis/linuxdeployqt.AppImage dist/opt/redtimer/redtimer -qmldir=gui/qml -appimage -bundle-non-qt-libs -verbose=2
+deploy/linuxdeployqt.AppImage dist/opt/redtimer/redtimercli -qmldir=gui/qml -verbose=2
+deploy/linuxdeployqt.AppImage dist/opt/redtimer/redtimer -qmldir=gui/qml -appimage -bundle-non-qt-libs -verbose=2
 
 mv dist/opt/redtimer.AppImage $PREFIX.AppImage
 

diff --git a/.travis/deploy.osx.sh → deploy/deploy.osx.sh b/.travis/deploy.osx.sh → deploy/deploy.osx.sh
diff --git a/.travis/linuxdeployqt-3-x86_64.AppImage → deploy/linuxdeployqt-3-x86_64.AppImage b/.travis/linuxdeployqt-3-x86_64.AppImage → deploy/linuxdeployqt-3-x86_64.AppImage
diff --git a/.travis/linuxdeployqt.AppImage → deploy/linuxdeployqt.AppImage b/.travis/linuxdeployqt.AppImage → deploy/linuxdeployqt.AppImage
diff --git a/.travis/macdeployqtfix → deploy/macdeployqtfix b/.travis/macdeployqtfix → deploy/macdeployqtfix
diff --git a/deploy/openssl-1.0.2k-i386-win32.zip b/deploy/openssl-1.0.2k-i386-win32.zip
diff --git a/.travis/redtimer.desktop → deploy/redtimer.desktop b/.travis/redtimer.desktop → deploy/redtimer.desktop
diff --git a/redtimer.pro b/redtimer.pro
@@ -15,7 +15,7 @@ gui.depends = libredtimer
 libredtimer.depends = libqtredmine
 
 DISTFILES += \
-    .travis/* \
+    deploy/* \
     docs/* \
     images/* \
     .travis.yml \