Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision ec3efea2e6f5b0d00920bb85ff389f4509e10ec2)
+++ CMakeLists.txt	(revision 416d6edcfcfd77f8faf531597cffe0a35294f9a0)
@@ -2,5 +2,8 @@
 project(TOL-Installer)
 
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/NSIS" ${CMAKE_MODULE_PATH})
+if(WIN32)
+  # módulo adicional para construir el instalados con NSIS
+  set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/NSIS" ${CMAKE_MODULE_PATH})
+endif(WIN32)
 
 if(NOT TOL_RUNTIME_DIR)
@@ -8,73 +11,14 @@
 endif(NOT TOL_RUNTIME_DIR)
 
-# => http://www.cmake.org/Wiki/CMake:Component_Install_With_CPack
-
-if( WIN32 )
-  # BIN (APPLICATION)
-  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/*.dll" dll_pattern )
-  file( GLOB RT_DLL  ${dll_pattern} )
-  install( FILES ${RT_DLL} DESTINATION "bin" COMPONENT application)
-  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/*.exe" exe_pattern )
-  file( GLOB RT_EXE  ${exe_pattern} )
-  install( FILES ${RT_EXE} DESTINATION "bin" COMPONENT application)
-  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/stdlib" stdlib_dir )
-  install( DIRECTORY ${stdlib_dir} DESTINATION "bin" COMPONENT application 
-    PATTERN ".svn" EXCLUDE )
-  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/language.txt" language_txt )
-  file( GLOB RT_TXT  ${language_txt} )
-  install( FILES ${RT_TXT} DESTINATION "bin" COMPONENT application)
-  # BIN (DEVELOPMENT)
-  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/*.lib" lib_pattern )
-  file( GLOB RT_LIB  ${lib_pattern} )
-  install( FILES ${RT_LIB} DESTINATION "bin" COMPONENT development)
-  # LIB (APPLICATION)
-  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/lib" lib_dir )
-  install( DIRECTORY ${lib_dir} DESTINATION "." COMPONENT application
-    PATTERN "*.a" EXCLUDE PATTERN ".svn" EXCLUDE )
-  # INCLUDE (DEVELOPMENT)
-  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/include" include_dir )
-  install( DIRECTORY ${include_dir} DESTINATION "." COMPONENT development)
-
-  set(CPACK_COMPONENTS_GROUPING "ALL_COMPONENTS_IN_ONE")
-  set(CPACK_COMPONENTS_ALL application development)
-
-  set(CPACK_COMPONENT_APPLICATION_REQUIRED 1)
-  set(CPACK_COMPONENT_DEVELOPMENT_DISABLED 1)
-
-  set(CPACK_COMPONENT_APPLICATION_DISPLAY_NAME "TOL Application")
-  set(CPACK_COMPONENT_DEVELOPMENT_DISPLAY_NAME "C++ Headers & Libraries")
-
-  set(CPACK_COMPONENT_APPLICATION_DESCRIPTION 
-    "Main components of TOL Application")
-  set(CPACK_COMPONENT_DEVELOPMENT_DESCRIPTION
-    "C/C++ header files and libraries for development purposes")
-endif( WIN32 )
-
-if( UNIX )
-  # BIN
-  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/tol*" exe_pattern )
-  file( GLOB RT_EXE  ${exe_pattern} )
-  install( FILES ${RT_EXE} DESTINATION "local/tol3.2-i/bin" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/stdlib" stdlib_dir )
-  install( DIRECTORY ${stdlib_dir} DESTINATION "local/tol3.2-i/bin")
-  # LIB
-  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/lib" lib_dir )
-  install( DIRECTORY ${lib_dir} DESTINATION "local/tol3.2-i")
-  # INCLUDE
-  file( TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/include" include_dir )
-  install( DIRECTORY ${include_dir} DESTINATION "local/tol3.2-i")
-endif( UNIX )
-
-configure_file( ${CMAKE_SOURCE_DIR}/CPackOptions.cmake.in ${PROJECT_BINARY_DIR}/CPackOptions.cmake )
-
-# => http://stackoverflow.com/questions/21144655/customizing-nsis-installer-using-cpack
 # => http://www.cmake.org/Wiki/CMake:CPackPackageGenerators
 
-if( WIN32 )
+if(WIN32)
+  # usando MinGW
   set(CPACK_PACKAGE_NAME "TOL (GNU)")
-endif( WIN32 )
-if( UNIX )
+endif(WIN32)
+if(UNIX)
   set(CPACK_PACKAGE_NAME "TOL")
-endif( UNIX )
+endif(UNIX)
+
 set(CPACK_PACKAGE_VENDOR "Tol-Project")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Time Oriented Language")
@@ -83,44 +27,101 @@
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
-if( WIN32 )
+
+if(WIN32)
+  # usando MinGW (ej. tol-gnu-v3.2)
   set(CPACK_PACKAGE_NAMEV "tol-gnu-v${CPACK_PACKAGE_VERSION}")
-endif( WIN32 )
-if( UNIX )
-  set(CPACK_PACKAGE_NAMEV "tol-v${CPACK_PACKAGE_VERSION}")
-endif( UNIX )
+endif(WIN32)
+if(UNIX)
+  # (ej. tol_3.2)
+  set(CPACK_PACKAGE_NAMEV "tol-${CPACK_PACKAGE_VERSION}")
+endif(UNIX)
+
+# obligatorio para DEB
 set(CPACK_PACKAGE_CONTACT "Pedro Gea <pgea@bayesforecast.com>")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${CPACK_PACKAGE_NAMEV}")
-set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAMEV}")
 
-set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/NSIS/nsis_tol.bmp") 
-if( WIN32 )
-  string(REPLACE "/" "\\\\" CPACK_PACKAGE_ICON ${CPACK_PACKAGE_ICON}) 
-endif( WIN32 )
+if(UNIX)
+  set(CPACK_DEBIAN_PACKAGE_SECTION "Mathematics")
+endif(UNIX)
+
+if(WIN32)
+  set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_VENDOR}\\\\${CPACK_PACKAGE_NAMEV}")
+  set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${CPACK_PACKAGE_NAMEV}")
+
+  # => http://www.cmake.org/Wiki/CMake:Component_Install_With_CPack
+
+  # BIN (APPLICATION)
+  file(TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/*.dll" dll_pattern)
+  file(GLOB RT_DLL  ${dll_pattern})
+  install(FILES ${RT_DLL} DESTINATION "bin" COMPONENT application)
+  file(TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/*.exe" exe_pattern)
+  file(GLOB RT_EXE  ${exe_pattern})
+  install(FILES ${RT_EXE} DESTINATION "bin" COMPONENT application)
+  file(TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/stdlib" stdlib_dir)
+  install(DIRECTORY ${stdlib_dir} DESTINATION "bin" COMPONENT application 
+    PATTERN ".svn" EXCLUDE)
+  file(TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/language.txt" language_txt)
+  file(GLOB RT_TXT  ${language_txt})
+  install(FILES ${RT_TXT} DESTINATION "bin" COMPONENT application)
+  # BIN (DEVELOPMENT)
+  file(TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/*.lib" lib_pattern)
+  file(GLOB RT_LIB  ${lib_pattern})
+  install(FILES ${RT_LIB} DESTINATION "bin" COMPONENT development)
+  # LIB (APPLICATION)
+  file(TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/lib" lib_dir)
+  install(DIRECTORY ${lib_dir} DESTINATION "." COMPONENT application
+    PATTERN "*.a" EXCLUDE PATTERN ".svn" EXCLUDE)
+  # INCLUDE (DEVELOPMENT)
+  file(TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/include" include_dir)
+  install(DIRECTORY ${include_dir} DESTINATION "." COMPONENT development)
+
+  # Components
+  set(CPACK_COMPONENTS_GROUPING "ALL_COMPONENTS_IN_ONE")
+  set(CPACK_COMPONENTS_ALL application development)
+  set(CPACK_COMPONENT_APPLICATION_REQUIRED 1)
+  set(CPACK_COMPONENT_DEVELOPMENT_DISABLED 1)
+  set(CPACK_COMPONENT_APPLICATION_DISPLAY_NAME "TOL Application")
+  set(CPACK_COMPONENT_DEVELOPMENT_DISPLAY_NAME "C++ Headers & Libraries")
+  set(CPACK_COMPONENT_APPLICATION_DESCRIPTION "Main components of TOL Application")
+  set(CPACK_COMPONENT_DEVELOPMENT_DESCRIPTION "C/C++ header files and libraries for development purposes")
+endif(WIN32)
+
+if(UNIX)
+  # BIN
+  file(TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/tol*" exe_pattern)
+  file(GLOB RT_EXE  ${exe_pattern})
+  install(FILES ${RT_EXE} DESTINATION "lib/tol${CPACK_PACKAGE_VERSION}/bin" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
+  file(TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/bin/stdlib" stdlib_dir)
+  install(DIRECTORY ${stdlib_dir} DESTINATION "lib/tol${CPACK_PACKAGE_VERSION}/bin")
+  # LIB
+  file(TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/lib" lib_dir)
+  install(DIRECTORY ${lib_dir} DESTINATION "lib/tol${CPACK_PACKAGE_VERSION}")
+  # INCLUDE
+  file(TO_CMAKE_PATH "${TOL_RUNTIME_DIR}/include" include_dir)
+  install(DIRECTORY ${include_dir} DESTINATION "lib/tol${CPACK_PACKAGE_VERSION}")
+endif(UNIX)
+
+# => http://stackoverflow.com/questions/21144655/customizing-nsis-installer-using-cpack
+configure_file(${CMAKE_SOURCE_DIR}/CPackOptions.cmake.in ${PROJECT_BINARY_DIR}/CPackOptions.cmake)
 
 set(CPACK_PROPERTIES_FILE "${PROJECT_BINARY_DIR}/CPackOptions.cmake")
 
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/tol/COPYING" )
-if( WIN32 )
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/tol/COPYING")
+if(WIN32)
   string(REPLACE "/" "\\\\" CPACK_RESOURCE_FILE_LICENSE ${CPACK_RESOURCE_FILE_LICENSE})
-endif( WIN32 )
+endif(WIN32)
 
-if( UNIX )
-set(CPACK_DEBIAN_PACKAGE_SECTION "Mathematics")
-endif( UNIX )
+if(WIN32)
+  # => http://www.mantidproject.org/NSIS_CPACK_Customisations
+  # => http://nsis.sourceforge.net/Environmental_Variables:_append,_prepend,_and_remove_entries
+  # => http://www.cmake.org/Wiki/CMake:CPackNSISAdvancedTips 
 
-if( WIN32 )
-  set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/NSIS/tolbase-install.ico" )
+  set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/NSIS/nsis_tol.bmp") 
+  string(REPLACE "/" "\\\\" CPACK_PACKAGE_ICON ${CPACK_PACKAGE_ICON}) 
+  set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/NSIS/tolbase-install.ico")
     string(REPLACE "/" "\\\\" CPACK_NSIS_MUI_ICON ${CPACK_NSIS_MUI_ICON})
-  set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/NSIS/tolbase-uninstall.ico" )
+  set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/NSIS/tolbase-uninstall.ico")
     string(REPLACE "/" "\\\\" CPACK_NSIS_MUI_UNIICON ${CPACK_NSIS_MUI_UNIICON})
   set(CPACK_NSIS_HELP_LINK "www.tol-project.org")
-endif( WIN32 )
 
-# => http://www.mantidproject.org/NSIS_CPACK_Customisations
-# => http://nsis.sourceforge.net/Environmental_Variables:_append,_prepend,_and_remove_entries
-
-# => http://www.cmake.org/Wiki/CMake:CPackNSISAdvancedTips
-
-if(WIN32)
   # nombre del paquete en el instalador
   set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_NAME} ${CPACK_PACKAGE_VERSION}")
@@ -151,10 +152,8 @@
 endif(WIN32)
 
-if( UNIX )
-  # nombre del instalador:
+if(UNIX)
+  # nombre del paquete instalador
   set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAMEV}")
-  # crea acceso directos a estos ejecutables (pares nombre_archivo nombre_acceso)
-  set(CPACK_PACKAGE_EXECUTABLES tolsh "tolsh-v${CPACK_PACKAGE_VERSION}")
-endif( UNIX )
+endif(UNIX)
 
 include(CPack)
Index: building/Linux_32/build_installer.sh
===================================================================
--- building/Linux_32/build_installer.sh	(revision 416d6edcfcfd77f8faf531597cffe0a35294f9a0)
+++ building/Linux_32/build_installer.sh	(revision 416d6edcfcfd77f8faf531597cffe0a35294f9a0)
@@ -0,0 +1,51 @@
+#!/bin/bash
+TRUNK_DIR=$(dirname $0)/../..
+cd $TRUNK_DIR
+CMAKE_DIR=building/Linux_32/installer
+
+echo -n "mkdir? (y/n) "
+read answer
+if [ "$answer" = "y" ]
+then
+  if [ -d "$CMAKE_DIR" ]; then 
+    rm -r "$CMAKE_DIR"
+  fi
+  mkdir -p "$CMAKE_DIR"
+fi
+
+cd $CMAKE_DIR
+
+echo -n "cmake? (y/n) "
+read answer
+if [ "$answer" = "y" ]
+then
+  cmake -DTOL_RUNTIME_DIR=/usr/local/tol3.2-release -DCMAKE_BUILD_TYPE=Release ../../..
+fi
+
+echo -n "cpack -G DEB? (y/n) "
+read answer
+if [ "$answer" = "y" ]
+then
+  cpack -G DEB
+fi
+
+echo -n "cpack -G RPM? (y/n) "
+read answer
+if [ "$answer" = "y" ]
+then
+  cpack -G RPM
+fi
+
+echo -n "press enter to exit "
+read answer
+
+
+
+
+
+
+
+
+
+
+