installer: fix some warnings and prepare for next release

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25903 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/Win32/packaging/AltInstaller/Deleted.nsh b/development/Win32/packaging/AltInstaller/Deleted.nsh
index d79356bb0582e942d639ec67fa31f72da43ff7bd..3cb0d0e1c49131eda6be136fd9b1010e1adbd80c 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Deleted.nsh
+++ b/development/Win32/packaging/AltInstaller/Deleted.nsh
@@ -1,6 +1,8 @@
 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
 

diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
index 8bbf226b3401b5babec103eadbf1717e9961501b..c22a7f2aced711d648e5bd66bcb60b8d1e2c8ffb 100644 (file)
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-complete.nsi
@@ -55,6 +55,7 @@ Var MiKTeXPath
 Var InstallGSview
 Var InstallJabRef
 Var SVGPath
+Var AppFiles
 # Variables used by all installer versions
 !include "Variables.nsh"
 
@@ -65,7 +66,6 @@ Var SVGPath
 !include "FileFunc.nsh"
 !include "StrFunc.nsh"
 !include "TextFunc.nsh"
-!insertmacro LineFind
 
 # Set of various macros and functions
 !include "LyXUtils.nsh"

diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
index d6c2634b555514642b8a71cfff41db5010623452..ed5f3cb3afe8dfd6b34a606b01ba446194104c16 100644 (file)
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi
@@ -53,6 +53,7 @@ Var MiKTeXVersion
 Var MiKTeXUser
 Var State
 Var SVGPath
+Var AppFiles
 # Variables used by all installer versions
 !include "Variables.nsh"
 

diff --git a/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi b/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi
index 16d6ff7ed675bec394345571c43dfe2e3b38c5eb..5bb86a0819d0e76f3d31cfe24961b518e47c6695 100644 (file)
--- a/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi
+++ b/development/Win32/packaging/AltInstaller/LyXInstaller-update.nsi
@@ -37,6 +37,7 @@ SetCompressor lzma
 
 Var INSTDIR_NEW
 Var INSTDIR_OLD
+Var AppPath
 # Variables used by all installer versions
 !include "Variables.nsh"
 

diff --git a/development/Win32/packaging/AltInstaller/LyXUtils.nsh b/development/Win32/packaging/AltInstaller/LyXUtils.nsh
index 8de5de61dd0af7c5bb93608946eddfa85d75638c..1bb951e2eba1aac4bce1e6bd026477318b48858d 100644 (file)
--- a/development/Win32/packaging/AltInstaller/LyXUtils.nsh
+++ b/development/Win32/packaging/AltInstaller/LyXUtils.nsh
@@ -408,7 +408,7 @@ FunctionEnd
    StrCpy $UserList $UserList "" $Pointer # cut off the first username in the list
    # generate the string for the current user
    # 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
    FileOpen $R1 "$AppPath\$FileName" r
    IfErrors doneA
@@ -420,7 +420,7 @@ FunctionEnd
   ready:
   # now do the same for the last user name
   StrCpy $0 $UserList
-  StrCpy $AppPath "$AppPre\$0\$AppSuff\${PRODUCT_SUBFOLDER}"
+  StrCpy $AppPath "$AppPre\$0\$AppSuff\$AppSubfolder"
   FileOpen $R1 "$AppPath\$FileName" r
   IfErrors doneB
   FileClose $R1

diff --git a/development/Win32/packaging/AltInstaller/Settings.nsh b/development/Win32/packaging/AltInstaller/Settings.nsh
index a81388264bd11963b5830e0e2dc093bd26cd41f1..5050dceca7554f581db2e6d910f92c6350a61587 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Settings.nsh
+++ b/development/Win32/packaging/AltInstaller/Settings.nsh
@@ -19,12 +19,12 @@
 !define PRODUCT_INFO_URL "http://www.lyx.org/"
 !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
-!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-06-AltInstaller-${INSTALLER_VERSION}.exe"
-!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-06-AltInstaller-${INSTALLER2_VERSION}.exe"
-!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-06-AltInstaller-${INSTALLER3_VERSION}.exe"
+!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-07-AltInstaller-${INSTALLER_VERSION}.exe"
+!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-07-AltInstaller-${INSTALLER2_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"
 
 # Replaced by HKLM or HKCU depending on SetShellVarContext.
@@ -40,10 +40,10 @@ BrandingText "LyXWinInstaller v4.06 - ${INSTALLER_VERSION}"
 # definitions for the Update installer
 !if ${INSTALLER_VERSION} == "Update"
  !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX16svn3"
- !define PRODUCT_VERSION_OLD "LyX 1.6.0beta3"
- !define PRODUCT_VERSION_SHORT_OLD "16beta3"
+ !define PRODUCT_VERSION_OLD "LyX 1.6.0beta4"
+ !define PRODUCT_VERSION_SHORT_OLD "16beta4"
  !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 MiKTeXDeliveredVersion "2.7" # could be an older version
 !endif
@@ -58,7 +58,7 @@ BrandingText "LyXWinInstaller v4.06 - ${INSTALLER_VERSION}"
 !if ${INSTALLER_VERSION} == "Complete"
  !define GSviewInstall "external\gsv49w32.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 MiKTeXDeliveredVersion "2.7"
 !endif

diff --git a/development/Win32/packaging/AltInstaller/Updated.nsh b/development/Win32/packaging/AltInstaller/Updated.nsh
index f61a9041969b32b7e2e960bdbe12bef3efbda94e..73f7dc5c58bab5d337e3cde0c62206e8efcd68b7 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Updated.nsh
+++ b/development/Win32/packaging/AltInstaller/Updated.nsh
@@ -1,43 +1,12 @@
 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
  File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" # always here
  File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe" # 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
- File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\LyX.py"
  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
 

diff --git a/development/Win32/packaging/AltInstaller/Variables.nsh b/development/Win32/packaging/AltInstaller/Variables.nsh
index ffcc0095614225c40d583dc1ee5a4d80220465ab..de6bc17e2fb9b84137750d401a359b83182dd7fb 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Variables.nsh
+++ b/development/Win32/packaging/AltInstaller/Variables.nsh
@@ -8,7 +8,6 @@ Var LatexPath
 Var MiKTeXInstalled
 Var PythonPath
 Var Answer
-Var AppFiles
 Var AppPre
 Var AppSubfolder
 Var AppSuff