Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-30 00:00:16 +01:00
Code Issues Releases Wiki Activity

Subject: [PATCH] Windows installer related fixes.

Browse source 
Remove incorrectly committed cpack changes.
Fix call to makensis.
Update README filenames.
This commit is contained in:
Roger A. Light 2015-03-10 16:53:16 +00:00 • committed by Andy Green
parent ec86b4e6c4
commit 1677ca52ca
3 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -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" # Most people are more used to "make dist" compared to "make package_source"
add_custom_target(dist COMMAND "${CMAKE_MAKE_PROGRAM}" package_source) add_custom_target(dist COMMAND "${CMAKE_MAKE_PROGRAM}" package_source)
# ===========================================================================
# Windows installer
set(CPACK_NSIS_DISPLAY_NAME "bob")
# ===========================================================================
include(UseRPMTools) include(UseRPMTools)
if (RPMTools_FOUND) if (RPMTools_FOUND)
RPMTools_ADD_RPM_TARGETS(libwebsockets libwebsockets.spec) RPMTools_ADD_RPM_TARGETS(libwebsockets libwebsockets.spec)

5
appveyor.yml
View file

@ -17,6 +17,7 @@ install:
- appveyor DownloadFile http://slproweb.com/download/Win32OpenSSL-1_0_2.exe - appveyor DownloadFile http://slproweb.com/download/Win32OpenSSL-1_0_2.exe
- Win32OpenSSL-1_0_2.exe /silent /verysilent /sp- /suppressmsgboxes - Win32OpenSSL-1_0_2.exe /silent /verysilent /sp- /suppressmsgboxes
- cinst nsis - cinst nsis
- SET PATH=C:\Program Files\NSIS\;%PATH%
build: build:
build_script: build_script:
@ -28,7 +29,7 @@ build_script:
after_build: after_build:
- cd .. - cd ..
- cd win32port - cd win32port
- 'C:\Program Files\NSIS\makensis.exe -DVERSION=%APPVEYOR_BUILD_VERSION% libwebsockets.nsi' - makensis -DVERSION=%APPVEYOR_BUILD_VERSION% libwebsockets.nsi
artifacts: artifacts:
@ -38,3 +39,5 @@ artifacts:
cache: cache:
- C:\OpenSSL-Win32 - C:\OpenSSL-Win32
matrix:
fast_finish: true

25
win32port/libwebsockets.nsi
View file

@ -1,6 +1,5 @@
; NSIS installer script for libwebsockets ; NSIS installer script for libwebsockets
SetCompressor
!include "MUI.nsh" !include "MUI.nsh"
Name "libwebsockets" Name "libwebsockets"
@ -36,10 +35,10 @@ Section "Files" SecInstall
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File "..\libwebsockets-api-doc.html" File "..\libwebsockets-api-doc.html"
File "..\LICENSE" File "..\LICENSE"
File "..\README" File "..\README.md"
File "..\README.build" File "..\README.build.md"
File "..\README.coding" File "..\README.coding.md"
File "..\README.test-apps" File "..\README.test-apps.md"
File "..\build\bin\Release\libwebsockets-test-client.exe" File "..\build\bin\Release\libwebsockets-test-client.exe"
File "..\build\bin\Release\libwebsockets-test-echo.exe" File "..\build\bin\Release\libwebsockets-test-echo.exe"
File "..\build\bin\Release\libwebsockets-test-fraggle.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\favicon.ico"
File "..\build\bin\share\libwebsockets-test-server\leaf.jpg" 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.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.key.pem"
File "..\build\bin\share\libwebsockets-test-server\libwebsockets-test-server.pem" #File "..\build\bin\share\libwebsockets-test-server\libwebsockets-test-server.pem"
File "..\build\bin\share\libwebsockets-test-server\test.html" File "..\build\bin\share\libwebsockets-test-server\test.html"
SetOutPath "$INSTDIR\lib" SetOutPath "$INSTDIR\lib"
@ -77,10 +76,10 @@ SectionEnd
Section "Uninstall" Section "Uninstall"
Delete "$INSTDIR\libwebsockets-api-doc.html" Delete "$INSTDIR\libwebsockets-api-doc.html"
Delete "$INSTDIR\LICENSE" Delete "$INSTDIR\LICENSE"
Delete "$INSTDIR\README" Delete "$INSTDIR\README.md"
Delete "$INSTDIR\README.build" Delete "$INSTDIR\README.build.md"
Delete "$INSTDIR\README.coding" Delete "$INSTDIR\README.coding.md"
Delete "$INSTDIR\README.test-apps" Delete "$INSTDIR\README.test-apps.md"
Delete "$INSTDIR\libwebsockets-test-client.exe" Delete "$INSTDIR\libwebsockets-test-client.exe"
Delete "$INSTDIR\libwebsockets-test-echo.exe" Delete "$INSTDIR\libwebsockets-test-echo.exe"
Delete "$INSTDIR\libwebsockets-test-fraggle.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\favicon.ico"
Delete "$INSTDIR\libwebsockets-test-server\leaf.jpg" Delete "$INSTDIR\libwebsockets-test-server\leaf.jpg"
Delete "$INSTDIR\libwebsockets-test-server\libwebsockets.org-logo.png" 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.key.pem"
Delete "$INSTDIR\libwebsockets-test-server\libwebsockets-test-server.pem" #Delete "$INSTDIR\libwebsockets-test-server\libwebsockets-test-server.pem"
Delete "$INSTDIR\libwebsockets-test-server\test.html" Delete "$INSTDIR\libwebsockets-test-server\test.html"
RMDir "$INSTDIR\libwebsockets-test-server" RMDir "$INSTDIR\libwebsockets-test-server"