Skip to content

Commit d709521

Browse files
committed
Fixed packaging for 1.4.0
1 parent fc75ab3 commit d709521

File tree

4 files changed

+23
-2
lines changed

4 files changed

+23
-2
lines changed

Makefile.am

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11
ACLOCAL_AMFLAGS = -I config
22

33
SUBDIRS = src doc
4+
45
DIST_SUBDIRS = src doc
6+
7+
EXTRA_DIST = \
8+
builds/android/Android.mk \
9+
builds/android/Application.mk \
10+
builds/android/build.sh \
11+
builds/android/clean.sh \
12+
builds/mingw32/Makefile.mingw32 \
13+
builds/mingw32/platform.h \
14+
builds/msvc/czmq11.sln \
15+
builds/msvc/czmq_selftest.vcproj \
16+
builds/msvc/czmq_selftest.vcxproj \
17+
builds/msvc/czmq_selftest.vcxproj.filters \
18+
builds/msvc/czmq.sln \
19+
builds/msvc/czmq.vcproj \
20+
builds/msvc/czmq.vcxproj \
21+
builds/msvc/czmq.vcxproj.filters \
22+
builds/msvc/README.txt

builds/msvc/Makefile.am

Lines changed: 0 additions & 1 deletion
This file was deleted.

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,5 +226,5 @@ AC_TYPE_SIGNAL
226226
AC_CHECK_FUNCS(perror gettimeofday memset getifaddrs freeifaddrs)
227227

228228
# Specify output files
229-
AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile builds/msvc/Makefile src/libczmq.pc])
229+
AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile src/libczmq.pc])
230230
AC_OUTPUT

doc/zhash.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,10 @@ EXAMPLE
163163
assert (streq (item, "dead beef"));
164164
zhash_destroy (&copy);
165165

166+
// Test foreach
167+
assert (0 == zhash_foreach (hash, test_foreach, hash));
168+
assert (-1 == zhash_foreach (hash, test_foreach_error, hash));
169+
166170
// Test save and load
167171
zhash_save (hash, ".cache");
168172
copy = zhash_new ();

0 commit comments

Comments
 (0)