diff options
-rw-r--r-- | SConstruct | 73 | ||||
-rw-r--r-- | man/gps.xml (renamed from gps.xml) | 0 | ||||
-rw-r--r-- | man/gps2udp.xml (renamed from gps2udp.xml) | 0 | ||||
-rw-r--r-- | man/gpscat.xml (renamed from gpscat.xml) | 0 | ||||
-rw-r--r-- | man/gpsctl.xml (renamed from gpsctl.xml) | 0 | ||||
-rw-r--r-- | man/gpsd.xml (renamed from gpsd.xml) | 0 | ||||
-rw-r--r-- | man/gpsd_json.xml (renamed from gpsd_json.xml) | 0 | ||||
-rw-r--r-- | man/gpsdctl.xml (renamed from gpsdctl.xml) | 0 | ||||
-rw-r--r-- | man/gpsdecode.xml (renamed from gpsdecode.xml) | 0 | ||||
-rw-r--r-- | man/gpsfake.xml (renamed from gpsfake.xml) | 0 | ||||
-rw-r--r-- | man/gpsinit.xml (renamed from gpsinit.xml) | 0 | ||||
-rw-r--r-- | man/gpsmon.xml (renamed from gpsmon.xml) | 0 | ||||
-rw-r--r-- | man/gpspipe.xml (renamed from gpspipe.xml) | 0 | ||||
-rw-r--r-- | man/gpsprof.xml (renamed from gpsprof.xml) | 0 | ||||
-rw-r--r-- | man/gpsrinex.xml (renamed from gpsrinex.xml) | 0 | ||||
-rw-r--r-- | man/gpxlogger.xml (renamed from gpxlogger.xml) | 0 | ||||
-rw-r--r-- | man/libgps.xml (renamed from libgps.xml) | 0 | ||||
-rw-r--r-- | man/libgpsmm.xml (renamed from libgpsmm.xml) | 0 | ||||
-rw-r--r-- | man/ntpshmmon.xml (renamed from ntpshmmon.xml) | 0 | ||||
-rw-r--r-- | man/ppscheck.xml (renamed from ppscheck.xml) | 0 | ||||
-rw-r--r-- | man/srec.xml (renamed from srec.xml) | 0 | ||||
-rw-r--r-- | man/ubxtool.xml (renamed from ubxtool.xml) | 0 | ||||
-rw-r--r-- | man/zerk.xml (renamed from zerk.xml) | 0 |
23 files changed, 38 insertions, 35 deletions
@@ -536,7 +536,7 @@ docbook_html_uri = docbook_url_stem + 'html/docbook.xsl' def CheckXsltproc(context): context.Message('Checking that xsltproc can make man pages... ') - ofp = open("xmltest.xml", "w") + ofp = open("man/xmltest.xml", "w") ofp.write(''' <refentry id="foo.1"> <refmeta> @@ -551,9 +551,9 @@ def CheckXsltproc(context): </refentry> ''') ofp.close() - probe = "xsltproc --nonet --noout '%s' xmltest.xml" % (docbook_man_uri,) + probe = "xsltproc --nonet --noout '%s' man/xmltest.xml" % (docbook_man_uri,) ret = context.TryAction(probe)[0] - os.remove("xmltest.xml") + os.remove("man/xmltest.xml") if os.path.exists("foo.1"): os.remove("foo.1") context.Result(ret) @@ -1416,10 +1416,10 @@ else: python_deps['test_maidenhead.py'] = 'clienthelpers' python_manpages = { - "gegps.1": "gps.xml", - "gpscat.1": "gpscat.xml", - "gpsfake.1": "gpsfake.xml", - "gpsprof.1": "gpsprof.xml", + "man/gegps.1": "man/gps.xml", + "man/gpscat.1": "man/gpscat.xml", + "man/gpsfake.1": "man/gpsfake.xml", + "man/gpsprof.1": "man/gpsprof.xml", } # check for pyserial @@ -1427,8 +1427,8 @@ else: imp.find_module('serial') python_progs.extend(["ubxtool", "zerk"]) python_manpages.update({ - "ubxtool.1": "ubxtool.xml", - "zerk.1": "zerk.xml", + "man/ubxtool.1": "man/ubxtool.xml", + "man/zerk.1": "man/zerk.xml", }) except ImportError: # no pyserial, reduced functionality in ubxtool and zerk @@ -1457,8 +1457,8 @@ else: if env['xgps']: python_progs.extend(["xgps", "xgpsspeed"]) python_manpages.update({ - "xgps.1": "gps.xml", - "xgpsspeed.1": "gps.xml", + "man/xgps.1": "man/gps.xml", + "man/xgpsspeed.1": "man/gps.xml", }) python_deps['xgps'] = 'clienthelpers' @@ -1745,34 +1745,34 @@ for fn in templated: # Documentation base_manpages = { - "cgps.1": "gps.xml", - "gps.1": "gps.xml", - "gps2udp.1": "gps2udp.xml", - "gpsctl.1": "gpsctl.xml", - "gpsd.8": "gpsd.xml", - "gpsdctl.8": "gpsdctl.xml", - "gpsdecode.1": "gpsdecode.xml", - "gpsd_json.5": "gpsd_json.xml", - "gpsinit.8": "gpsinit.xml", - "gpsmon.1": "gpsmon.xml", - "gpspipe.1": "gpspipe.xml", - "gpsrinex.1": "gpsrinex.xml", - "gpxlogger.1": "gpxlogger.xml", - "lcdgps.1": "gps.xml", - "libgps.3": "libgps.xml", - "libgpsmm.3": "libgpsmm.xml", - "libQgpsmm.3": "libgpsmm.xml", - "srec.5": "srec.xml", + "man/cgps.1": "man/gps.xml", + "man/gps.1": "man/gps.xml", + "man/gps2udp.1": "man/gps2udp.xml", + "man/gpsctl.1": "man/gpsctl.xml", + "man/gpsd.8": "man/gpsd.xml", + "man/gpsdctl.8": "man/gpsdctl.xml", + "man/gpsdecode.1": "man/gpsdecode.xml", + "man/gpsd_json.5": "man/gpsd_json.xml", + "man/gpsinit.8": "man/gpsinit.xml", + "man/gpsmon.1": "man/gpsmon.xml", + "man/gpspipe.1": "man/gpspipe.xml", + "man/gpsrinex.1": "man/gpsrinex.xml", + "man/gpxlogger.1": "man/gpxlogger.xml", + "man/lcdgps.1": "man/gps.xml", + "man/libgps.3": "man/libgps.xml", + "man/libgpsmm.3": "man/libgpsmm.xml", + "man/libQgpsmm.3": "man/libgpsmm.xml", + "man/srec.5": "man/srec.xml", } if env['pps'] and (env["timeservice"] or env["gpsdclients"]): base_manpages.update({ - "ntpshmmon.1": "ntpshmmon.xml", + "man/ntpshmmon.1": "man/ntpshmmon.xml", }) if tiocmiwait: base_manpages.update({ - "ppscheck.8": "ppscheck.xml", + "man/ppscheck.8": "man/ppscheck.xml", }) all_manpages = list(base_manpages.keys()) @@ -1942,7 +1942,8 @@ for manpage in all_manpages: if not manbuilder and not os.path.exists(manpage): continue section = manpage.split(".")[1] - dest = os.path.join(installdir('mandir'), "man" + section, manpage) + dest = os.path.join(installdir('mandir'), "man" + section, + os.path.basename(manpage)) maninstall.append(env.InstallAs(source=manpage, target=dest)) install = env.Alias('install', binaryinstall + maninstall + python_install + pc_install + headerinstall) @@ -1992,7 +1993,7 @@ Utility("scan-build", ["gpsd.h", "packet_names.h"], # Check the documentation for bogons, too -Utility("xmllint", glob.glob("*.xml"), +Utility("xmllint", glob.glob("man/*.xml"), "for xml in $SOURCES; do xmllint --nonet --noout --valid $$xml; done") # Use deheader to remove headers not required. If the statistics line @@ -2414,8 +2415,8 @@ for fn in glob.glob("www/*.in"): if htmlbuilder: # Manual pages - for xml in glob.glob("*.xml"): - env.HTML('www/%s.html' % xml[:-4], xml) + for xml in glob.glob("man/*.xml"): + env.HTML('www/%s.html' % os.path.basename(xml[:-4]), xml) # DocBook documents for stem in ['writing-a-driver', 'performance/performance', @@ -2529,6 +2530,8 @@ env.Clean(clean_misc, glob.glob('*.gcno') + glob.glob('*.gcda')) env.Clean(clean_misc, glob.glob('.coverage*') + ['htmlcov/']) # Clean Qt stuff env.Clean(clean_misc, ['libQgpsmm.prl', 'Qgpsmm.pc']) +# Clean old and new location man page files +env.Clean(clean_misc, glob.glob('*.[0-8]') + glob.glob('man/*.[0-8]')) # Other misc items env.Clean(clean_misc, ['config.log', 'contrib/ppscheck', 'contrib/clock_test', 'TAGS']) diff --git a/gps2udp.xml b/man/gps2udp.xml index b222b138..b222b138 100644 --- a/gps2udp.xml +++ b/man/gps2udp.xml diff --git a/gpscat.xml b/man/gpscat.xml index a22b6a84..a22b6a84 100644 --- a/gpscat.xml +++ b/man/gpscat.xml diff --git a/gpsctl.xml b/man/gpsctl.xml index b0f9f6c0..b0f9f6c0 100644 --- a/gpsctl.xml +++ b/man/gpsctl.xml diff --git a/gpsd_json.xml b/man/gpsd_json.xml index 1c868b61..1c868b61 100644 --- a/gpsd_json.xml +++ b/man/gpsd_json.xml diff --git a/gpsdctl.xml b/man/gpsdctl.xml index d47128c9..d47128c9 100644 --- a/gpsdctl.xml +++ b/man/gpsdctl.xml diff --git a/gpsdecode.xml b/man/gpsdecode.xml index b7368dc7..b7368dc7 100644 --- a/gpsdecode.xml +++ b/man/gpsdecode.xml diff --git a/gpsfake.xml b/man/gpsfake.xml index e8331d47..e8331d47 100644 --- a/gpsfake.xml +++ b/man/gpsfake.xml diff --git a/gpsinit.xml b/man/gpsinit.xml index a3750023..a3750023 100644 --- a/gpsinit.xml +++ b/man/gpsinit.xml diff --git a/gpsmon.xml b/man/gpsmon.xml index f33b5f15..f33b5f15 100644 --- a/gpsmon.xml +++ b/man/gpsmon.xml diff --git a/gpspipe.xml b/man/gpspipe.xml index 9c5da4f3..9c5da4f3 100644 --- a/gpspipe.xml +++ b/man/gpspipe.xml diff --git a/gpsprof.xml b/man/gpsprof.xml index bdc22691..bdc22691 100644 --- a/gpsprof.xml +++ b/man/gpsprof.xml diff --git a/gpsrinex.xml b/man/gpsrinex.xml index 59632f5a..59632f5a 100644 --- a/gpsrinex.xml +++ b/man/gpsrinex.xml diff --git a/gpxlogger.xml b/man/gpxlogger.xml index 7d429941..7d429941 100644 --- a/gpxlogger.xml +++ b/man/gpxlogger.xml diff --git a/libgps.xml b/man/libgps.xml index 7e850c3d..7e850c3d 100644 --- a/libgps.xml +++ b/man/libgps.xml diff --git a/libgpsmm.xml b/man/libgpsmm.xml index cfcc9d35..cfcc9d35 100644 --- a/libgpsmm.xml +++ b/man/libgpsmm.xml diff --git a/ntpshmmon.xml b/man/ntpshmmon.xml index bcb083a3..bcb083a3 100644 --- a/ntpshmmon.xml +++ b/man/ntpshmmon.xml diff --git a/ppscheck.xml b/man/ppscheck.xml index 8a5bdc12..8a5bdc12 100644 --- a/ppscheck.xml +++ b/man/ppscheck.xml diff --git a/ubxtool.xml b/man/ubxtool.xml index 493f72ab..493f72ab 100644 --- a/ubxtool.xml +++ b/man/ubxtool.xml |