diff options
| author | Roger A. Light <roger@atchoo.org> | 2015-03-10 16:53:16 +0000 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2015-03-11 08:48:39 +0800 |
| commit | 1677ca52ca92f749364bca95d72c32f81ef4e823 (patch) | |
| tree | 9b14a3703dc2270b3fe5d7c113bbe76db3a7003b /win32port | |
| parent | ec86b4e6c4b702f16e1de944ebb2eb1bfe4991a1 (diff) | |
| download | libwebsockets-1677ca52ca92f749364bca95d72c32f81ef4e823.tar.gz | |
Subject: [PATCH] Windows installer related fixes.
Remove incorrectly committed cpack changes.
Fix call to makensis.
Update README filenames.
Diffstat (limited to 'win32port')
| -rw-r--r-- | win32port/libwebsockets.nsi | 25 |
1 files changed, 12 insertions, 13 deletions
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" |