diff --git a/CMakeLists.txt b/CMakeLists.txt index 1621382e..fe18b47b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -885,12 +885,6 @@ set(CPACK_SOURCE_IGNORE_FILES $(CPACK_SOURCE_IGNORE_FILES) ".git" "build" "tgz" # Most people are more used to "make dist" compared to "make package_source" add_custom_target(dist COMMAND "${CMAKE_MAKE_PROGRAM}" package_source) -# =========================================================================== -# Windows installer - -set(CPACK_NSIS_DISPLAY_NAME "bob") -# =========================================================================== - include(UseRPMTools) if (RPMTools_FOUND) RPMTools_ADD_RPM_TARGETS(libwebsockets libwebsockets.spec) diff --git a/appveyor.yml b/appveyor.yml index 8e469eb5..be4737d1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,6 +17,7 @@ install: - appveyor DownloadFile http://slproweb.com/download/Win32OpenSSL-1_0_2.exe - Win32OpenSSL-1_0_2.exe /silent /verysilent /sp- /suppressmsgboxes - cinst nsis + - SET PATH=C:\Program Files\NSIS\;%PATH% build: build_script: @@ -28,7 +29,7 @@ build_script: after_build: - cd .. - cd win32port - - 'C:\Program Files\NSIS\makensis.exe -DVERSION=%APPVEYOR_BUILD_VERSION% libwebsockets.nsi' + - makensis -DVERSION=%APPVEYOR_BUILD_VERSION% libwebsockets.nsi artifacts: @@ -38,3 +39,5 @@ artifacts: cache: - C:\OpenSSL-Win32 +matrix: + fast_finish: true diff --git a/win32port/libwebsockets.nsi b/win32port/libwebsockets.nsi index b23026a6..12e85c0c 100644 --- a/win32port/libwebsockets.nsi +++ b/win32port/libwebsockets.nsi @@ -1,6 +1,5 @@ ; NSIS installer script for libwebsockets -SetCompressor !include "MUI.nsh" Name "libwebsockets" @@ -36,10 +35,10 @@ Section "Files" SecInstall SetOutPath "$INSTDIR" File "..\libwebsockets-api-doc.html" File "..\LICENSE" - File "..\README" - File "..\README.build" - File "..\README.coding" - File "..\README.test-apps" + File "..\README.md" + File "..\README.build.md" + File "..\README.coding.md" + File "..\README.test-apps.md" File "..\build\bin\Release\libwebsockets-test-client.exe" File "..\build\bin\Release\libwebsockets-test-echo.exe" File "..\build\bin\Release\libwebsockets-test-fraggle.exe" @@ -52,8 +51,8 @@ Section "Files" SecInstall File "..\build\bin\share\libwebsockets-test-server\favicon.ico" File "..\build\bin\share\libwebsockets-test-server\leaf.jpg" File "..\build\bin\share\libwebsockets-test-server\libwebsockets.org-logo.png" - File "..\build\bin\share\libwebsockets-test-server\libwebsockets-test-server.key.pem" - File "..\build\bin\share\libwebsockets-test-server\libwebsockets-test-server.pem" + #File "..\build\bin\share\libwebsockets-test-server\libwebsockets-test-server.key.pem" + #File "..\build\bin\share\libwebsockets-test-server\libwebsockets-test-server.pem" File "..\build\bin\share\libwebsockets-test-server\test.html" SetOutPath "$INSTDIR\lib" @@ -77,10 +76,10 @@ SectionEnd Section "Uninstall" Delete "$INSTDIR\libwebsockets-api-doc.html" Delete "$INSTDIR\LICENSE" - Delete "$INSTDIR\README" - Delete "$INSTDIR\README.build" - Delete "$INSTDIR\README.coding" - Delete "$INSTDIR\README.test-apps" + Delete "$INSTDIR\README.md" + Delete "$INSTDIR\README.build.md" + Delete "$INSTDIR\README.coding.md" + Delete "$INSTDIR\README.test-apps.md" Delete "$INSTDIR\libwebsockets-test-client.exe" Delete "$INSTDIR\libwebsockets-test-echo.exe" Delete "$INSTDIR\libwebsockets-test-fraggle.exe" @@ -92,8 +91,8 @@ Section "Uninstall" Delete "$INSTDIR\libwebsockets-test-server\favicon.ico" Delete "$INSTDIR\libwebsockets-test-server\leaf.jpg" Delete "$INSTDIR\libwebsockets-test-server\libwebsockets.org-logo.png" - Delete "$INSTDIR\libwebsockets-test-server\libwebsockets-test-server.key.pem" - Delete "$INSTDIR\libwebsockets-test-server\libwebsockets-test-server.pem" + #Delete "$INSTDIR\libwebsockets-test-server\libwebsockets-test-server.key.pem" + #Delete "$INSTDIR\libwebsockets-test-server\libwebsockets-test-server.pem" Delete "$INSTDIR\libwebsockets-test-server\test.html" RMDir "$INSTDIR\libwebsockets-test-server"