idolpx/fsp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add support for user configurable docdir

Browse Source
This commit is contained in:
Radim Kolar 2009-09-03 21:25:26 +02:00
parent df433f03d0
commit 4e9efc806f
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SConstruct
View File

@ -54,6 +54,7 @@ from debugmode import checkForDebugBuild
from timeout import checkForClientTimeout from timeout import checkForClientTimeout
from relsignals import checkReliableSignals from relsignals import checkReliableSignals
from mandir import checkForUserMandir from mandir import checkForUserMandir
from docdir import checkForUserDocdir
from mandir import autodetectMandir from mandir import autodetectMandir
from sysconfdir import checkForUserSysconfdir from sysconfdir import checkForUserSysconfdir
@ -68,6 +69,7 @@ conf = Configure(env,{'checkForCCOption':checkForCCOption,
'checkForClientTimeout':checkForClientTimeout, 'checkForClientTimeout':checkForClientTimeout,
'checkReliableSignals':checkReliableSignals, 'checkReliableSignals':checkReliableSignals,
'checkForUserMandir':checkForUserMandir, 'checkForUserMandir':checkForUserMandir,
'checkForUserDocdir':checkForUserDocdir,
'autodetectMandir':autodetectMandir, 'autodetectMandir':autodetectMandir,
'checkForUserSysconfdir':checkForUserSysconfdir 'checkForUserSysconfdir':checkForUserSysconfdir
}) })
@ -133,6 +135,8 @@ PREFIX=conf.checkPrefix(PREFIX)
conf.checkForUserSysconfdir(PREFIX) conf.checkForUserSysconfdir(PREFIX)
MANDIR=conf.autodetectMandir(PREFIX) MANDIR=conf.autodetectMandir(PREFIX)
conf.checkForUserMandir(MANDIR) conf.checkForUserMandir(MANDIR)
DOCDIR=PREFIX+'/share/doc/fsp'
DOCDIR=conf.checkForUserDocdir(DOCDIR)
EFENCE = conf.MAINTAINER_MODE() EFENCE = conf.MAINTAINER_MODE()
if EFENCE == True: if EFENCE == True:
EFENCE=conf.CheckLib("efence","EF_Abort") EFENCE=conf.CheckLib("efence","EF_Abort")
@ -143,5 +147,5 @@ conf.Finish()
env.Append(CPPFLAGS = "-DPACKAGE_VERSION=\\\""+VERSION+"\\\"") env.Append(CPPFLAGS = "-DPACKAGE_VERSION=\\\""+VERSION+"\\\"")
# process build rules # process build rules
Export( Split("env PREFIX MANDIR")) Export( Split("env PREFIX MANDIR DOCDIR"))
env.SConscript(dirs=Split("doc . bsd_src common server client clients contrib tests man")) env.SConscript(dirs=Split("doc . bsd_src common server client clients contrib tests man"))

6
doc/SConscript
View File

@ -1,8 +1,4 @@
Import(Split("env PREFIX")) Import(Split("env PREFIX DOCDIR"))
DOCDIR=PREFIX+'/share/doc/fsp'
env.Install(dir=DOCDIR,source=Split("PROTOCOL HISTORY faq.html")) env.Install(dir=DOCDIR,source=Split("PROTOCOL HISTORY faq.html"))
env.Alias("install",DOCDIR) env.Alias("install",DOCDIR)
Export(Split("DOCDIR"))

20
site_scons/docdir.py Normal file
View File

@ -0,0 +1,20 @@
#
# SCons user-supplied docdir configuration
#
# Version 1.0
# 03-Sep-2009
#
from SCons.Script import ARGUMENTS
import os.path
def checkForUserDocdir(conf,olddocdir=None):
"""Returns docdir specified on command line or olddocdir if none is supplied."""
conf.Message("Checking for user supplied docdir... ")
lp = ARGUMENTS.get('docdir', 0)
if lp:
conf.Result(1)
return lp
else:
conf.Result(0)
return olddocdir