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

Added support for examplesdir

Browse Source
This commit is contained in:
Radim Kolar 2019-08-24 11:20:25 +02:00
parent 07dd46b5ba
commit c1a9993365
4 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL
View File

@ -57,6 +57,8 @@ SCons command line options:
files. Default prefix/etc files. Default prefix/etc
docdir=directory where to put documentation. docdir=directory where to put documentation.
Default prefix/share/doc/fsp Default prefix/share/doc/fsp
examplesdir=directory where to install examples
Default is docdir/examples
without-clients=yes dont build and install client commands without-clients=yes dont build and install client commands
without-fspscan=yes dont build and install fspcan command without-fspscan=yes dont build and install fspcan command
dsssl=directory Look for DocBook DSSSL Stylesheets there dsssl=directory Look for DocBook DSSSL Stylesheets there

3
SConscript
View File

@ -1,10 +1,9 @@
Import(Split("env PREFIX DOCDIR CLIENTS")) Import(Split("env PREFIX DOCDIR CLIENTS EXAMPLESDIR"))
env.Install(dir=DOCDIR,source=Split("""BETA.README COPYRIGHT ChangeLog env.Install(dir=DOCDIR,source=Split("""BETA.README COPYRIGHT ChangeLog
FILES INFO INSTALL MACHINES TODO FILES INFO INSTALL MACHINES TODO
""")) """))
EXAMPLESDIR=PREFIX+'/share/examples/fsp'
env.Install(dir=EXAMPLESDIR,source="fspd.conf") env.Install(dir=EXAMPLESDIR,source="fspd.conf")
if CLIENTS: if CLIENTS:
env.Install(dir=EXAMPLESDIR,source=Split("setup.sh setup.csh")) env.Install(dir=EXAMPLESDIR,source=Split("setup.sh setup.csh"))

6
SConstruct
View File

@ -57,6 +57,7 @@ from relsignals import checkReliableSignals
from mandir import checkForUserMandir from mandir import checkForUserMandir
from docdir import checkForUserDocdir from docdir import checkForUserDocdir
from mandir import autodetectMandir from mandir import autodetectMandir
from examplesdir import checkForUserExamplesdir
from clients import checkForBuildingClients from clients import checkForBuildingClients
from fspscan import checkForBuildingFspscan from fspscan import checkForBuildingFspscan
from sysconfdir import checkForUserSysconfdir from sysconfdir import checkForUserSysconfdir
@ -75,6 +76,7 @@ conf = Configure(env,{'checkForCCOption':checkForCCOption,
'checkReliableSignals':checkReliableSignals, 'checkReliableSignals':checkReliableSignals,
'checkForUserMandir':checkForUserMandir, 'checkForUserMandir':checkForUserMandir,
'checkForUserDocdir':checkForUserDocdir, 'checkForUserDocdir':checkForUserDocdir,
'checkForUserExamplesdir':checkForUserExamplesdir,
'autodetectMandir':autodetectMandir, 'autodetectMandir':autodetectMandir,
'checkForUserSysconfdir':checkForUserSysconfdir, 'checkForUserSysconfdir':checkForUserSysconfdir,
'checkForBuildingClients':checkForBuildingClients, 'checkForBuildingClients':checkForBuildingClients,
@ -150,6 +152,8 @@ MANDIR=conf.autodetectMandir(PREFIX)
MANDIR=conf.checkForUserMandir(MANDIR) MANDIR=conf.checkForUserMandir(MANDIR)
DOCDIR=PREFIX+'/share/doc/fsp' DOCDIR=PREFIX+'/share/doc/fsp'
DOCDIR=conf.checkForUserDocdir(DOCDIR) DOCDIR=conf.checkForUserDocdir(DOCDIR)
EXAMPLESDIR=DOCDIR+'/examples'
EXAMPLESDIR=conf.checkForUserExamplesdir(EXAMPLESDIR)
dmode=conf.checkForDebugBuild() dmode=conf.checkForDebugBuild()
EFENCE = conf.MAINTAINER_MODE(dmode) EFENCE = conf.MAINTAINER_MODE(dmode)
if EFENCE == True: if EFENCE == True:
@ -162,5 +166,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 DOCDIR CLIENTS FSPSCAN JADE DSSSL")) Export( Split("env PREFIX MANDIR DOCDIR EXAMPLESDIR CLIENTS FSPSCAN JADE DSSSL"))
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"))

20
site_scons/examplesdir.py Normal file
View File

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