installer: prepare for next releases

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

diff --git a/development/Win32/packaging/AltInstaller/Deleted.nsh b/development/Win32/packaging/AltInstaller/Deleted.nsh
index 8b148de066ebcefc06677e9a89a506cebcb37b2b..4b091c29a20d7f2add39be184b15ef5f2bd5a3c3 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Deleted.nsh
+++ b/development/Win32/packaging/AltInstaller/Deleted.nsh
@@ -1,6 +1,6 @@
 Function DeleteFiles
 
- # list with deleted files for LyX 1.5rc2 27-06-2007
+ # list with deleted files for LyX 1.6svn xx-xx-2007
 
 
 FunctionEnd

diff --git a/development/Win32/packaging/AltInstaller/Settings.nsh b/development/Win32/packaging/AltInstaller/Settings.nsh
index 18205f2a4062553badef7eaca60787e3c045558f..8f4297743a96a07246de487df52e4bd7010ad407 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Settings.nsh
+++ b/development/Win32/packaging/AltInstaller/Settings.nsh
@@ -1,11 +1,11 @@
 # installer settings
 # You should need to change only these macros for new releases.
 
-!define PRODUCT_DIR "D:\LyXPackage1.5"
+!define PRODUCT_DIR "D:\LyXPackage1.6"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.5.1"
-!define PRODUCT_VERSION_SHORT "151"
-!define PRODUCT_SUBFOLDER "lyx15"
+!define PRODUCT_VERSION "1.6svn"
+!define PRODUCT_VERSION_SHORT "16svn"
+!define PRODUCT_SUBFOLDER "lyx16"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
 !define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX"
 !define PRODUCT_EXE "$INSTDIR\bin\lyx.exe"
@@ -19,12 +19,12 @@
 !define PRODUCT_INFO_URL "http://www.lyx.org/"
 !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"
 
-BrandingText "LyXWinInstaller v3.18 - ${INSTALLER_VERSION}"
+BrandingText "LyXWinInstaller v4.0 - ${INSTALLER_VERSION}"
 
 # to check later if this installer version is running at the same time
-!define INSTALLER_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER_VERSION}-3-18.exe"
-!define INSTALLER2_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER2_VERSION}-3-18.exe"
-!define INSTALLER3_EXE "LyXWin${PRODUCT_VERSION_SHORT}${INSTALLER3_VERSION}-3-18.exe"
+!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-0-AltInstaller-${INSTALLER_VERSION}.exe"
+!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-0-AltInstaller-${INSTALLER2_VERSION}.exe"
+!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-0-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.
@@ -39,9 +39,9 @@ BrandingText "LyXWinInstaller v3.18 - ${INSTALLER_VERSION}"
 # definitions for the Update installer
 !if ${INSTALLER_VERSION} == "Update"
  !define PRODUCT_UNINST_KEY_OLD "Software\Microsoft\Windows\CurrentVersion\Uninstall\LyX150svn"
- !define PRODUCT_VERSION_OLD "LyX 1.5rc2-27-05-2007"
+ !define PRODUCT_VERSION_OLD "LyX 1.6svn"
  !define PRODUCT_UNINSTALL_EXE_OLD "$INSTDIR\LyXWinUninstall.exe"
- !define PRODUCT_VERSION_SHORT_OLD "150"
+ !define PRODUCT_VERSION_SHORT_OLD "160"
  !define JabRefVersion "2.2" # could be an older version
  !define MiKTeXDeliveredVersion "2.6" # could be an older version
 !endif

diff --git a/development/Win32/packaging/AltInstaller/Updated.nsh b/development/Win32/packaging/AltInstaller/Updated.nsh
index 9a8a614f3ba435cfa380289544c796f3b9bcaba2..31949450d290e929017483ccb6194e5e77234e24 100644 (file)
--- a/development/Win32/packaging/AltInstaller/Updated.nsh
+++ b/development/Win32/packaging/AltInstaller/Updated.nsh
@@ -1,66 +1,10 @@
 Function UpdateModifiedFiles
 
