Changeset 6755180 in tol

Timestamp:

Mar 1, 2016, 9:38:05 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

6688079

Parents:

48833d3

Message:

Refs #1899
Se corrigen el nombre del software y el de la variable de entorno para la versión de TOL 64-bits.
Así se evita colisión con la versión de 32-bits.

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

File:

• installer/windows/CMakeLists.txt (modified) (4 diffs)

installer/windows/CMakeLists.txt

@@ -16 +16 @@
   set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES64")
   set(win_system_name win64)
+  set(TOL_ENV_VAR TOLGNU_ROOT_64)
+  set(CPACK_PACKAGE_NAME "TOL (GNU-64)")
 else()
   message(STATUS "Installer for TOL 32-bits")
   set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES32")
   set(win_system_name win32)
+  set(TOL_ENV_VAR TOLGNU_ROOT)
+  set(CPACK_PACKAGE_NAME "TOL (GNU)")
 endif()
-
-set(CPACK_PACKAGE_NAME "TOL (GNU)")
 
 if(INCLUDE_TOLBASE)
   message(STATUS "Installer includes tolbase")
+  set(CPACK_PACKAGE_NAMEV_INSTALL "tol-gnu-v${CPACK_PACKAGE_VERSION}")
   set(CPACK_PACKAGE_NAMEV "tol-gnu-v${CPACK_PACKAGE_VERSION}")
 else()
   message(STATUS "Installer includes only tolsh")
+  set(CPACK_PACKAGE_NAMEV_INSTALL "tol-gnu-v${CPACK_PACKAGE_VERSION}")  
   # se utiliza un nombre diferente para el instalador sin tolbase
   set(CPACK_PACKAGE_NAMEV "tolsh-gnu-v${CPACK_PACKAGE_VERSION}")
@@ -36 +40 @@
 #! los proyectos tol, toltcl y rtol, y también tolbase si corresponde.
 
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${CPACK_PACKAGE_NAMEV}")
-set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAMEV}")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${CPACK_PACKAGE_NAMEV_INSTALL}")
+set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAMEV_INSTALL}")
 
 # => http://www.cmake.org/Wiki/CMake:Component_Install_With_CPack
@@ -106 +110 @@
 
 set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
-  DeleteRegValue HKCU \\\"Environment\\\" TOLGNU_ROOT
-  WriteRegExpandStr HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\" TOLGNU_ROOT \\\$INSTDIR
+  DeleteRegValue HKCU \\\"Environment\\\" ${TOL_ENV_VAR}
+  WriteRegExpandStr HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\" ${TOL_ENV_VAR} \\\$INSTDIR
   SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 \\\"STR:Environment\\\" /TIMEOUT=5000
 ") 
 set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
-  DeleteRegValue HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\" TOLGNU_ROOT
+  DeleteRegValue HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\" ${TOL_ENV_VAR}
   SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 \\\"STR:Environment\\\" /TIMEOUT=5000
 ") 
@@ -131 +135 @@
 
 # include(CPack) ha de hacerse en este mismo archivo para que funcione adecuadamente
-include( CPack )
+include(CPack)