installer for beta4

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

development/Win32/packaging/AltInstaller/ChangeLog.txt

@@ -1,4 +1,10 @@
-Version 4.05
+Version 4.06
+- LyX 1.6beta4
+  (list of current regressions: http://tinyurl.com/yu4the )
+  (list of current crashes and critical bugs: http://tinyurl.com/653prg)
+
+
+Version 4.05
 - LyX 1.6beta3
   (list of current regressions: http://tinyurl.com/yu4the )
 

development/Win32/packaging/AltInstaller/ConfigLyX.nsh

@@ -28,17 +28,6 @@ Function ConfigureLyX
    StrCpy $PathPrefix "$PathPrefix;$SVGPath"
   ${endif}
   
-  # Set a path prefix in lyxrc.dist
-  ClearErrors
-  ${if} "$PathPrefix" != ""
-   Delete "$INSTDIR\Resources\lyxrc.dist"
-   FileOpen $R1 "$INSTDIR\Resources\lyxrc.dist" w
-   FileWrite $R1 '\path_prefix "$PathPrefix"$\r$\n'
-   FileClose $R1
-   IfErrors 0 +2
-    MessageBox MB_OK|MB_ICONEXCLAMATION "$(ModifyingConfigureFailed)"
-  ${endif}
-
   # Create a batch file to start LyX with the environment variables set
   ClearErrors
   Delete "${PRODUCT_BAT}"
@@ -50,29 +39,33 @@ Function ConfigureLyX
   FileClose $R1
   IfErrors 0 +2
    MessageBox MB_OK|MB_ICONEXCLAMATION "$(CreateCmdFilesFailed)"
-
-  # set up the preferences file
+   
+  # Set the path prefix in lyxrc.dist
+  ClearErrors
+  Delete "$INSTDIR\Resources\lyxrc.dist"
+  FileOpen $R1 "$INSTDIR\Resources\lyxrc.dist" w
+  # set some general things
+  FileWrite $R1 '\preview_scale_factor "1.0"$\r$\n\
+  		 \screen_zoom "120"$\r$\n'
+  ${if} "$PathPrefix" != ""
+   FileWrite $R1 '\path_prefix "$PathPrefix"$\r$\n'
+  ${endif}
   # if Acrobat or Adobe Reader is used
   ${if} $Acrobat == "Yes" # used for Acrobat / Adobe Reader
-    # writes settings to the preferences file
-    ${LineFind} "$INSTDIR\Resources\preferences" "$INSTDIR\Resources\preferences" "75" "AcroPref"
-    # ${LineFind} is a macro from TextFunc.nsh # calls Function AcroPref
+   FileWrite $R1 '\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "pdfview" "" "document,vector"$\r$\n\
+   		  \format "pdf2" "pdf" "PDF (pdflatex)" "F" "pdfview" "" "document,vector"$\r$\n\
+		  \format "pdf" "pdf" "PDF (ps2pdf)" "P" "pdfview" "" "document,vector"$\r$\n'
   ${endif}
-  
-  # if a SVG to PDF converter ws found (e.g. Inkscape) define it in the preferences
+  # if a SVG to PDF converter ws found (e.g. Inkscape)
   ${if} $SVGPath != ""
-   ${if} $Acrobat == "Yes"
-    # writes settings to the preferences file
-    ${LineFind} "$INSTDIR\Resources\preferences" "$INSTDIR\Resources\preferences" "78" "SVGPref1"
-    # deletes lines from the preferences file
-    ${LineFind} "$INSTDIR\Resources\preferences" "$INSTDIR\Resources\preferences" "87:90" "SVGPref2"
-   ${else}
-    # writes settings to the preferences file but 3 lines earlier because the
-    #3 PDF lines are in this case not here
-    ${LineFind} "$INSTDIR\Resources\preferences" "$INSTDIR\Resources\preferences" "75" "SVGPref1"
-    ${LineFind} "$INSTDIR\Resources\preferences" "$INSTDIR\Resources\preferences" "84:87" "SVGPref2"
-   ${endif}
-  ${endif} 
+   FileWrite $R1 '\format "svg" "svg" "SVG" "" "inkscape --file=$$$$i" "inkscape --file=$$$$i" "vector"$\r$\n\
+   		  \converter "svg" "png" "inkscape --without-gui --file=$$$$i --export-png=$$$$o" ""$\r$\n\
+		  \converter "svg" "pdf" "inkscape --file=$$$$i --export-area-drawing --without-gui --export-pdf=$$$$o" ""$\r$\n\
+		  \converter "svg" "pdf2" "inkscape --file=$$$$i --export-area-drawing --without-gui --export-pdf=$$$$o" ""'
+  ${endif}
+  FileClose $R1
+  IfErrors 0 +2
+  MessageBox MB_OK|MB_ICONEXCLAMATION "$(ModifyingConfigureFailed)"
   
   # register LyX
   ${if} $CreateFileAssociations == "true"
@@ -155,41 +148,3 @@ Function ConfigureLyX
 
 FunctionEnd
 
-# --------------------------------
-
-Function AcroPref
- # writes PDF settings to the preferences file
-
-  FileWrite $R4 '\format "pdf3" "pdf" "PDF (dvipdfm)" "m" "pdfview" "" "document,vector"$\r$\n\
-		 \format "pdf2" "pdf" "PDF (pdflatex)" "F" "pdfview" "" "document,vector"$\r$\n\
-		 \format "pdf" "pdf" "PDF (ps2pdf)" "P" "pdfview" "" "document,vector"$\r$\n'
-  Push $0
-  
-FunctionEnd
-
-# --------------------------------
-
-Function SVGPref1
- # writes SVG settings to the preferences file
-  
-  FileWrite $R4 '\format "svg" "svg" "SVG" "" "inkscape --file=$$$$i" "inkscape --file=$$$$i" "vector"$\r$\n\
-		 $\r$\n\
-		 #$\r$\n\
-		 # CONVERTERS SECTION ##########################$\r$\n\
-		 #$\r$\n\
-		 $\r$\n\
-		 \converter "svg" "png" "inkscape --without-gui --file=$$$$i --export-png=$$$$o" ""$\r$\n\
-                 \converter "svg" "pdf" "inkscape --file=$$$$i --export-area-drawing --without-gui --export-pdf=$$$$o" ""$\r$\n\
-		 \converter "svg" "pdf2" "inkscape --file=$$$$i --export-area-drawing --without-gui --export-pdf=$$$$o" ""'
-  Push $0
-  
-FunctionEnd
-
-Function SVGPref2
- # deletes lines from the preferences file
-  
-  StrCpy $0 SkipWrite
-  Push $0
-  
-FunctionEnd
-

development/Win32/packaging/AltInstaller/LyXInstaller-small.nsi

@@ -63,7 +63,6 @@ Var SVGPath
 !include "FileFunc.nsh"
 !include "StrFunc.nsh"
 !include "TextFunc.nsh"
-!insertmacro LineFind
 
 # Set of various macros and functions
 !include "LyXUtils.nsh"

development/Win32/packaging/AltInstaller/Settings.nsh

@@ -3,8 +3,8 @@
 
 !define PRODUCT_DIR "D:\LyXPackage1.6"
 !define PRODUCT_NAME "LyX"
-!define PRODUCT_VERSION "1.6.0beta3"
-!define PRODUCT_VERSION_SHORT "16beta3"
+!define PRODUCT_VERSION "1.6.0beta4"
+!define PRODUCT_VERSION_SHORT "16beta4"
 !define PRODUCT_SUBFOLDER "lyx16"
 !define PRODUCT_LICENSE_FILE "${PRODUCT_DIR}\License.txt"
 !define PRODUCT_SOURCEDIR "${PRODUCT_DIR}\LyX"
@@ -19,12 +19,12 @@
 !define PRODUCT_INFO_URL "http://www.lyx.org/"
 !define LAUNCHER_EXE "$INSTDIR\bin\LyXLauncher.exe"
 
-BrandingText "LyXWinInstaller v4.05 - ${INSTALLER_VERSION}"
+BrandingText "LyXWinInstaller v4.06 - ${INSTALLER_VERSION}"
 
 # to check later if this installer version is running at the same time
-!define INSTALLER_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-05-AltInstaller-${INSTALLER_VERSION}.exe"
-!define INSTALLER2_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-05-AltInstaller-${INSTALLER2_VERSION}.exe"
-!define INSTALLER3_EXE "LyX-${PRODUCT_VERSION_SHORT}-4-05-AltInstaller-${INSTALLER3_VERSION}.exe"
+!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 VERSION_BITMAP "${PRODUCT_DIR}\icons\lyx_logo_vert${PRODUCT_VERSION_SHORT}.bmp"
 
 # Replaced by HKLM or HKCU depending on SetShellVarContext.
@@ -40,8 +40,8 @@ BrandingText "LyXWinInstaller v4.05 - ${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.0beta1"
- !define PRODUCT_VERSION_SHORT_OLD "16beta1"
+ !define PRODUCT_VERSION_OLD "LyX 1.6.0beta3"
+ !define PRODUCT_VERSION_SHORT_OLD "16beta3"
  !define JabRefVersion "2.3.1" # could be an older version
  !define ImageMagickVersion_Old "6.4.1" # could be an older version
  !define GhostscriptVersion_Old "8.62" # could be an older version
@@ -65,7 +65,7 @@ BrandingText "LyXWinInstaller v4.05 - ${INSTALLER_VERSION}"
 
 !define ClassFileDir "${PRODUCT_SOURCEDIR}\Resources\tex"
 
-!define ImageMagickVersion "6.4.1"
+!define ImageMagickVersion "6.4.2"
 # for some odd reason the ImageMagick folder may not be a subfolder of $INSTDIR\bin!
 !define ImageMagickDir "$INSTDIR\etc\ImageMagick"
 !define GhostscriptDir "$INSTDIR\etc\Ghostscript"