Permalink
Browse files

Merge branch 'fixes'

  • Loading branch information...
2 parents bf959ef + 2d0af73 commit 91bfd82491f90e24b6fe9c036f0b04a1f5c14a89 @ralight ralight committed Jun 2, 2016
Showing with 579 additions and 693 deletions.
  1. +17 −7 .travis.yml
  2. +7 −7 CMakeLists.txt
  3. +46 −63 CONTRIBUTING.md
  4. +48 −1 ChangeLog.txt
  5. +2 −2 client/CMakeLists.txt
  6. +12 −0 client/client_shared.c
  7. +4 −1 config.h
  8. +1 −1 config.mk
  9. +1 −1 installer/mosquitto-cygwin.nsi
  10. +1 −1 installer/mosquitto.nsi
  11. +2 −2 lib/CMakeLists.txt
  12. +2 −2 lib/cpp/CMakeLists.txt
  13. +18 −17 lib/mosquitto.c
  14. +1 −1 lib/mosquitto.h
  15. +8 −2 lib/mosquitto_internal.h
  16. +14 −9 lib/net_mosq.c
  17. +12 −2 lib/read_handle_shared.c
  18. +7 −7 lib/send_mosq.c
  19. +14 −7 lib/thread_mosq.c
  20. +30 −7 lib/util_mosq.c
  21. +12 −6 man/mosquitto.conf.5.xml
  22. +2 −6 misc/currentcost/gnome-panel/CurrentCostMQTT.py
  23. +2 −0 mosquitto.conf
  24. +1 −1 set-version.sh
  25. +4 −4 src/CMakeLists.txt
  26. +1 −1 src/bridge.c
  27. +15 −180 src/conf.c
  28. +1 −1 src/context.c
  29. +1 −1 src/database.c
  30. +1 −0 src/mosquitto_passwd.c
  31. +23 −13 src/net.c
  32. +24 −15 src/persist.c
  33. +2 −1 src/read_handle_server.c
  34. +2 −2 src/security_default.c
  35. +3 −3 src/subs.c
  36. +1 −1 src/sys_tree.c
  37. +4 −1 src/websockets.c
  38. +0 −4 test/broker/01-connect-anon-denied.py
  39. +0 −4 test/broker/01-connect-invalid-id-0-311.py
  40. +0 −4 test/broker/01-connect-invalid-id-0.py
  41. +0 −4 test/broker/01-connect-invalid-id-missing.py
  42. +0 −4 test/broker/01-connect-invalid-protonum.py
  43. +0 −5 test/broker/01-connect-success.py
  44. +0 −4 test/broker/01-connect-uname-no-password-denied.py
  45. +0 −4 test/broker/01-connect-uname-password-denied.py
  46. +0 −4 test/broker/01-connect-uname-password-success-no-tls.py
  47. +0 −4 test/broker/01-connect-uname-password-success.py
  48. +0 −4 test/broker/02-subpub-qos0.py
  49. +0 −4 test/broker/02-subpub-qos1.py
  50. +0 −4 test/broker/02-subpub-qos2.py
  51. +0 −3 test/broker/02-subscribe-qos0.py
  52. +0 −4 test/broker/02-subscribe-qos1.py
  53. +0 −4 test/broker/02-subscribe-qos2.py
  54. +0 −4 test/broker/02-unsubscribe-qos0.py
  55. +0 −4 test/broker/02-unsubscribe-qos1.py
  56. +0 −4 test/broker/02-unsubscribe-qos2.py
  57. +1 −5 test/broker/03-pattern-matching-helper.py
  58. +0 −1 test/broker/03-pattern-matching.py
  59. +0 −4 test/broker/03-publish-b2c-disconnect-qos1-helper.py
  60. +0 −2 test/broker/03-publish-b2c-disconnect-qos1.py
  61. +0 −4 test/broker/03-publish-b2c-disconnect-qos2-helper.py
  62. +0 −3 test/broker/03-publish-b2c-disconnect-qos2.py
  63. +1 −5 test/broker/03-publish-b2c-timeout-qos1-helper.py
  64. +0 −3 test/broker/03-publish-b2c-timeout-qos1.py
  65. +0 −4 test/broker/03-publish-b2c-timeout-qos2-helper.py
  66. +0 −3 test/broker/03-publish-b2c-timeout-qos2.py
  67. +0 −5 test/broker/03-publish-c2b-disconnect-qos2.py
  68. +0 −4 test/broker/03-publish-c2b-timeout-qos2.py
  69. +0 −4 test/broker/03-publish-qos1.py
  70. +0 −4 test/broker/03-publish-qos2.py
  71. +0 −2 test/broker/04-retain-qos0-clear.py
  72. +0 −4 test/broker/04-retain-qos0-fresh.py
  73. +0 −4 test/broker/04-retain-qos0-repeated.py
  74. +0 −4 test/broker/04-retain-qos0.py
  75. +0 −4 test/broker/04-retain-qos1-qos0.py
  76. +1 −5 test/broker/05-clean-session-qos1-helper.py
  77. +0 −2 test/broker/05-clean-session-qos1.py
  78. +0 −3 test/broker/06-bridge-b2br-disconnect-qos1.py
  79. +0 −3 test/broker/06-bridge-b2br-disconnect-qos2.py
  80. +0 −4 test/broker/06-bridge-br2b-disconnect-qos1-helper.py
  81. +0 −2 test/broker/06-bridge-br2b-disconnect-qos1.py
  82. +0 −4 test/broker/06-bridge-br2b-disconnect-qos2-helper.py
  83. +0 −2 test/broker/06-bridge-br2b-disconnect-qos2.py
  84. +11 −0 test/broker/06-bridge-fail-persist-resend-qos1.conf
  85. +77 −0 test/broker/06-bridge-fail-persist-resend-qos1.py
  86. +11 −0 test/broker/06-bridge-fail-persist-resend-qos2.conf
  87. +90 −0 test/broker/06-bridge-fail-persist-resend-qos2.py
  88. +1 −5 test/broker/06-bridge-reconnect-local-out-helper.py
  89. +0 −2 test/broker/06-bridge-reconnect-local-out.py
  90. +1 −6 test/broker/07-will-null-helper.py
  91. +0 −3 test/broker/07-will-null-topic.py
  92. +0 −4 test/broker/07-will-null.py
  93. +1 −5 test/broker/07-will-qos0-helper.py
  94. +0 −2 test/broker/07-will-qos0.py
  95. +1 −5 test/broker/08-ssl-bridge-helper.py
  96. +0 −2 test/broker/08-ssl-bridge.py
  97. +1 −3 test/broker/08-ssl-connect-cert-auth-crl.py
  98. +1 −2 test/broker/08-ssl-connect-cert-auth-expired.py
  99. +1 −2 test/broker/08-ssl-connect-cert-auth-revoked.py
  100. +1 −3 test/broker/08-ssl-connect-cert-auth-without.py
  101. +1 −3 test/broker/08-ssl-connect-cert-auth.py
  102. +1 −2 test/broker/08-ssl-connect-identity.py
  103. +2 −3 test/broker/08-ssl-connect-no-auth-wrong-ca.py
  104. +1 −3 test/broker/08-ssl-connect-no-auth.py
  105. +1 −2 test/broker/08-ssl-connect-no-identity.py
  106. +1 −3 test/broker/08-tls-psk-bridge.py
  107. +1 −4 test/broker/08-tls-psk-pub.py
  108. +0 −4 test/broker/09-plugin-auth-unpwd-fail.py
  109. +0 −4 test/broker/09-plugin-auth-unpwd-success.py
  110. +1 −5 test/broker/10-listener-mount-point-helper.py
  111. +0 −3 test/broker/10-listener-mount-point.py
  112. +2 −0 test/broker/Makefile
  113. +0 −2 test/lib/01-con-discon-success.py
  114. +0 −1 test/lib/01-keepalive-pingreq.py
  115. +0 −2 test/lib/01-no-clean-session.py
  116. +0 −2 test/lib/01-unpwd-set.py
  117. +0 −2 test/lib/01-will-set.py
  118. +0 −2 test/lib/01-will-unpwd-set.py
  119. +2 −4 test/lib/02-subscribe-qos0.py
  120. +2 −4 test/lib/02-subscribe-qos1.py
  121. +2 −4 test/lib/02-subscribe-qos2.py
  122. +2 −4 test/lib/02-unsubscribe.py
  123. +0 −1 test/lib/03-publish-b2c-qos1.py
  124. +0 −1 test/lib/03-publish-b2c-qos2.py
  125. +0 −2 test/lib/03-publish-c2b-qos1-disconnect.py
  126. +0 −2 test/lib/03-publish-c2b-qos1-timeout.py
  127. +0 −2 test/lib/03-publish-c2b-qos2-disconnect.py
  128. +1 −3 test/lib/03-publish-c2b-qos2-timeout.py
  129. +1 −3 test/lib/03-publish-c2b-qos2.py
  130. +1 −3 test/lib/03-publish-qos0-no-payload.py
  131. +1 −3 test/lib/03-publish-qos0.py
  132. +1 −3 test/lib/04-retain-qos0.py
  133. +0 −4 test/lib/08-ssl-bad-cacert.py
  134. +0 −2 test/lib/08-ssl-connect-cert-auth-enc.py
  135. +0 −2 test/lib/08-ssl-connect-cert-auth.py
  136. +0 −2 test/lib/08-ssl-connect-no-auth.py
  137. +0 −1 test/lib/08-ssl-fake-cacert.py
  138. +0 −2 test/lib/09-util-topic-matching.py
  139. +0 −2 test/lib/09-util-topic-tokenise.py
  140. +7 −0 test/lib/c/09-util-topic-matching.c
  141. +2 −2 test/mosq_test.py
