anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use environment variable to locate Windows directory

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18848 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Joost Verburg 2007-06-21 19:42:07 +00:00
parent 0e0a947aa9
commit 0ca5cd777c
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/Win32/packaging/installer/components/core.nsh
View File

@ -54,7 +54,7 @@ Section -Core SecCore
SetOutPath "$INSTDIR\python"
!insertmacro FileListPythonBin File "${FILES_PYTHON}\"
SetOutPath "$INSTDIR\python"
!insertmacro FileListPythonDll File "${FILES_WINDOWS}\System32\"
!insertmacro FileListPythonDll File "$%SystemRoot%\System32\"
!insertmacro FileListUnicodeDll File "${FILES_PYTHON}\DLLs\"
SetOutPath "$INSTDIR\python\Lib"
!insertmacro FileListPythonLib File "${FILES_PYTHON}\Lib\"

2
development/Win32/packaging/installer/settings.nsh
View File

@ -13,7 +13,7 @@ Settings for LyX installer
!define FILES_LAUNCHER "..\..\launcher"
!define FILES_PDFVIEW "..\..\pdfview"
!define FILES_MSVC "${FILES_WINDOWS}\WinSxS\x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.762_x-ww_6b128700"
!define FILES_MSVC "$%SystemRoot%\WinSxS\x86_Microsoft.VC80.CRT_1fc8b3b9a1e18e3b_8.0.50727.762_x-ww_6b128700"
!define FILES_NETPBM "${FILES_DEPS}\netpbm"
!define FILES_DTL "${FILES_DEPS}\dtl"
!define FILES_AIKSAURUS "${FILES_DEPS}\aiksaurus\"

24
development/Win32/packaging/installer/settings.user.nsh
View File

@ -5,35 +5,27 @@
#Location of LyX files and dependencies
!ifdef FilesLyX
!define FILES_LYX "${FilesLyX}"
!define FILES_LYX "${FilesLyX}"
!else
!define FILES_LYX "..\..\..\..\build-msvc"
!define FILES_LYX "..\..\..\..\build-msvc"
!endif
!ifdef FilesDeps
!define FILES_DEPS "${FilesDeps}"
!define FILES_DEPS "${FilesDeps}"
!else
!define FILES_DEPS "..\..\..\..\lyx-windows-deps-msvc-qt4"
!define FILES_DEPS "..\..\..\..\lyx-windows-deps-msvc-qt4"
!endif
!ifdef FilesBundle
!define FILES_BUNDLE "${FilesBundle}"
!define FILES_BUNDLE "${FilesBundle}"
!else
!define FILES_BUNDLE "..\..\..\..\lyx-windows-bundle-deps"
!endif
#Location of Windows installation
!ifdef FilesWindows
!define FILES_WINDOWS "${FilesWindows}"
!else
!define FILES_WINDOWS "C:\WINDOWS"
!define FILES_BUNDLE "..\..\..\..\lyx-windows-bundle-deps"
!endif
#Location of Python 2.5
!ifdef FilesPython
!define FILES_PYTHON "${FilesPython}"
!define FILES_PYTHON "${FilesPython}"
!else
!define FILES_PYTHON "C:\Python25"
!define FILES_PYTHON "C:\Python25"
!endif