Mercurial > fife-parpg
changeset 414:92433f507feb
Removed the install-dlls target and made the dll install part of both the fife-python (copies dlls to the <fife>/engine/python/fife dir) and install-python (copies dlls to <python>/site-packages/fife) [t:430]
| author | prock@33b003aa-7bff-0310-803a-e67f0ece8222 |
|---|---|
| date | Tue, 02 Feb 2010 21:39:11 +0000 |
| parents | 10ac0c080564 |
| children | 16ea97290dbc |
| files | build/win32/build_environments/scons/install_engine.bat build/win32/build_environments/scons/loginstall_engine.bat engine/SConscript |
| diffstat | 3 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/build/win32/build_environments/scons/install_engine.bat Tue Feb 02 20:47:20 2010 +0000 +++ b/build/win32/build_environments/scons/install_engine.bat Tue Feb 02 21:39:11 2010 +0000 @@ -1,5 +1,5 @@ @echo off :: run scons -python ..\..\applications\scons\scons.py -C ..\..\..\..\ install-python install-dlls +python ..\..\applications\scons\scons.py -C ..\..\..\..\ install-python
--- a/build/win32/build_environments/scons/loginstall_engine.bat Tue Feb 02 20:47:20 2010 +0000 +++ b/build/win32/build_environments/scons/loginstall_engine.bat Tue Feb 02 21:39:11 2010 +0000 @@ -1,4 +1,4 @@ @echo off :: run scons -python ..\..\applications\scons\scons.py -C ..\..\..\..\ install-python install-dlls > engine_build_log.txt 2>&1 +python ..\..\applications\scons\scons.py -C ..\..\..\..\ install-python > engine_build_log.txt 2>&1
--- a/engine/SConscript Tue Feb 02 20:47:20 2010 +0000 +++ b/engine/SConscript Tue Feb 02 21:39:11 2010 +0000 @@ -203,14 +203,20 @@ alias_shared = Alias('fife-shared', sharedlib) alias_static = Alias('fife-static', staticlib) alias_swig = Alias('fife-swig', [pythonext, copy_cmd2, copy_cmd3]) -alias_python = Alias('fife-python', [pythonlib, copy_cmd, alias_swig]) -Alias('fife', [alias_shared, alias_static, alias_python]) if sys.platform == 'win32': - Alias('install-dlls', [install_dlls, install_dlls2]) - + alias_python = Alias('fife-python', [pythonlib, copy_cmd, alias_swig, install_dlls2]) +else: + alias_python = Alias('fife-python', [pythonlib, copy_cmd, alias_swig]) + +Alias('fife', [alias_shared, alias_static, alias_python]) alias_install_shared = Alias('install-shared', install_shared) alias_install_static = Alias('install-static', install_static) -alias_install_python = Alias('install-python', [alias_python, install_python_lib, install_python_module, install_python_extensions]) + +if sys.platform == 'win32': + alias_install_python = Alias('install-python', [alias_python, install_python_lib, install_python_module, install_python_extensions, install_dlls]) +else: + alias_install_python = Alias('install-python', [alias_python, install_python_lib, install_python_module, install_python_extensions]) + alias_install_dev = Alias('install-dev', [alias_install_shared, alias_install_static, install_headers]) Alias('install-all', [alias_install_python, alias_install_dev])