d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed $SYS/broker/changeset.

Browse Source
This commit is contained in:
Roger A. Light 2014-06-23 18:37:15 +01:00
parent 480d8a08d0
commit 19056e6d4c
6 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.txt
View File

@ -35,6 +35,8 @@ Broker:
after a SIGHUP. after a SIGHUP.
- mosquitto_passwd now supports -b (batch mode) to allow the password to be - mosquitto_passwd now supports -b (batch mode) to allow the password to be
provided at the command line. provided at the command line.
- Removed $SYS/broker/changeset. This was intended for use with debugging, but
in practice is of no use.
Clients: Clients:
- Both clients can now load default configuration options from a file. - Both clients can now load default configuration options from a file.

3
Makefile
View File

@ -49,9 +49,8 @@ uninstall :
dist : reallyclean dist : reallyclean
set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done
echo $$(hg log -r . --template "{node}") > changeset
mkdir -p dist/mosquitto-${VERSION} mkdir -p dist/mosquitto-${VERSION}
cp -r client changeset examples installer lib logo man misc security service src test ChangeLog.txt CMakeLists.txt LICENSE.txt LICENSE-3rd-party.txt Makefile compiling.txt config.h config.mk readme.txt readme-windows.txt mosquitto.conf aclfile.example pskfile.example pwfile.example dist/mosquitto-${VERSION}/ cp -r client examples installer lib logo man misc security service src test ChangeLog.txt CMakeLists.txt LICENSE.txt LICENSE-3rd-party.txt Makefile compiling.txt config.h config.mk readme.txt readme-windows.txt mosquitto.conf aclfile.example pskfile.example pwfile.example dist/mosquitto-${VERSION}/
cd dist; tar -zcf mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}/ cd dist; tar -zcf mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}/
set -e; for m in man/*.xml; \ set -e; for m in man/*.xml; \
do \ do \

1
changeset
View File

@ -1 +0,0 @@
b216c4246a7e9ff2be360ca2a7d102c5ea101f04

7
man/mosquitto.8.xml
View File

@ -102,13 +102,6 @@
started.</para> started.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><option>$SYS/broker/changeset</option></term>
<listitem>
<para>The repository changeset (revision) associated with
this build. Static.</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><option>$SYS/broker/clients/connected</option></term> <term><option>$SYS/broker/clients/connected</option></term>
<term><option>$SYS/broker/clients/active</option> (deprecated)</term> <term><option>$SYS/broker/clients/active</option> (deprecated)</term>

2
src/Makefile
View File

@ -10,7 +10,7 @@ mosquitto : mosquitto.o bridge.o conf.o context.o database.o logging.o loop.o me
${CROSS_COMPILE}${CC} $^ -o $@ ${LDFLAGS} $(BROKER_LIBS) ${CROSS_COMPILE}${CC} $^ -o $@ ${LDFLAGS} $(BROKER_LIBS)
mosquitto.o : mosquitto.c mosquitto_broker.h mosquitto.o : mosquitto.c mosquitto_broker.h
${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ -DCHANGESET=\"$$(cat ../changeset)\" ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@
bridge.o : bridge.c mosquitto_broker.h bridge.o : bridge.c mosquitto_broker.h
${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@

4
src/mosquitto.c
View File

@ -254,10 +254,6 @@ int main(int argc, char *argv[])
mqtt3_db_messages_easy_queue(&int_db, NULL, "$SYS/broker/version", 2, strlen(buf), buf, 1); mqtt3_db_messages_easy_queue(&int_db, NULL, "$SYS/broker/version", 2, strlen(buf), buf, 1);
snprintf(buf, 1024, "%s", TIMESTAMP); snprintf(buf, 1024, "%s", TIMESTAMP);
mqtt3_db_messages_easy_queue(&int_db, NULL, "$SYS/broker/timestamp", 2, strlen(buf), buf, 1); mqtt3_db_messages_easy_queue(&int_db, NULL, "$SYS/broker/timestamp", 2, strlen(buf), buf, 1);
#ifdef CHANGESET
snprintf(buf, 1024, "%s", CHANGESET);
mqtt3_db_messages_easy_queue(&int_db, NULL, "$SYS/broker/changeset", 2, strlen(buf), buf, 1);
#endif
} }
#endif #endif