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

Merge patch for better installs on POSIX platforms.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4486 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
pabs3 2006-01-21 09:54:23 +00:00
parent c16ca4f9fc
commit 0913023f33
25 changed files with 286 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/Graphics/SConscript
View file

@ -78,7 +78,7 @@ def join(prefix, list):
return map(lambda x: '%s/%s' % (prefix, x), list)
def dist(dir, files):
defenv.DistributeContribs('Graphics/%s' % dir, join(dir, files))
defenv.DistributeContrib(join(dir, files), path='Graphics/%s' % dir)
dist('Checks', checks)
dist('Header', headers)

2
Contrib/Language files/SConscript
View file

@ -52,4 +52,4 @@ languages = Split("""
Import('defenv')
defenv.DistributeContribs('Language files', languages)
defenv.DistributeContrib(languages, path='Language files')

2
Contrib/Library/LibraryLocal/SConscript
View file

@ -12,4 +12,4 @@ libs = Split("""
Import('BuildUtil')
BuildUtil(target, files, libs, flags = ['$EXCEPTION_FLAG'], install = 'Bin')
BuildUtil(target, files, libs, flags = ['$EXCEPTION_FLAG'])

2
Contrib/Library/RegTool/SConscript
View file

@ -14,4 +14,4 @@ libs = Split("""
Import('BuildUtil')
BuildUtil(target, files, libs, entry = 'WinMain', nodeflib = True, install_as = 'Bin/RegTool.bin')
BuildUtil(target, files, libs, entry = 'WinMain', nodeflib = True, file_name = 'RegTool.bin')

2
Contrib/MakeLangId/SConscript
View file

@ -19,5 +19,5 @@ libs = Split("""
Import('BuildUtil')
BuildUtil(target, files, libs, res = res, resources = resources, entry = 'WinMain', install = 'Bin')
BuildUtil(target, files, libs, res = res, resources = resources, entry = 'WinMain')

4
Contrib/Makensisw/SConscript
View file

@ -53,7 +53,7 @@ BuildUtil(
res = res,
resources = resources,
entry = 'WinMain',
install = '',
defines = ['WIN32_MEAN_AND_LEAN', 'RELEASE=2.0'],
docs = docs
docs = docs,
root_util = True
)

4
Contrib/Modern UI/Readme.html
View file

@ -364,12 +364,12 @@ side.<br />
"parameter">ui_file</span><br />
The interface files with a customized dialog resource IDD_SELCOM
with a small description area.<br />
<em>Default: {NSISDIR}\Contrib\UIs\modern_smalldesc.exe</em></p>
<em>Default: ${NSISDIR}\Contrib\UIs\modern_smalldesc.exe</em></p>
<p><strong>MUI_UI_COMPONENTSPAGE_NODESC</strong> <span class=
"parameter">ui_file</span><br />
The interface files with a customized dialog resource IDD_SELCOM
without a description area.<br />
<em>Default: {NSISDIR}\Contrib\UIs\modern_nodesc.exe</em></p>
<em>Default: ${NSISDIR}\Contrib\UIs\modern_nodesc.exe</em></p>
</div>
<h3><img class="trigger" alt="Open/Close section" id="trigger_inwf"
src="images/closed.gif" onclick=

10
Contrib/Modern UI/SConscript
View file

@ -77,7 +77,9 @@ Import('defenv')
def join(prefix, list):
return map(lambda x: '%s/%s' % (prefix, x), list)
defenv.DistributeDocs(target, docs)
defenv.DistributeDocs('%s/%s' % (target, 'images'), join('images', doc_images))
defenv.DistributeContribs(target, contribs)
defenv.DistributeContribs('%s/%s' % (target, 'Language files'), join('Language files', languages))
defenv.DistributeDocs(docs, path=target)
path = 'images'
defenv.DistributeDocs(join(path,doc_images), path='%s/%s'%(target,path))
defenv.DistributeContrib(contribs, path=target)
path = 'Language files'
defenv.DistributeContrib(join(path,languages), path='%s/%s'%(target,path))

41
Contrib/NSIS Menu/SConscript
View file

@ -36,6 +36,25 @@ libs = Split("""
wxzlib
""")
html = Split("""
#Menu/compiler.html
#Menu/docs.html
#Menu/index.html
#Menu/intro.html
#Menu/notinstalled.html
#Menu/update.html
#Menu/websites.html
""")
images = Split("""
#Menu/images/clear.gif
#Menu/images/header.gif
#Menu/images/line.gif
#Menu/images/menu.gif
#Menu/images/menud.gif
#Menu/images/site.gif
""")
Import('BuildUtil env')
import os
@ -46,24 +65,14 @@ import os
#BuildUtil(target, files, libs, libpath = wxlib, cpppath = wxinc, res = rc, resources = resources, install = '', flags = ['/MD'])
# install pre-built NSIS.exe
ins = env.Distribute('', '#NSIS.exe')
if env['PLATFORM'] == 'win32':
ins = env.DistributeBin('#NSIS.exe')
else:
ins = env.DistributeW32Bin('#NSIS.exe')
env.Alias('install-utils', ins)
# install menu files
env.Distribute('Menu', '#Menu/compiler.html')
env.Distribute('Menu', '#Menu/docs.html')
env.Distribute('Menu', '#Menu/index.html')
env.Distribute('Menu', '#Menu/intro.html')
env.Distribute('Menu', '#Menu/notinstalled.html')
env.Distribute('Menu', '#Menu/update.html')
env.Distribute('Menu', '#Menu/websites.html')
env.Distribute('Menu/images', '#Menu/images/clear.gif')
env.Distribute('Menu/images', '#Menu/images/header.gif')
env.Distribute('Menu/images', '#Menu/images/line.gif')
env.Distribute('Menu/images', '#Menu/images/menu.gif')
env.Distribute('Menu/images', '#Menu/images/menud.gif')
env.Distribute('Menu/images', '#Menu/images/site.gif')
env.Alias('install-utils', '$PREFIX/Menu')
env.DistributeMenu(html, alias='install-utils')
env.DistributeMenu(images, path='images', alias='install-utils')

2
Contrib/UIs/SConscript
View file

@ -22,5 +22,5 @@ Import('BuildUtil env')
code = env.Object(code)
for ui in uis:
ui = BuildUtil(ui, [code], libs, entry = 'WinMain', res = ui + '.rc', install = 'Contrib/UIs')
ui = BuildUtil(ui, [code], libs, entry = 'WinMain', res = ui + '.rc', contrib = True, path = 'UIs')
env.Alias('UIs', ui)

6
Contrib/VPatch/SConscript
View file

@ -17,6 +17,6 @@ includes = Split("""
Import('defenv')
defenv.DistributeExamples(target, examples)
defenv.DistributeDocs(target, docs)
defenv.Distribute('Include', includes)
defenv.DistributeExamples(examples, path=target)
defenv.DistributeDocs(docs, path=target)
defenv.DistributeInclude(includes)

2
Contrib/VPatch/Source/GenPat/SConscript
View file

@ -17,4 +17,4 @@ libs = Split("""
Import('BuildUtil')
BuildUtil(target, files, libs, flags = ['$EXCEPTION_FLAG'], install = 'Bin', cross_platform = True)
BuildUtil(target, files, libs, flags = ['$EXCEPTION_FLAG'], cross_platform = True)

4
Contrib/zip2exe/SConscript
View file

@ -36,6 +36,6 @@ headers = Split("""
Import('BuildUtil defenv')
BuildUtil(target, files, libs, res = rc, resources = resources, install = 'Bin')
BuildUtil(target, files, libs, res = rc, resources = resources)
defenv.DistributeContribs(target, headers)
defenv.DistributeContrib(headers,path=target)