anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

installer: fix some warnings and prepare for next release

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25903 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2008-07-26 21:08:01 +00:00
parent 2fca636bea
commit 07919fb0b0
8 changed files with 17 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/Win32/packaging/AltInstaller/Deleted.nsh
View File

@ -1,6 +1,8 @@
Function DeleteFiles Function DeleteFiles
# list with deleted files for LyX 1.6svn 21-12-2007 # list with deleted files for LyX 1.6.1
#RMDir /r "$INSTDIR\Resources\doc\es\biblio"
#Delete "$INSTDIR\Resources\examples\mathed.lyx"
FunctionEnd FunctionEnd

2
development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
View File

@ -55,6 +55,7 @@ Var MiKTeXPath
Var InstallGSview Var InstallGSview
Var InstallJabRef Var InstallJabRef
Var SVGPath Var SVGPath
Var AppFiles
# Variables used by all installer versions # Variables used by all installer versions
!include "Variables.nsh" !include "Variables.nsh"
@ -65,7 +66,6 @@ Var SVGPath
!include "FileFunc.nsh" !include "FileFunc.nsh"
!include "StrFunc.nsh" !include "StrFunc.nsh"
!include "TextFunc.nsh" !include "TextFunc.nsh"
!insertmacro LineFind
# Set of various macros and functions # Set of various macros and functions
!include "LyXUtils.nsh" !include "LyXUtils.nsh"

1
development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
View File

@ -53,6 +53,7 @@ Var MiKTeXVersion
Var MiKTeXUser Var MiKTeXUser
Var State Var State
Var SVGPath Var SVGPath
Var AppFiles
# Variables used by all installer versions # Variables used by all installer versions
!include "Variables.nsh" !include "Variables.nsh"

1
development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi
View File

@ -37,6 +37,7 @@ SetCompressor lzma
Var INSTDIR_NEW Var INSTDIR_NEW
Var INSTDIR_OLD Var INSTDIR_OLD
Var AppPath
# Variables used by all installer versions # Variables used by all installer versions
!include "Variables.nsh" !include "Variables.nsh"

4
development/Win32/packaging/AltInstaller/LyXUtils.nsh
View File

@ -408,7 +408,7 @@ FunctionEnd
StrCpy $UserList $UserList "" $Pointer # cut off the first username in the list StrCpy $UserList $UserList "" $Pointer # cut off the first username in the list
# generate the string for the current user # generate the string for the current user
# AppPre and AppSuff are generated in the macro "AppPreSuff" # AppPre and AppSuff are generated in the macro "AppPreSuff"
StrCpy $AppPath "$AppPre\$0\$AppSuff\${PRODUCT_SUBFOLDER}" StrCpy $AppPath "$AppPre\$0\$AppSuff\$AppSubfolder"
# read the preferences file to test if it exists # read the preferences file to test if it exists
FileOpen $R1 "$AppPath\$FileName" r FileOpen $R1 "$AppPath\$FileName" r
IfErrors doneA IfErrors doneA
@ -420,7 +420,7 @@ FunctionEnd
ready: ready:
# now do the same for the last user name # now do the same for the last user name
StrCpy $0 $UserList StrCpy $0 $UserList
StrCpy $AppPath "$AppPre\$0\$AppSuff\${PRODUCT_SUBFOLDER}" StrCpy $AppPath "$AppPre\$0\$AppSuff\$AppSubfolder"
FileOpen $R1 "$AppPath\$FileName" r FileOpen $R1 "$AppPath\$FileName" r
IfErrors doneB IfErrors doneB
FileClose $R1 FileClose $R1

16
development/Win32/packaging/AltInstaller/Settings.nsh
View File

