Changeset 4dd22a0 in tol

Timestamp:

Jul 15, 2015, 10:46:28 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

5be80cd

Parents:

1873cc1

Message:

Refs #1827
Cambios en el instalador de TOL (MSVC):

• Se corrige la versión de google/sparsehash en el sdk
• Se modifican nombre en el instlador
• Se añaden los nuevos iconos del instalador/desinstalador
• Se corrige el desinstalador (no borraba accesos directos)
• Se corrige el nombre del método .onInit (muestra opciones de lenguaje).

Se podrían revisar aún algunas cuestiones como los mensajes en español que se utilizan.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6788 be4846ae-f051-483a-831f-b64e7d08527f

Location:

windows

Files:

• NSIS/Tolbase.nsi.generate.tol (modified) (2 diffs)
• NSIS/Tolbase.nsi.template (modified) (8 diffs)
• build_tools/build_tol_sdk/build_tol_sdk.tol (modified) (1 diff)

windows/NSIS/Tolbase.nsi.generate.tol

@@ -68 +68 @@
 {
   Set aux = Tokenizer(Version," ");
-  aux[1]+" "+aux[2]
+  aux[1]+" "+aux[2] // se mantiene la "v"
 };
 
@@ -74 +74 @@
 {
   Set aux = Tokenizer(Version," ");
-  aux[1]
+  TextSub(aux[1],2,-1) // quita la "v"
 };
 

windows/NSIS/Tolbase.nsi.template

@@ -4 +4 @@
 !define APP_VERSION "##APP_VERSION##"
 !define APP_RELEASE "##APP_RELEASE##"
-!define APP_NAME "tolbase"
-!define APP_NAMEV "tolbase-${APP_VERSION}"
+!define APP_NAME "TOL (MSVC)"
+!define APP_NAMEV "tol-msvc-v${APP_VERSION}"
+!define APP_DISPLAY_NAME "${APP_NAME} ${APP_VERSION}"
 !define APP_PUBLISHER "Tol-Project"
 !define APP_WEB_SITE "http://www.tol-project.org"
@@ -19 +20 @@
 ; MUI Settings
 !define MUI_ABORTWARNING
-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
+!define MUI_ICON "..\..\NSIS\tolbase-install.ico"
+!define MUI_UNICON "..\..\NSIS\tolbase-uninstall.ico"
 
 ; Language Selection Dialog Settings
@@ -30 +31 @@
 !insertmacro MUI_PAGE_WELCOME
 ; License page
-;!insertmacro MUI_PAGE_LICENSE "..\..\..\..\ruta\ala\licencia\TuLicenciaDeSoftware.txt"
+!insertmacro MUI_PAGE_LICENSE "..\..\tol\COPYING"
 ; Directory page
 !insertmacro MUI_PAGE_DIRECTORY
@@ -54 +55 @@
 ; MUI end ------
 
-Name "${APP_NAME} ${APP_VERSION}"
-OutFile "${APP_NAMEV}-setup.exe"
+Name "${APP_DISPLAY_NAME}"
+OutFile "${APP_NAMEV}-win32.exe"
 InstallDir "$PROGRAMFILES\${APP_PUBLISHER}\${APP_NAMEV}"
 InstallDirRegKey HKLM "${APP_DIR_REGKEY}" ""
@@ -61 +62 @@
 ShowUnInstDetails show
 
-Function .onIniti
+Function .onInit
   !insertmacro MUI_LANGDLL_DISPLAY
 FunctionEnd
@@ -70 +71 @@
   ##CreateDirAndFiles##
 
-  CreateDirectory "$SMPROGRAMS\${APP_NAMEV}"
-  CreateShortCut "$INSTDIR\bin\tolbase.lnk" "$INSTDIR\bin\tolbase.exe"
-  CreateShortCut "$SMPROGRAMS\${APP_NAMEV}\Tolbase.lnk" "$INSTDIR\bin\tolbase.exe"
-  CreateShortCut "$DESKTOP\${APP_NAMEV}.lnk" "$INSTDIR\bin\tolbase.exe"
-  
-SectionEnd
+  SetShellVarContext all
 
