The branch, master, has been updated.
- Log -----------------------------------------------------------------
commit 88513c0a90d825eff86bd20fafa1463f8cf76afd
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Sun Jul 8 15:48:26 2012 +0200
installer: rename install folder as discussed
- the proposed install folder is now "LyX 2.0" as discussed
- promote our wiki and also our website (as almost all other programs do as
well and which is quite helpful)
diff --git a/development/Win32/packaging/installer/include/declarations.nsh
b/development/Win32/packaging/installer/include/declarations.nsh
index dd420ac..5095ca3 100644
--- a/development/Win32/packaging/installer/include/declarations.nsh
+++ b/development/Win32/packaging/installer/include/declarations.nsh
@@ -43,12 +43,18 @@ Configuration of LyX installer
!define APP_NAME "LyX"
!define APP_VERSION_NUMBER
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}.${APP_VERSION_BUILD}"
-!define APP_SERIES_NAME
"${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_REVISION}"
+# for the proposed install folder we use the scheme "LyX 2.0" while we need
for the registry the scheme "LyX 2.0.4"
+# to check if it is exactly this version (to support side by side
installations)
+!define APP_SERIES_NAME "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"
!define APP_SERIES_KEY
"${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}"
!define APP_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App
Paths\${APP_NAME}.exe"
!define APP_DIR "${APP_NAME} ${APP_SERIES_NAME}"
!define APP_DIR_USERDATA "${APP_NAME}${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}"
!define APP_INFO "${APP_NAME} - The Document Processor"
+!define APP_WEBPAGE "http://www.lyx.org/";
+!define APP_WEBPAGE_INFO "${APP_NAME} Website"
+!define APP_WIKI "http://wiki.lyx.org";
+!define APP_WIKI_INFO "${APP_NAME} Wiki"
!define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2012
by the LyX Team"
!define APP_RUN "bin\lyx.exe"
diff --git a/development/Win32/packaging/installer/setup/configure.nsh
b/development/Win32/packaging/installer/setup/configure.nsh
index 6d90669..925b432 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -6,7 +6,6 @@ Write registry information and configure LyX
*/
-#Var DistFile
Var PathPrefix
#!define SHORTCUT '${APP_NAME} ${APP_SERIES_NAME}.lnk" "$INSTDIR\${APP_RUN}"
"" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}"'
@@ -22,10 +21,12 @@ Section -InstallData
WriteRegStr SHCTX ${APP_REGKEY_SETUP} "LaTeX Path" $PathLaTeX
# Start Menu shortcut
- # There is only one shortcut to the application, so it should be in the main
group
SetOutPath "$INSTDIR\bin" # this is the folder in which the shortcut is
executed
CreateDirectory "$SMPROGRAMS\$StartmenuFolder"
CreateShortCut "$SMPROGRAMS\$StartmenuFolder\${APP_NAME}.lnk"
"$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}"
+ # Link to www.lyx.org and to the Wiki
+ WriteINIStr "$SMPROGRAMS\$StartmenuFolder\${APP_WEBPAGE_INFO}.url"
"InternetShortcut" "URL" "${APP_WEBPAGE}"
+ WriteINIStr "$SMPROGRAMS\$StartmenuFolder\${APP_WIKI_INFO}.url"
"InternetShortcut" "URL" "${APP_WIKI}"
# create desktop icon
${if} $CreateDesktopIcon == "true"
SetOutPath "$INSTDIR\bin"
-----------------------------------------------------------------------
Summary of changes:
.../packaging/installer/include/declarations.nsh | 8 +++++++-
.../Win32/packaging/installer/setup/configure.nsh | 5 +++--
2 files changed, 10 insertions(+), 3 deletions(-)
hooks/post-receive
--
The LyX Source Repository
