Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 4a600df869d12991a03a494a5d697e78fba6ac44)
+++ CMakeLists.txt	(revision 2bec99e0bc9c24ad634354c4c394c19d70e5d020)
@@ -6,5 +6,5 @@
 if( NOT TOL_RUNTIME_DIR )
   message( FATAL_ERROR "You must specify the variable TOL_RUNTIME_DIR with the path to binary instalation of TOL. TOLTCL and TOLBASE should also be installed on that location." )
-endif(  NOT TOL_RUNTIME_DIR )
+endif( NOT TOL_RUNTIME_DIR )
 
 if( WIN32 )
@@ -19,30 +19,32 @@
   file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/stdlib" stdlib_dir )
   install( DIRECTORY ${stdlib_dir} DESTINATION "bin" )
-  file( TO_CMAKE_PATH "${CMAKE_SOURCE_DIR}/tolbase/lib/toltk/images/tolbase-gnu.ico" ico_tolbase )
-  install( FILES ${ico_tolbase} DESTINATION "bin" )
 endif( WIN32 )
 
-configure_file( ${CMAKE_SOURCE_DIR}/CPackOptions.cmake.in ${PROJECT_BINARY_DIR}/CPackOptions.cmake)
+configure_file( ${CMAKE_SOURCE_DIR}/CPackOptions.cmake.in ${PROJECT_BINARY_DIR}/CPackOptions.cmake )
 
 # http://stackoverflow.com/questions/21144655/customizing-nsis-installer-using-cpack
 # ...
 
-set(CPACK_PACKAGE_NAME "TOL")
-set(CPACK_PACKAGE_VENDOR "www.tol-project.org")
+set(CPACK_PACKAGE_NAME "TOL-GNU")
+set(CPACK_PACKAGE_VENDOR "Tol-Project")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Time Oriented Language")
-set(CPACK_PACKAGE_VERSION "3.2.0")
 set(CPACK_PACKAGE_VERSION_MAJOR "3")
 set(CPACK_PACKAGE_VERSION_MINOR "2")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "tolbase")
+set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_VENDOR}\\\\${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+
 set(CPACK_PROPERTIES_FILE "${PROJECT_BINARY_DIR}/CPackOptions.cmake")
-set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/tolbase/lib/toltk/images/splash-gnu.gif")
-string(REPLACE "/" "\\\\" CPACK_PACKAGE_ICON ${CPACK_PACKAGE_ICON})
+#set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}\\\\NSIS\\\\splash-gnu.bmp")
+#string(REPLACE "/" "\\\\" CPACK_PACKAGE_ICON ${CPACK_PACKAGE_ICON})
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/tol/COPYING" )
-string(REPLACE "/" "\\\\" CPACK_RESOURCE_FILE_LICENSE ${CPACK_RESOURCE_FILE_LICENSE})
+  string(REPLACE "/" "\\\\" CPACK_RESOURCE_FILE_LICENSE ${CPACK_RESOURCE_FILE_LICENSE})
 set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/NSIS/tolbase-install.ico" )
-string(REPLACE "/" "\\\\" CPACK_NSIS_MUI_ICON ${CPACK_NSIS_MUI_ICON})
+  string(REPLACE "/" "\\\\" CPACK_NSIS_MUI_ICON ${CPACK_NSIS_MUI_ICON})
 set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/NSIS/tolbase-uninstall.ico" )
-string(REPLACE "/" "\\\\" CPACK_NSIS_MUI_UNIICON ${CPACK_NSIS_MUI_UNIICON})
+  string(REPLACE "/" "\\\\" CPACK_NSIS_MUI_UNIICON ${CPACK_NSIS_MUI_UNIICON})
+
+set(CPACK_NSIS_HELP_LINK "www.tol-project.org")
 
 # http://www.mantidproject.org/NSIS_CPACK_Customisations
@@ -50,22 +52,32 @@
 
 if( WIN32 )
-  set (CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
-    Push \\\"TOLGNU_ROOT\\\"
-    Push \\\"A\\\"
-    Push \\\"HKCU\\\"
-    Push \\\"$INSTDIR\\\"
-    Call EnvVarUpdate
-    Pop  \\\$0" )  
-  set (CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
-    Push \\\"TOLGNU_ROOT\\\"
-    Push \\\"R\\\"
-    Push \\\"HKCU\\\"
-    Push \\\"$INSTDIR\\\"
-    Call un.EnvVarUpdate
-    Pop  \\\$0" )
-  set (ICONPATH "$INSTDIR/bin/tolbase-gnu.ico")
-	string(REPLACE "/" "\\\\" ICONPATH ${ICONPATH})
-	set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut	'$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\tolbase.lnk'	'$INSTDIR\\\\bin\\\\tolbase.exe' ''	'${ICONPATH}'" )
-	set(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete	'$SMPROGRAMS\\\\$MUI_TEMP\\\\tolbase.lnk'" )
+
+  # nombre del paquete en el instalador
+  set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}")
+  # nombre del instalador:
+  set(CPACK_PACKAGE_FILE_NAME "tol-gnu-${CPACK_PACKAGE_VERSION}-win32")
+
+  set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
+    DeleteRegValue HKCU \\\"Environment\\\" TOLGNU_ROOT
+    WriteRegExpandStr HKLM \\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\" TOLGNU_ROOT \\\$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
+    SendMessage \\\${HWND_BROADCAST} \\\${WM_WININICHANGE} 0 \\\"STR:Environment\\\" /TIMEOUT=5000
+  ") 
+
+  # añade el icono en el panel para desinstalar programas
+  set(CPACK_NSIS_INSTALLED_ICON_NAME "${INSTDIR}/lib/TolbaseApp3.2/toltk/images/tolbase-gnu.ico")
+    string(REPLACE "/" "\\\\" CPACK_NSIS_INSTALLED_ICON_NAME ${CPACK_NSIS_INSTALLED_ICON_NAME})
+
+  # pregunta tras instalar si abrir tolbase
+  set(CPACK_NSIS_MUI_FINISHPAGE_RUN "tolbase.exe")
+
+  # crea acceso directos a estos ejecutables (pares nombre_archivo nombre_acceso)
+  set(CPACK_PACKAGE_EXECUTABLES tolbase "tolbase-gnu-v3.2")
+  # crea otros accesos directos
+  set(CPACK_NSIS_MENU_LINKS "http://www.tol-project.org" "Tol-Project Site")
 
 endif( WIN32 )