- Removed "-GA" from CONNECTOR_LEVEL, we don't want it in the MSI package name

kboortz · kboortz · commit 24bc60ef42ac · 2014-06-21T20:15:13.000+02:00
- Added PROJECT(MSI), to make sure CMAKE_SIZEOF_VOID_P is initiated
- Removed the bundling of the Microsoft redistributable library
diff --git a/VersionInfo.cmake b/VersionInfo.cmake
@@ -25,7 +25,7 @@
 SET(CONNECTOR_MAJOR "1")
 SET(CONNECTOR_MINOR "1")
 SET(CONNECTOR_PATCH "4")
-SET(CONNECTOR_LEVEL "-GA")
+SET(CONNECTOR_LEVEL "")     # "-alpha", "-beta", empty if GA
 SET(CONNECTOR_QUALITY "GA")
 
 # Bump this every time we change the API/ABI
diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt
@@ -22,6 +22,7 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 #
 
+PROJECT(MSI)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
 
@@ -36,52 +37,8 @@ IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
   SET(CONNECTOR_DEFAULT_DEST "ProgramFiles64Folder")
 ENDIF(CMAKE_SIZEOF_VOID_P MATCHES 8)
 
-
 INCLUDE("config.cmake")
 
-
-#####################################
-# Looking for ms redistributable libs
-
-SET(THE_MACHINE "x86")
-SET(CRT_VERSION "90")
-
-SET(MSVCRTX_REDIST_DIR "$ENV{VCINSTALLDIR}\\redist")
-
-EXECUTE_PROCESS(COMMAND "dumpbin" "/DEPENDENTS" "${CMAKE_SOURCE_DIR}/../driver/RelWithDebInfo/mysqlcppconn.dll"
-				OUTPUT_VARIABLE CPPLIB_DEPENDENCIES
-				)
-
-IF(${CPPLIB_DEPENDENCIES} MATCHES ".*MSVC.([0-9]+)[.]dll.*")
-	STRING(REGEX REPLACE ".*MSVC.([0-9]+)[.]dll.*" "\\1" CRT_VERSION "${CPPLIB_DEPENDENCIES}")
-ENDIF(${CPPLIB_DEPENDENCIES} MATCHES ".*MSVC.([0-9]+)[.]dll.*")
-
-STRING(REGEX MATCHALL "(MSVC.[0-9][0-9][.]dll)" DEPENDENTS "${CPPLIB_DEPENDENCIES}")
-
-
-# MESSAGE("${CRT_VERSION} ${MSVCRTX_REDIST_DIR} ${DEPENDENTS} ${MACHINE}")
-
-FOREACH(_dir $ENV{LIB})
-	# MESSAGE("${_dir}")
-	# $ENV{VCINSTALLDIR}
-	IF(${_dir} MATCHES ".+[\\]VC[\\]LIB[\\]([^\\]+)$")
-		STRING(REGEX REPLACE ".+[\\]LIB[\\]([^\\]+)$" "\\1" THE_MACHINE "${_dir}")
-		#MESSAGE("======= Have match for machine")
-	ENDIF(${_dir} MATCHES ".+[\\]VC[\\]LIB[\\]([^\\]+)$")
-ENDFOREACH(_dir $ENV{LIB})
-
-# MESSAGE("-=${THE_MACHINE}=-")
-
-SET(REQUIRED_REDISTRIBUTABLE_LIBS "")
-SET(counter "1")
-FOREACH(arg ${DEPENDENTS})
-	MESSAGE(STATUS "Adding found dependency lib: ${THE_MACHINE}\\${arg}")
-	SET(REQUIRED_REDISTRIBUTABLE_LIBS "${REQUIRED_REDISTRIBUTABLE_LIBS}
-<File Id=\"file016${counter}\" Name=\"${arg}\" LongName=\"${arg}\" Source=\"${MSVCRTX_REDIST_DIR}\\${THE_MACHINE}\\Microsoft.VC${CRT_VERSION}.CRT\\${arg}\" />")
-
-	MATH( EXPR counter "${counter} + 1" )
-ENDFOREACH(arg ${DEPENDENTS})
-
 SET(CONNECTOR_PRODUCT_DEST "MySQL Connector C++ ${CONNECTOR_PRODUCT_VERSION}")
 
 # Generate GUID
diff --git a/win/mysql-conncpp-msi-template.xml.in b/win/mysql-conncpp-msi-template.xml.in
@@ -91,9 +91,6 @@ already installed." />
                     <File Id="file0151" Name="mycppcon.lib" LongName="mysqlcppconn.lib" Source="..\driver\relwithdebinfo\mysqlcppconn.lib" />
                     <File Id="file0152" Name="mycpstat.lib" LongName="mysqlcppconn-static.lib" Source="..\driver\relwithdebinfo\mysqlcppconn-static.lib" />
 		  </Component>
-		  <Component Id="MSRedistributables" Guid="e50ed3bb-e5bd-42b5-9029-9ca2356fd0f3" DiskId="1">
-                    @REQUIRED_REDISTRIBUTABLE_LIBS@
-                  </Component>
                 </Directory>
               </Directory>
 
@@ -109,7 +106,6 @@ already installed." />
           <ComponentRef Id="IncludeFiles" />
 	  <ComponentRef Id="CppconnIncludes" />
           <ComponentRef Id="ClientLibraryRelease" />
-          <ComponentRef Id="MSRedistributables" />
 
           <Feature Id="DebugLibraries" Title="Debug Libary" Description="Debug library and symbols." Level="1000">
             <ComponentRef Id="ClientLibraryDebug" />