- # list with modified files for LyX 1.5rc2 27-06-2007
+ # list with modified files for LyX 1.6svn xx-xx-2007
  SetOutPath "$INSTDIR\bin"
  File "${PRODUCT_SOURCEDIR}\bin\lyx.exe" # always here
  File "${PRODUCT_SOURCEDIR}\bin\tex2lyx.exe" # always here
- SetOutPath "$INSTDIR\Resources"
- File "${PRODUCT_SOURCEDIR}\Resources\configure.py"
- File "${PRODUCT_SOURCEDIR}\Resources\languages"
- File "${PRODUCT_SOURCEDIR}\Resources\symbols"
- File "${PRODUCT_SOURCEDIR}\Resources\unicodesymbols"
  File /r "${PRODUCT_SOURCEDIR}\Resources\locale" # always here
- File /r "${PRODUCT_SOURCEDIR}\Resources\layouts"
- SetOutPath "$INSTDIR\Resources\doc"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\Customization.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\EmbeddedObjects.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\Extended.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\LaTeXConfig.lyx.in"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\TOC.lyx" # must be here when another \doc file has been changed
- File "${PRODUCT_SOURCEDIR}\Resources\doc\Userguide.lyx"
- SetOutPath "$INSTDIR\Resources\doc\clipart"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\clipart\escher-lsd.eps"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\clipart\mobius.eps"
- SetOutPath "$INSTDIR\Resources\doc\de"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\DummyDocument1.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\DummyDocument2.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\DummyTextDocument.txt"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\EmbeddedObjects.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\FAQ.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\TOC.lyx" # must be here when another \doc file has been changed
- File "${PRODUCT_SOURCEDIR}\Resources\doc\de\Userguide.lyx"
- File /r "${PRODUCT_SOURCEDIR}\Resources\doc\de\clipart"
- SetOutPath "$INSTDIR\Resources\doc\es"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\es\EmbeddedObjects.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\es\TOC.lyx" # must be here when another \doc file has been changed
- SetOutPath "$INSTDIR\Resources\doc\it"
- File "${PRODUCT_SOURCEDIR}\Resources\doc\it\TOC.lyx" # must be here when another \doc file has been changed
- File "${PRODUCT_SOURCEDIR}\Resources\doc\it\Userguide.lyx"
- SetOutPath "$INSTDIR\Resources\examples"
- File "${PRODUCT_SOURCEDIR}\Resources\examples\modernCV.lyx"
- SetOutPath "$INSTDIR\Resources\examples\fa"
- File "${PRODUCT_SOURCEDIR}\Resources\examples\fa\splash.lyx"
- SetOutPath "$INSTDIR\Resources\examples\hu"
- File "${PRODUCT_SOURCEDIR}\Resources\examples\hu\example_lyxified.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\examples\hu\example_raw.lyx"
- SetOutPath "$INSTDIR\Resources\images"
- File "${PRODUCT_SOURCEDIR}\Resources\images\closetab.xpm"
- SetOutPath "$INSTDIR\Resources\kbd"
- File "${PRODUCT_SOURCEDIR}\Resources\kbd\farsi.kmap"
- SetOutPath "$INSTDIR\Resources\images\math"
- File "${PRODUCT_SOURCEDIR}\Resources\images\math\functions.xpm"
- File "${PRODUCT_SOURCEDIR}\Resources\images\math\varrho.xpm"
- SetOutPath "$INSTDIR\Resources\lyx2lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\LyX.py"
- File "${PRODUCT_SOURCEDIR}\Resources\lyx2lyx\lyx_1_5.py"
- SetOutPath "$INSTDIR\Resources\scripts"
- File "${PRODUCT_SOURCEDIR}\Resources\scripts\ext_copy.py"
- SetOutPath "$INSTDIR\Resources\templates"
- File "${PRODUCT_SOURCEDIR}\Resources\templates\IEEEtran.lyx"
- File "${PRODUCT_SOURCEDIR}\Resources\templates\iop-article.lyx"
- SetOutPath "$INSTDIR\Resources\ui"
- File "${PRODUCT_SOURCEDIR}\Resources\ui\stdtoolbars.inc"
- File "${PRODUCT_SOURCEDIR}\Resources\ui\stdmenus.inc"
 
 FunctionEnd