summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL2
-rw-r--r--SConstruct9
-rw-r--r--devtools/flocktest.ini2
-rw-r--r--valgrind-audit.py.in (renamed from valgrind-audit.in)0
-rw-r--r--www/hacking.html20
5 files changed, 21 insertions, 12 deletions
diff --git a/INSTALL b/INSTALL
index fa677a23..59c104f3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -59,6 +59,8 @@ For working with DBUS, you'll need the DBUS development
headers and libraries installed. Under Debian/Ubuntu these
are the packages libdbus-1-dev and libdbus-glib-1-dev.
+Under Ubuntu, the ncurses package you want is libncurses5-dev.
+
For building from the source tree, or if you change the man page
source, xslt and docbook xsl style files are used to generate nroff
-man source from docbook xml. The following packages are used in this
diff --git a/SConstruct b/SConstruct
index e143cc10..d39e1b22 100644
--- a/SConstruct
+++ b/SConstruct
@@ -854,11 +854,11 @@ def substituter(target, source, env):
with open(str(target[0]), "w") as tfp:
tfp.write(content)
for fn in ("packaging/rpm/gpsd.spec.in", "libgps.pc.in", "libgpsd.pc.in",
- "jsongen.py.in", "maskaudit.py.in", "valgrind-audit.in"):
+ "jsongen.py.in", "maskaudit.py.in", "valgrind-audit.py.in"):
builder = env.Command(source=fn, target=fn[:-3], action=substituter)
- post1 = env.AddPostAction(builder, 'chmod -w $TARGET')
+ env.AddPostAction(builder, 'chmod -w $TARGET')
if fn.endswith(".py.in"):
- env.AddPostAction(post1, 'chmod +x $TARGET')
+ env.AddPostAction(builder, 'chmod +x $TARGET')
# Documentation
@@ -1157,6 +1157,9 @@ bits_regress = Utility('bits-regress', [test_bits], [
'$SRCDIR/test_bits'
])
+# Run a valgrind audit on the daemon - not in normal tests
+valgrind_audit = Utility('valgrind-audit', ['valgrind-audit.py'], 'valgrind-audit.py')
+
# Run all normal regression tests
check = env.Alias('check', [
python_compilation_regress,
diff --git a/devtools/flocktest.ini b/devtools/flocktest.ini
index cfe79da4..2013b5bc 100644
--- a/devtools/flocktest.ini
+++ b/devtools/flocktest.ini
@@ -14,7 +14,7 @@
[DEFAULT]
project = GPSD
origin = git://git.berlios.de/gpsd
-regression = scons -c && scons check
+regression = scons --config=force -c && scons --config=force && scons check
#
# In each site section, the section name is the FQDN of the host machine.
# The attributes are:
diff --git a/valgrind-audit.in b/valgrind-audit.py.in
index 3f76e813..3f76e813 100644
--- a/valgrind-audit.in
+++ b/valgrind-audit.py.in
diff --git a/www/hacking.html b/www/hacking.html
index b128f0c6..1354ba45 100644
--- a/www/hacking.html
+++ b/www/hacking.html
@@ -1408,11 +1408,16 @@ used for rollover checks with 'scons leapseconds.cache' Note: This will
require Internet access, and fail (leaving the existing leap-second
list in place) if that is not available.</dd>
-<dt>6. Update the NEWS file</dt>
+<dt>6. Fix compiler and scan-build warnings.</dt>
+<dd>Look for compiler and <a
+href="http://devel.recluse.de/~bzed/scan-build/gpsd/">scan-build</a>
+warnings and fix them.</dd>
+
+<dt>7. Update the NEWS file</dt>
<dd>Make sure the topmost entry in the changelog portion of
gpsd.spec.in is up-to-date and properly timestamped.</dd>
-<dt>7. Run the regression tests and other checks</dt>
+<dt>8. Run the regression tests and other checks</dt>
<dd>If it doesn't pass regressions, it isn't ready to ship.
<ol>
<li>scons testbuild</li>
@@ -1420,27 +1425,26 @@ gpsd.spec.in is up-to-date and properly timestamped.</dd>
<li>scons splint</li>
<li>scons cppcheck</li>
<li>scons xmllint</li>
-<li>devtools/valgrind-audit</li>
+<li>scons valgrind-audit</li>
<li>devtools/flockest</li>
-<li><a href="http://devel.recluse.de/~bzed/scan-build/gpsd/">scan-build</a></li>
</ol>
</dd>
-<dt>8. Ship to Berlios</dt>
+<dt>9. Ship to Berlios</dt>
<dd>Make the tarball (scons dist) and upload to berlios.de (make upload-ftp),
and do Berlios's
<a href="https://developer.berlios.de/project/admin/?group_id=2116">release procedure</a>.</dd>
-<dt>9. Tag the release in git</dt>
+<dt>10. Tag the release in git</dt>
<dd>Doing 'make release-tag' should accomplish this. The tag push
will trigger mail to the announce list.</dd>
-<dt>10. Bump the release number and push that commit</dt>
+<dt>11. Bump the release number and push that commit</dt>
<dd>Bump the release number in configure.ac, adding a '~dev' suffix
so tarball instances pulled from the repo will be clearly
distinguishable from the next public release.</dd>
-<dt>11. Announce the release</dt>
+<dt>12. Announce the release</dt>
<dd>Announce the release, and the resumption of regular commits, on
the dev list.</dd>
</dl>