@ -19,12 +19,12 @@
!define PRODUCT_INFO_URL "http://www.lyx.org/" !define PRODUCT_INFO_URL "http://www.lyx.org/"
!define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe" !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"
BrandingText "LyXWinInstaller v4.06 - ${INSTALLER_VERSION}" BrandingText "LyXWinInstaller v4.07 - ${INSTALLER_VERSION}"
# to check later if this installer version is running at the same time # to check later if this installer version is running at the same time
!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-06-AltInstaller-${INSTALLER_VERSION}.exe" !define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-07-AltInstaller-${INSTALLER_VERSION}.exe"
!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-06-AltInstaller-${INSTALLER2_VERSION}.exe" !define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-07-AltInstaller-${INSTALLER2_VERSION}.exe"
!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-06-AltInstaller-${INSTALLER3_VERSION}.exe" !define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-07-AltInstaller-${INSTALLER3_VERSION}.exe"
!define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp" !define VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp"
# Replaced by HKLM or HKCU depending on SetShellVarContext. # Replaced by HKLM or HKCU depending on SetShellVarContext.
@ -40,10 +40,10 @@ BrandingText "LyXWinInstaller v4.06 - ${INSTALLER_VERSION}"
# definitions for the Update installer # definitions for the Update installer
!if ${INSTALLER_VERSION} == "Update" !if ${INSTALLER_VERSION} == "Update"
!define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX16svn3" !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX16svn3"
!define PRODUCT_VERSION_OLD "LyX 1.6.0beta3" !define PRODUCT_VERSION_OLD "LyX 1.6.0beta4"
!define PRODUCT_VERSION_SHORT_OLD "16beta3" !define PRODUCT_VERSION_SHORT_OLD "16beta4"
!define JabRefVersion "2.3.1" # could be an older version !define JabRefVersion "2.3.1" # could be an older version
!define ImageMagickVersion_Old "6.4.1" # could be an older version !define ImageMagickVersion_Old "6.4.2" # could be an older version
!define GhostscriptVersion_Old "8.62" # could be an older version !define GhostscriptVersion_Old "8.62" # could be an older version
!define MiKTeXDeliveredVersion "2.7" # could be an older version !define MiKTeXDeliveredVersion "2.7" # could be an older version
!endif !endif
@ -58,7 +58,7 @@ BrandingText "LyXWinInstaller v4.06 - ${INSTALLER_VERSION}"
!if ${INSTALLER_VERSION} == "Complete" !if ${INSTALLER_VERSION} == "Complete"
!define GSviewInstall "external\gsv49w32.exe" !define GSviewInstall "external\gsv49w32.exe"
!define JabRefInstall "external\JabRef-2.3.1-Setup.exe" !define JabRefInstall "external\JabRef-2.3.1-Setup.exe"
!define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.7.3053.exe" !define MiKTeXInstall "$INSTDIR\external\basic-miktex-2.7.3107.exe"
!define JabRefVersion "2.3.1" !define JabRefVersion "2.3.1"
!define MiKTeXDeliveredVersion "2.7" !define MiKTeXDeliveredVersion "2.7"
!endif !endif

33
development/Win32/packaging/AltInstaller/Updated.nsh
View File

@ -1,43 +1,12 @@
Function UpdateModifiedFiles Function UpdateModifiedFiles
# list with modified files for LyX 1.6-svn-rxxxxx # list with modified files for LyX 1.6.1
SetOutPath "$INSTDIR\bin" # always here SetOutPath "$INSTDIR\bin" # always here
File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" # always here File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" # always here
File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe" # always here File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe" # always here
File /r "${PRODUCT_SOURCEDIR}\Resources\locale" # always here File /r "${PRODUCT_SOURCEDIR}\Resources\locale" # always here
SetOutPath "$INSTDIR\Resources"
File "${PRODUCT_SOURCEDIR}\Resources\chkconfig.ltx"
File "${PRODUCT_SOURCEDIR}\Resources\configure.py"
SetOutPath "$INSTDIR\Resources\bind"
File "${PRODUCT_SOURCEDIR}\Resources\bind\cua.bind"
File "${PRODUCT_SOURCEDIR}\Resources\bind\mac.bind"
SetOutPath "$INSTDIR\Resources\doc"
#File "${PRODUCT_SOURCEDIR}\Resources\doc\EmbeddedObjects.lyx"
File "${PRODUCT_SOURCEDIR}\Resources\doc\LaTeXConfig.lyx"
File "${PRODUCT_SOURCEDIR}\Resources\doc\Math.lyx"
File "${PRODUCT_SOURCEDIR}\Resources\doc\Userguide.lyx"
SetOutPath "$INSTDIR\Resources\doc\de"
#File "${PRODUCT_SOURCEDIR}\Resources\doc\de\EmbeddedObjects.lyx"
File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Extended.lyx"
File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Math.lyx"
File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Userguide.lyx"
SetOutPath "$INSTDIR\Resources\doc\es"
#File "${PRODUCT_SOURCEDIR}\Resources\doc\es\EmbeddedObjects.lyx"
File "${PRODUCT_SOURCEDIR}\Resources\doc\es\Math.lyx"
File "${PRODUCT_SOURCEDIR}\Resources\doc\Userguide.lyx"
SetOutPath "$INSTDIR\Resources\doc\fr"
#File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\EmbeddedObjects.lyx"
File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\Math.lyx"
File "${PRODUCT_SOURCEDIR}\Resources\doc\fr\Userguide.lyx"
#SetOutPath "$INSTDIR\Resources\layouts"
#File "${PRODUCT_SOURCEDIR}\Resources\layouts\amsmaths.inc"
SetOutPath "$INSTDIR\Resources\lyx2lyx" # always here SetOutPath "$INSTDIR\Resources\lyx2lyx" # always here
File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\LyX.py"
File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\lyx2lyx_version.py" # always here File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\lyx2lyx_version.py" # always here
File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\lyx_1_6.py"
SetOutPath "$INSTDIR\Resources\ui"
File "${PRODUCT_SOURCEDIR}\Resources\ui\classic.ui"
File "${PRODUCT_SOURCEDIR}\Resources\ui\stdmenus.inc"
FunctionEnd FunctionEnd

1
development/Win32/packaging/AltInstaller/Variables.nsh
View File

@ -8,7 +8,6 @@ Var LatexPath
Var MiKTeXInstalled Var MiKTeXInstalled
Var PythonPath Var PythonPath
Var Answer Var Answer
Var AppFiles
Var AppPre Var AppPre
Var AppSubfolder Var AppSubfolder
Var AppSuff Var AppSuff