Skip to content

Commit

Permalink
Removed $SYS/broker/changeset.
Browse files Browse the repository at this point in the history
  • Loading branch information
ralight committed Jun 23, 2014
1 parent 480d8a0 commit 19056e6
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 15 deletions.
2 changes: 2 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ Broker:
after a SIGHUP.
- mosquitto_passwd now supports -b (batch mode) to allow the password to be
provided at the command line.
- Removed $SYS/broker/changeset. This was intended for use with debugging, but
in practice is of no use.

Clients:
- Both clients can now load default configuration options from a file.
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ uninstall :
dist : reallyclean
set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done

echo $$(hg log -r . --template "{node}") > changeset
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}/
set -e; for m in man/*.xml; \
do \
Expand Down
1 change: 0 additions & 1 deletion changeset

This file was deleted.

7 changes: 0 additions & 7 deletions man/mosquitto.8.xml
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,6 @@
started.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>$SYS/broker/changeset</option></term>
<listitem>
<para>The repository changeset (revision) associated with
this build. Static.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>$SYS/broker/clients/connected</option></term>
<term><option>$SYS/broker/clients/active</option> (deprecated)</term>
Expand Down
2 changes: 1 addition & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

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
${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@
Expand Down
4 changes: 0 additions & 4 deletions src/mosquitto.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
snprintf(buf, 1024, "%s", TIMESTAMP);
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

Expand Down

0 comments on commit 19056e6

Please sign in to comment.