dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed bug #1515592 - NSIS_CONFIG_CONST_DATA_PATH wasn't honoured on Linux

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4727 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
pabs3 2006-08-07 07:37:20 +00:00
parent 5809a7c1b2
commit 66f8b367c7
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
SConstruct
View file

@ -83,8 +83,13 @@ cvs_version = strftime('%d-%b-%Y.cvs', gmtime())
opts = Options() opts = Options()
# Find the value of NSIS_CONFIG_CONST_DATA_PATH
SConscript('SCons/config.py')
opts.Update(defenv)
Help(opts.GenerateHelpText(defenv))
install_dirs = { install_dirs = {
'win32': { 'relocatable': {
'dest': '', 'dest': '',
'prefix': '', 'prefix': '',
'conf': '$PREFIX', 'conf': '$PREFIX',
@ -92,7 +97,7 @@ install_dirs = {
'data': '$PREFIX', 'data': '$PREFIX',
'doc': '$PREFIX', 'doc': '$PREFIX',
}, },
'default': { 'static': {
'dest': '', 'dest': '',
'prefix': '/usr/local', 'prefix': '/usr/local',
'conf': '$PREFIX/etc', 'conf': '$PREFIX/etc',
@ -102,10 +107,10 @@ install_dirs = {
} }
} }
if defenv['PLATFORM'] in install_dirs: if 'NSIS_CONFIG_CONST_DATA_PATH' in defenv['NSIS_CPPDEFINES']:
dirs = install_dirs[defenv['PLATFORM']] dirs = install_dirs['static']
else: else:
dirs = install_dirs['default'] dirs = install_dirs['relocatable']
# version # version
opts.Add(('VERSION', 'Version of NSIS', cvs_version)) opts.Add(('VERSION', 'Version of NSIS', cvs_version))
@ -136,14 +141,10 @@ opts.Add(('PREFIX_DATA', 'Path to install nsis data to (plugins, includes, stubs
opts.Add(('PREFIX_DOC','Path to install nsis README / INSTALL / TODO files to.', dirs['doc'])) opts.Add(('PREFIX_DOC','Path to install nsis README / INSTALL / TODO files to.', dirs['doc']))
opts.Update(defenv) opts.Update(defenv)
Help(opts.GenerateHelpText(defenv)) Help(opts.GenerateHelpText(defenv))
# build configuration
SConscript('SCons/config.py')
# add prefixes defines # add prefixes defines
if defenv['PLATFORM'] != 'win32': if 'NSIS_CONFIG_CONST_DATA_PATH' in defenv['NSIS_CPPDEFINES']:
defenv.Append(NSIS_CPPDEFINES = [('PREFIX_CONF', '"%s"' % defenv.subst('$PREFIX_CONF'))]) defenv.Append(NSIS_CPPDEFINES = [('PREFIX_CONF', '"%s"' % defenv.subst('$PREFIX_CONF'))])
defenv.Append(NSIS_CPPDEFINES = [('PREFIX_DATA', '"%s"' % defenv.subst('$PREFIX_DATA'))]) defenv.Append(NSIS_CPPDEFINES = [('PREFIX_DATA', '"%s"' % defenv.subst('$PREFIX_DATA'))])
@ -199,7 +200,7 @@ def Distribute(files, names, component, path, subpath, alias, install_alias=None
paths = map(lambda file: os.path.join(d, path, subpath, file), names) paths = map(lambda file: os.path.join(d, path, subpath, file), names)
defenv.InstallAs(paths, files) defenv.InstallAs(paths, files)
if defenv.has_key('PREFIX') and defenv['PREFIX']: if (defenv.has_key('PREFIX') and defenv['PREFIX']) or (defenv.has_key('PREFIX_DEST') and defenv['PREFIX_DEST']) :
prefix = '${PREFIX_DEST}${PREFIX_%s}' % component.upper() prefix = '${PREFIX_DEST}${PREFIX_%s}' % component.upper()
paths = map(lambda file: os.path.join(prefix, path, subpath, file), names) paths = map(lambda file: os.path.join(prefix, path, subpath, file), names)
ins = defenv.InstallAs(paths, files) ins = defenv.InstallAs(paths, files)