- Use more spelled out Windows platform names, "windows-x86-32bit"

kboortz · kboortz · commit 88438f3e6365 · 2014-06-22T02:56:35.000+02:00
- Removed the "-noinstall-" part of the Windows ZIP package name,
  like is done for the server
- Updated copyright year in README
- Updated copyright year in modified files, ignoring header updates
- Added a few missing copyright headers
- Added a missing "Use is subject to license terms"
- Removed "win/releasedXml"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -197,9 +197,9 @@ INCLUDE(${CMAKE_SOURCE_DIR}/FindMySQL.cmake)
 IF(NOT CONNECTOR_PLATFORM)
   IF(WIN32)
     IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
-      SET(CONNECTOR_PLATFORM "winx64")
+      SET(CONNECTOR_PLATFORM "windows-x86-64bit")
     ELSE(CMAKE_SIZEOF_VOID_P MATCHES 8)
-      SET(CONNECTOR_PLATFORM "win32")
+      SET(CONNECTOR_PLATFORM "windows-x86-32bit")
     ENDIF(CMAKE_SIZEOF_VOID_P MATCHES 8)
   ELSE(WIN32)
     SET(CONNECTOR_PLATFORM "unknown")
@@ -244,12 +244,11 @@ SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README")
 SET(CPACK_RESOURCE_FILE_INSTALL "${CMAKE_SOURCE_DIR}/INSTALL")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}-${CONNECTOR_PLATFORM}")
+SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
 IF(WIN32)
   SET(CPACK_GENERATOR "ZIP")
-  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-noinstall-${MYSQLCPPCONN_VERSION}-${CONNECTOR_PLATFORM}")
 ELSE(WIN32)
   SET(CPACK_GENERATOR "TGZ")
-  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
 ENDIF(WIN32)
 
 INSTALL(FILES
diff --git a/README b/README
@@ -7,7 +7,7 @@ copy of the software is released under the version 2 of
 the GNU General Public License. MySQL Connector/C++ is
 brought to you by Oracle.
 
-Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 
 License information can be found in the COPYING file.
 
diff --git a/cppconn/config.h.cm b/cppconn/config.h.cm
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
    The MySQL Connector/C++ is licensed under the terms of the GPLv2
    <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # The MySQL Connector/C++ is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/mysql_prepared_statement.cpp b/driver/mysql_prepared_statement.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/mysql_prepared_statement.h b/driver/mysql_prepared_statement.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/mysql_uri.cpp b/driver/mysql_uri.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/mysql_util.h b/driver/mysql_util.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/mysql_warning.h b/driver/mysql_warning.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/nativeapi/libmysql_dynamic_proxy.cpp b/driver/nativeapi/libmysql_dynamic_proxy.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/nativeapi/libmysql_dynamic_proxy.h b/driver/nativeapi/libmysql_dynamic_proxy.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/nativeapi/libmysql_static_proxy.h b/driver/nativeapi/libmysql_static_proxy.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/nativeapi/mysql_client_api.h b/driver/nativeapi/mysql_client_api.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/nativeapi/mysql_native_statement_wrapper.cpp b/driver/nativeapi/mysql_native_statement_wrapper.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/nativeapi/mysql_native_statement_wrapper.h b/driver/nativeapi/mysql_native_statement_wrapper.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/driver/nativeapi/native_statement_wrapper.h b/driver/nativeapi/native_statement_wrapper.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/examples/cpp_trace_analyzer.php b/examples/cpp_trace_analyzer.php
@@ -1,6 +1,7 @@
 <?php
 /*
-  Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2008 Sun Microsystems, Inc.
+  Use is subject to license terms.
 
   The MySQL Connector/C++ is licensed under the terms of the GPLv2
   <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/test/framework/CMakeLists.txt b/test/framework/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 # The MySQL Connector/C++ is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 # The MySQL Connector/C++ is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/test/unit/bugs/bugs.h b/test/unit/bugs/bugs.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/test/unit/classes/connection.cpp b/test/unit/classes/connection.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/test/unit/unit_fixture.cpp b/test/unit/unit_fixture.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/test/unit/unit_fixture.h b/test/unit/unit_fixture.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 # The MySQL Connector/C++ is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -29,11 +29,11 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
 # This is Windows only, so just set one of two possible
 
 SET(CONNECTOR_PLATFORM "Intel")
-SET(CONNECTOR_PLATFORM_SUFFIX "win32")
+SET(CONNECTOR_PLATFORM_SUFFIX "windows-x86-32bit")
 SET(CONNECTOR_DEFAULT_DEST "ProgramFilesFolder")
 IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
   SET(CONNECTOR_PLATFORM "x64")
-  SET(CONNECTOR_PLATFORM_SUFFIX "winx64")
+  SET(CONNECTOR_PLATFORM_SUFFIX "windows-x86-64bit")
   SET(CONNECTOR_DEFAULT_DEST "ProgramFiles64Folder")
 ENDIF(CMAKE_SIZEOF_VOID_P MATCHES 8)
 
diff --git a/win/mysql-conncpp-msi-arpprops.xml b/win/mysql-conncpp-msi-arpprops.xml
@@ -1,3 +1,19 @@
+<!--
+   Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+-->
 <Include>
   <Property Id="ARPCOMMENTS" Value="MySQL Connector/C++ is a MySQL database connector for C++." />
   <Property Id="ARPCONTACT" Value="http://www.mysql.com/about/contact/" />
diff --git a/win/mysql-conncpp-msi-template.xml.in b/win/mysql-conncpp-msi-template.xml.in
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+-->
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
   <Product Id="@CONNECTOR_PKG_ID1@" Name="MySQL Connector C++ @CONNECTOR_PRODUCT_VERSION@" Language="1033" Version="@CONNECTOR_PRODUCT_VERSION@" Manufacturer="Oracle and/or its affiliates" UpgradeCode="fe990d78-8bb1-4880-930a-0430e707f3ca">
     <Package Id="@CONNECTOR_PKG_ID2@" Keywords="Installer,MSI,Database" Description="MySQL C++ Connector @CONNECTOR_PRODUCT_VERSION@" InstallerVersion="200" Platforms="@CONNECTOR_PLATFORM@" Compressed="yes" SummaryCodepage="1252" />
diff --git a/win/mysql-conncpp-msi-ui.xml b/win/mysql-conncpp-msi-ui.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+-->
 <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
   <Fragment>
     <!-- Custom version of WelcomeDialog.  Original source WelcomeDialog.wxs from wixui -->
diff --git a/win/releasedXml/mysql-conncpp-msi-template.Intel.xml b/win/releasedXml/mysql-conncpp-msi-template.Intel.xml
diff --git a/win/releasedXml/mysql-conncpp-msi-template.x64.xml b/win/releasedXml/mysql-conncpp-msi-template.x64.xml

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`#`
`4`	`4`	`# The MySQL Connector/C++ is licensed under the terms of the GPLv2`
`5`	`5`	`# <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most`