-Section -AdditionalIcons
-  SetOutPath $INSTDIR
-  WriteIniStr "$INSTDIR\${APP_NAME}.url" "InternetShortcut" "URL" "${APP_WEB_SITE}"
-  CreateShortCut "$SMPROGRAMS\${APP_NAMEV}\Website.lnk" "$INSTDIR\${APP_NAME}.url"
-  CreateShortCut "$SMPROGRAMS\${APP_NAMEV}\Uninstall.lnk" "$INSTDIR\uninst.exe"
+  CreateDirectory "$SMPROGRAMS\${APP_DISPLAY_NAME}"
+  CreateShortCut "$SMPROGRAMS\${APP_DISPLAY_NAME}\tolbase-msvc-v3.2.lnk" "$INSTDIR\bin\tolbase.exe"
+  WriteINIStr "$SMPROGRAMS\${APP_DISPLAY_NAME}\Tol-Project Site.url" "InternetShortcut" "URL" "${APP_WEB_SITE}"
+  CreateShortCut "$SMPROGRAMS\${APP_DISPLAY_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+
 SectionEnd
 
 Section -Post
-  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteUninstaller "$INSTDIR\Uninstall.exe"
   WriteRegStr HKLM "${APP_DIR_REGKEY}" "" "$INSTDIR"
   WriteRegStr ${APP_UNINST_ROOT_KEY} "${APP_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr ${APP_UNINST_ROOT_KEY} "${APP_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${APP_UNINST_ROOT_KEY} "${APP_UNINST_KEY}" "DisplayIcon" "$INSTDIR\bin\tol.exe"
+  WriteRegStr ${APP_UNINST_ROOT_KEY} "${APP_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"
+  WriteRegStr ${APP_UNINST_ROOT_KEY} "${APP_UNINST_KEY}" "DisplayIcon" "$INSTDIR\lib\toltk\images\tolbase-msvc.ico"
   WriteRegStr ${APP_UNINST_ROOT_KEY} "${APP_UNINST_KEY}" "DisplayVersion" "${APP_RELEASE}"
   WriteRegStr ${APP_UNINST_ROOT_KEY} "${APP_UNINST_KEY}" "URLInfoAbout" "${APP_WEB_SITE}"
@@ -108 +104 @@
 
 Section Uninstall
-  Delete "$INSTDIR\${APP_NAME}.url"
-  Delete "$INSTDIR\uninst.exe"
+  Delete "$INSTDIR\Uninstall.exe"
+  Delete "$INSTDIR\bin\stdlib\tol_release_check.tol"
 
   ##DeleteDirAndFiles##
@@ -115 +111 @@
   RMDir "$INSTDir"
 
+  SetShellVarContext all
+
+  Delete "$SMPROGRAMS\${APP_DISPLAY_NAME}\Uninstall.lnk"
+  Delete "$SMPROGRAMS\${APP_DISPLAY_NAME}\tolbase-msvc-v3.2.lnk"
+  Delete "$SMPROGRAMS\${APP_DISPLAY_NAME}\Tol-Project Site.url"
+  RMDir "$SMPROGRAMS\${APP_DISPLAY_NAME}"
+
   DeleteRegKey ${APP_UNINST_ROOT_KEY} "${APP_UNINST_KEY}"
   DeleteRegKey HKLM "${APP_DIR_REGKEY}"
+
   SetAutoClose true
 SectionEnd

windows/build_tools/build_tol_sdk/build_tol_sdk.tol

@@ -1 +1 @@
 Text tolSourcePath = "../../../tol";
-Text googleSourcePath = "../../tol-contrib/google/sparsehash-0.6/src/google";
+Text googleSourcePath = "../../tol-contrib/google/sparsehash-1.8.1/src/google";
 Text cintSourcePath = "../../tol-contrib/cint/inc";