View
@@ -1,13 +1,23 @@
language: c
compiler:
- - gcc
- - clang
+ - gcc
+ - clang
+
os:
- - linux
- - osx
-script: make ; make test
+ - linux
+ - osx
+
+matrix:
+ allow_failures:
+ - os: osx
+
+script:
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make ; make test ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake . ; make ; make test ; fi
before_install:
- - sudo apt-get update -qq
- - sudo apt-get install -y debhelper libc-ares-dev libssl-dev libwrap0-dev python-all python3-all uthash-dev uuid-dev libuuid1 xsltproc docbook-xsl
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y debhelper libc-ares-dev libssl-dev libwrap0-dev python-all python3-all uthash-dev uuid-dev libuuid1 xsltproc docbook-xsl ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install c-ares openssl libwebsockets ; fi
View
@@ -11,7 +11,7 @@ project(mosquitto)
cmake_minimum_required(VERSION 2.8)
# Only for version 3 and up. cmake_policy(SET CMP0042 NEW)
-set (VERSION 1.4.8)
+set (VERSION 1.4.9)
if (WIN32)
execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP
@@ -37,18 +37,18 @@ if (WIN32)
else (WIN32)
set (BINDIR bin)
set (SBINDIR sbin)
- if (${CMAKE_INSTALL_PREFIX} STREQUAL /usr)
+ if ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
set (SYSCONFDIR /etc/mosquitto)
- else (${CMAKE_INSTALL_PREFIX} STREQUAL /usr)
+ else ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
set (SYSCONFDIR etc/mosquitto)
- endif (${CMAKE_INSTALL_PREFIX} STREQUAL /usr)
+ endif ("${CMAKE_INSTALL_PREFIX}" STREQUAL /usr)
set (LIBDIR lib${LIB_SUFFIX})
set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIBDIR}")
set (INCLUDEDIR include)
set (DATAROOTDIR share)
- set (MANDIR ${DATAROOTDIR}/man)
- set (SHAREDIR ${DATAROOTDIR}/mosquitto)
+ set (MANDIR "${DATAROOTDIR}/man")
+ set (SHAREDIR "${DATAROOTDIR}/mosquitto")
endif (WIN32)
option(WITH_TLS
@@ -92,4 +92,4 @@ add_subdirectory(man)
# Install config file
# ========================================
-install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION ${SYSCONFDIR})
+install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DESTINATION "${SYSCONFDIR}")
View
@@ -10,99 +10,82 @@ The Mosquitto project has been created to provide a light weight, open-source
implementation, of an MQTT broker to allow new, existing, and emerging
applications for Machine-to-Machine (M2M) and Internet of Things (IoT).
+- <http://mosquitto.org/>
- <https://projects.eclipse.org/projects/technology.mosquitto>
Source
------
-The Mosquitto code is stored in a git repository. The URL for anonymous access is:
+The Mosquitto code is stored in a git repository.
-- http://git.eclipse.org/gitroot/mosquitto/org.eclipse.mosquitto.git
+- http://github.com/eclipse/mosquitto
-Access via Gerrit (for code review) is through the following URLs:
+You can contribute bugfixes and new features by sending pull requests through GitHub.
-- ssh://username@git.eclipse.org:29418/mosquitto/org.eclipse.mosquitto
-- https://username@git.eclipse.org/r/mosquitto/org.eclipse.mosquitto
-A web browsable repository is available at
+## Legal
-- <http://git.eclipse.org/c/mosquitto/org.eclipse.mosquitto.git>
+In order for your contribution to be accepted, it must comply with the Eclipse
+Foundation IP policy.
-Contributing a patch
---------------------
-
-The Mosquitto repositories are accessed through Gerrit, the code review
-project, which makes it possible for anybody to clone the repository, make
-changes and push them back for review and eventual acceptance into the project.
-
-To do this, you must follow a few steps. The first of these are described at
-
-- <https://wiki.eclipse.org/Development_Resources/Contributing_via_Git>
-
-* Sign the Eclipse CLA
-* Use a valid commit record, including a signed-off-by entry.
+Please read the [Eclipse Foundation policy on accepting contributions via Git](http://wiki.eclipse.org/Development_Resources/Contributing_via_Git).
-There are further details at
+1. Sign the [Eclipse CLA](http://www.eclipse.org/legal/CLA.php)
+ 1. Register for an Eclipse Foundation User ID. You can register [here](https://dev.eclipse.org/site_login/createaccount.php).
+ 2. Log into the [Projects Portal](https://projects.eclipse.org/), and click on the '[Eclipse CLA](https://projects.eclipse.org/user/sign/cla)' link.
+2. Go to your [account settings](https://dev.eclipse.org/site_login/myaccount.php#open_tab_accountsettings) and add your GitHub username to your account.
+3. Make sure that you _sign-off_ your Git commits in the following format:
+ ``` Signed-off-by: John Smith <johnsmith@nowhere.com> ``` This is usually at the bottom of the commit message. You can automate this by adding the '-s' flag when you make the commits. e.g. ```git commit -s -m "Adding a cool feature"```
+4. Ensure that the email address that you make your commits with is the same one you used to sign up to the Eclipse Foundation website with.
-- <https://wiki.eclipse.org/Development_Resources/Handling_Git_Contributions>
+## Contributing a change
-If your contribution is a fix for a bug, please use the 'fixes' branch as the
-base for your work. If you are proposing new behaviour/features please use the
-'develop' branch.
-
-Once the patch is pushed back to Gerrit, the project committers will be
-informed and they will undertake a review of the code. The patch may need
-modifying for some reason. In order to make amending commits more
-straightforward, the steps at
-<https://git.eclipse.org/r/Documentation/cmd-hook-commit-msg.html> should be
-followed. This automatically inserts a "Change-Id" entry to your commit message
-which allows you to amend commits and have Gerrit track them as the same
-change.
+1. [Fork the repository on GitHub](https://github.com/eclipse/mosquitto/fork)
+2. Clone the forked repository onto your computer: ``` git clone
+ https://github.com/<your username>/mosquitto.git ```
+3. If you are adding a new feature, then create a new branch from the latest
+ ```develop``` branch with ```git checkout -b YOUR_BRANCH_NAME
+ origin/develop```
+4. If you are fixing a bug, then create a new branch from the latest
+ ```fixes``` branch with ```git checkout -b YOUR_BRANCH_NAME origin/fixes```
+5. Make your changes
+6. Ensure that all new and existing tests pass.
+7. Commit the changes into the branch: ``` git commit -s ``` Make sure that
+ your commit message is meaningful and describes your changes correctly.
+8. If you have a lot of commits for the change, squash them into a single / few
+ commits.
+9. Push the changes in your branch to your forked repository.
+10. Finally, go to
+ [https://github.com/eclipse/mosquitto](https://github.com/eclipse/mosquitto)
+ and create a pull request from your "YOUR_BRANCH_NAME" branch to the
+ ```develop``` or ```fixes``` branch as appropriate to request review and
+ merge of the commits in your pushed branch.
What happens next depends on the content of the patch. If it is 100% authored
by the contributor and is less than 1000 lines (and meets the needs of the
-project), then it can be committed to the main repository. If not, more steps
-are required. These are detailed in the legal process poster:
-
-- <http://www.eclipse.org/legal/EclipseLegalProcessPoster.pdf>
-
-Developer resources:
---------------------
+project), then it can be pulled into the main repository. If not, more steps
+are required. These are detailed in the
+[legal process poster](http://www.eclipse.org/legal/EclipseLegalProcessPoster.pdf).
-More information regarding source code management, builds, coding standards,
-and other topics can be found at.
-
-- <https://projects.eclipse.org/projects/technology.mosquitto/developer>
-
-
-Contributor License Agreement:
-------------------------------
-
-Before your contribution can be accepted by the project, you need to create and
-electronically sign the Eclipse Foundation Contributor License Agreement (CLA).
-
-- <http://www.eclipse.org/legal/CLA.php>
Contact:
--------
-Contact the project developers via the project's "dev" list.
-
-- <https://dev.eclipse.org/mailman/listinfo/mosquitto-dev>
-
+Contact the project developers via the project's development
+[mailing list](https://dev.eclipse.org/mailman/listinfo/mosquitto-dev).
Search for bugs:
----------------
-This project uses Bugzilla to track ongoing development and issues.
-
-- <https://bugs.eclipse.org/bugs/buglist.cgi?product=Mosquitto>
+This project uses [Github](https://github.com/eclipse/mosquitto/issues)
+to track ongoing development and issues.
Create a new bug:
-----------------
-Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
+Be sure to search for existing bugs before you create another one. Remember
+that contributions are always welcome!
-- <https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Mosquitto>
+- [Create new Paho bug](https://github.com/eclipse/mosquitto/issues)
View
@@ -1,4 +1,51 @@
-1.4.8 - 20150214
+1.4.9 - 20160603
+================
+
+Broker:
+- Ensure websockets clients that previously connected with clean session set
+ to false have their queued messages delivered immediately on reconnecting.
+ Closes #476314.
+- Reconnecting client with clean session set to false doesn't start with mid=1
+ again.
+- Will topic isn't truncated by one byte when using a mount_point any more.
+- Network errors are printed correctly on Windows.
+- Fix incorrect $SYS heap memory reporting when using ACLs.
+- Bridge config parameters couldn't contain a space, this has been fixed.
+ Closes #150.
+- Fix saving of persistence messages that start with a '/'. Closes #151.
+- Fix reconnecting for bridges that use TLS on Windows. Closes #154.
+- Broker and bridges can now cope with unknown incoming PUBACK, PUBREC,
+ PUBREL, PUBCOMP without disconnecting. Closes #57.
+- Fix websockets listeners not being able to bind to an IP address. Closes
+ #170.
+- mosquitto_passwd utility now correctly deals with unknown command line
+ arguments in all cases. Closes #169.
+- Fix publishing of $SYS/broker/clients/maximum
+- Fix order of #includes in lib/send_mosq.c to ensure struct mosquitto doesn't
+ differ between source files when websockets is being used. Closes #180.
+- Fix possible rare crash when writing out persistence file and a client has
+ incomplete messages inflight that it has been denied the right to publish.
+
+Client library:
+- Fix the case where a message received just before the keepalive timer
+ expired would cause the client to miss the keepalive timer.
+- Return value of pthread_create is now checked.
+- _mosquitto_destroy should not cancel threads that weren't created by
+ libmosquitto. Closes #166.
+- Clients can now cope with unknown incoming PUBACK, PUBREC, PUBREL, PUBCOMP
+ without disconnecting. Closes #57.
+- Fix mosquitto_topic_matches_sub() reporting matches on some invalid
+ subscriptions.
+
+Clients:
+- Handle some unchecked malloc() calls. Closes #1.
+
+Build:
+- Fix string quoting in CMakeLists.txt. Closes #4.
+- Fix building on Visual Studio 2015. Closes #136.
+
+
+1.4.8 - 20160214
================
Broker:
@@ -14,5 +14,5 @@ add_executable(mosquitto_sub sub_client.c ${shared_src})
target_link_libraries(mosquitto_pub libmosquitto)
target_link_libraries(mosquitto_sub libmosquitto)
-install(TARGETS mosquitto_pub RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR})
-install(TARGETS mosquitto_sub RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR})
+install(TARGETS mosquitto_pub RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
+install(TARGETS mosquitto_sub RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
@@ -115,6 +115,10 @@ int client_config_load(struct mosq_config *cfg, int pub_or_sub, int argc, char *
if(env){
len = strlen(env) + strlen("/mosquitto_pub") + 1;
loc = malloc(len);
+ if(!loc){
+ fprintf(stderr, "Error: Out of memory.\n");
+ return 1;
+ }
if(pub_or_sub == CLIENT_PUB){
snprintf(loc, len, "%s/mosquitto_pub", env);
}else{
@@ -126,6 +130,10 @@ int client_config_load(struct mosq_config *cfg, int pub_or_sub, int argc, char *
if(env){
len = strlen(env) + strlen("/.config/mosquitto_pub") + 1;
loc = malloc(len);
+ if(!loc){
+ fprintf(stderr, "Error: Out of memory.\n");
+ return 1;
+ }
if(pub_or_sub == CLIENT_PUB){
snprintf(loc, len, "%s/.config/mosquitto_pub", env);
}else{
@@ -142,6 +150,10 @@ int client_config_load(struct mosq_config *cfg, int pub_or_sub, int argc, char *
if(rc > 0 && rc < 1024){
len = strlen(env) + strlen("\\mosquitto_pub.conf") + 1;
loc = malloc(len);
+ if(!loc){
+ fprintf(stderr, "Error: Out of memory.\n");
+ return 1;
+ }
if(pub_or_sub == CLIENT_PUB){
snprintf(loc, len, "%s\\mosquitto_pub.conf", env);
}else{
View
@@ -11,8 +11,11 @@
*
* Generally for Windows native support.
* ============================================================ */
+#if defined(_MSC_VER) && _MSC_VER < 1900
+# define snprintf sprintf_s
+#endif
+
#ifdef WIN32
-#define snprintf sprintf_s
# ifndef strcasecmp
# define strcasecmp strcmpi
# endif
View
@@ -83,7 +83,7 @@ WITH_SOCKS:=yes
# Also bump lib/mosquitto.h, CMakeLists.txt,
# installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi
-VERSION=1.4.8
+VERSION=1.4.9
TIMESTAMP:=$(shell date "+%F %T%z")
# Client library SO version. Bump if incompatible API/ABI changes are made.
@@ -7,7 +7,7 @@
!define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
Name "mosquitto"
-!define VERSION 1.4.8
+!define VERSION 1.4.9
OutFile "mosquitto-${VERSION}-install-cygwin.exe"
InstallDir "$PROGRAMFILES\mosquitto"
@@ -9,7 +9,7 @@
!define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
Name "mosquitto"
-!define VERSION 1.4.8
+!define VERSION 1.4.9
OutFile "mosquitto-${VERSION}-install-win32.exe"
InstallDir "$PROGRAMFILES\mosquitto"
View
@@ -70,8 +70,8 @@ set_target_properties(libmosquitto PROPERTIES
SOVERSION 1
)
-install(TARGETS libmosquitto RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR})
-install(FILES mosquitto.h DESTINATION ${INCLUDEDIR})
+install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
+install(FILES mosquitto.h DESTINATION "${INCLUDEDIR}")
if (UNIX)
install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
@@ -10,8 +10,8 @@ set_target_properties(mosquittopp PROPERTIES
VERSION ${VERSION}
SOVERSION 1
)
-install(TARGETS mosquittopp RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR})
-install(FILES mosquittopp.h DESTINATION ${INCLUDEDIR})
+install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
+install(FILES mosquittopp.h DESTINATION "${INCLUDEDIR}")
if (UNIX)
install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
Oops, something went wrong.

0 comments on commit 91bfd82

Please sign in to comment.