Add components to INSTALL, some eraly Wix support

scripts/CMakeLists.txt

@@ -66,7 +66,7 @@ INSTALL(FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
   ${CMAKE_CURRENT_SOURCE_DIR}/fill_help_tables.sql
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_test_data_timezone.sql
-  DESTINATION ${INSTALL_MYSQLSHAREDIR}
+  DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
 )
 
 # TCMalloc hacks
@@ -166,12 +166,10 @@ ELSE()
  SET(EXT ".pl")
 ENDIF()
 
-INSTALL(FILES
+INSTALL_SCRIPT(
  "${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db${EXT}"
-  DESTINATION ${DEST}
-  PERMISSIONS OWNER_READ OWNER_WRITE 
-  OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
-  WORLD_READ WORLD_EXECUTE 
+  DESTINATION ${INSTALL_BINDIR}
+  COMPONENT Server
   )
 
 
@@ -260,29 +258,17 @@ IF(WIN32)
   FOREACH(file ${PLIN_FILES})
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in
       ${CMAKE_CURRENT_BINARY_DIR}/${file}.pl ESCAPE_QUOTES @ONLY)
-	 
-    INSTALL(FILES
-      ${CMAKE_CURRENT_BINARY_DIR}/${file}.pl
-      DESTINATION scripts
-      PERMISSIONS OWNER_READ OWNER_WRITE 
-      OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
-      WORLD_READ WORLD_EXECUTE 
-      )
+    INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file}.pl)
   ENDFOREACH()
 
   FOREACH(file ${SH_FILES})
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
        ${CMAKE_CURRENT_BINARY_DIR}/${file}.pl ESCAPE_QUOTES @ONLY)
-    INSTALL(FILES
-      ${CMAKE_CURRENT_BINARY_DIR}/${file}.pl
-      DESTINATION scripts
-      PERMISSIONS OWNER_READ OWNER_WRITE 
-      OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
-      WORLD_READ WORLD_EXECUTE
-      )
+    INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file}.pl)
   ENDFOREACH()
 ELSE()
   # On Unix, most of the files end up in the bin directory
+  SET(mysql_config_COMPONENT COMPONENT Development)
   SET(BIN_SCRIPTS
     msql2mysql
     mysql_config
@@ -312,13 +298,14 @@ ELSE()
       MESSAGE(FATAL_ERROR "Can not find ${file}.sh or ${file} in "
         "${CMAKE_CURRENT_SOURCE_DIR}" )
     ENDIF()
-   INSTALL(FILES 
-    ${CMAKE_CURRENT_BINARY_DIR}/${file}
-    DESTINATION ${INSTALL_BINDIR}
-    PERMISSIONS OWNER_READ OWNER_WRITE 
-    OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
-    WORLD_READ WORLD_EXECUTE 
-   )
+    IF(NOT ${file}_COMPONENT)
+      SET(${file}_COMPONENT Server)
+    ENDIF()
+    INSTALL_SCRIPT(
+      ${CMAKE_CURRENT_BINARY_DIR}/${file} 
+      DESTINATION ${INSTALL_BINDIR}
+      COMPONENT ${${file}_COMPONENT}
+     )
   ENDFOREACH()
 ENDIF()
 
@@ -333,7 +320,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")
      ERROR_QUIET
   )
   IF(${RESULT} EQUAL 0 AND EXISTS ${LIBGCC_LOCATION})
-    INSTALL(FILES "${LIBGCC_LOCATION}" DESTINATION ${INSTALL_LIBDIR})
+    INSTALL(FILES "${LIBGCC_LOCATION}" DESTINATION ${INSTALL_LIBDIR}
+    COMPONENT Development)
   ENDIF()
 ENDIF()
 

scripts/make_win_bin_dist

@@ -158,7 +158,7 @@ cp tests/$TARGET/*.exe                                   $DESTDIR/bin/
 cp libmysql/$TARGET/libmysql.dll                         $DESTDIR/bin/
 
 cp sql/$TARGET/mysqld.exe                $DESTDIR/bin/mysqld$EXE_SUFFIX.exe
-cp sql/$TARGET/mysqld.map                $DESTDIR/bin/mysqld$EXE_SUFFIX.map
+cp sql/$TARGET/mysqld.map                $DESTDIR/bin/mysqld$EXE_SUFFIX.map || /bin/true
 if [ x"$TARGET" != x"release" ] ; then
   cp sql/$TARGET/mysqld.pdb              $DESTDIR/bin/mysqld$EXE_SUFFIX.pdb
 fi