Skip to content

Commit dce1cd7

Browse files
committed
packaging: Add back README.txt to be used in GPL binary packages.
1 parent 2715198 commit dce1cd7

File tree

2 files changed

+46
-20
lines changed

2 files changed

+46
-20
lines changed

PackageSpecs.cmake

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License, version 2.0, as
@@ -122,12 +122,11 @@ if(APPLE AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
122122
message(FATAL_ERROR "To create packages for OSX, build with clang compiler.")
123123
endif()
124124

125+
125126
# ======================================================================
126127
# Licenses for binary packages
127128
# ======================================================================
128129

129-
#if (0)
130-
131130
if(EXISTS "${CMAKE_SOURCE_DIR}/LICENSE.mysql.txt")
132131
set(LIC_FILE "LICENSE.mysql") # Without ".txt" extension
133132
else()
@@ -142,34 +141,22 @@ else()
142141
set(newline UNIX)
143142
endif()
144143

145-
146-
if(EXISTS "${CMAKE_SOURCE_DIR}/README.txt")
147-
set(info_files README ${LIC_FILE})
148-
set(CPACK_RESOURCE_FILE_README "README${info_ext}")
149-
else()
150-
set(info_files README.md CONTRIBUTING.md ${LIC_FILE})
151-
set(CPACK_RESOURCE_FILE_README "README.md")
152-
endif()
144+
set(info_files README ${LIC_FILE})
153145

154146
foreach(file ${info_files})
155-
if (${file} MATCHES "[.]*\\.md")
156-
set(file_src "${CMAKE_SOURCE_DIR}/${file}")
157-
set(file_bin "${CMAKE_BINARY_DIR}/${file}")
158-
else()
159-
set(file_src "${CMAKE_SOURCE_DIR}/${file}.txt")
160-
set(file_bin "${CMAKE_BINARY_DIR}/${file}${info_ext}")
161-
endif()
147+
148+
set(file_src "${CMAKE_SOURCE_DIR}/${file}.txt")
149+
set(file_bin "${CMAKE_BINARY_DIR}/${file}${info_ext}")
162150

163151
configure_file("${file_src}" "${file_bin}" NEWLINE_STYLE ${newline})
164152
install(FILES "${file_bin}" DESTINATION ${INSTALL_DOC_DIR} COMPONENT Readme)
165-
message("Installing README files: ${file_bin}")
166153

167154
endforeach()
168155

156+
set(CPACK_RESOURCE_FILE_README "README${info_ext}")
169157
set(CPACK_RESOURCE_FILE_LICENSE "${LIC_FILE}${info_ext}")
170158
#set(CPACK_RESOURCE_FILE_INSTALL "...") # FIXME
171159

172-
#endif()
173160

174161
# ======================================================================
175162
# Specs for source package

README.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved.
2+
3+
This is a release of MySQL Connector/C++, the C++ interface for communicating
4+
with MySQL servers.
5+
6+
License information can be found in the LICENSE.txt file.
7+
8+
This distribution may include materials developed by third parties.
9+
For license and attribution notices for these materials, please refer to the LICENSE.txt file.
10+
11+
For more information on MySQL Connector/C++, visit
12+
https://dev.mysql.com/doc/connector-cpp/en/
13+
14+
For additional downloads and the source of MySQL Connector/C++, visit
15+
http://dev.mysql.com/downloads
16+
17+
MySQL Connector/C++ is brought to you by the MySQL team at Oracle.
18+
19+
20+
DOCUMENTATION LOCATION
21+
======================
22+
23+
You can find the documentation on the MySQL website at
24+
<http://dev.mysql.com/doc/dev/connector-cpp/>
25+
26+
For the new features/bugfix history, see release notes at
27+
<https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0.html>.
28+
Note that the initial releases used major version 2.0.
29+
30+
CONTACT
31+
=======
32+
33+
For general discussion of the MySQL Connector/C++ please use the C/C++
34+
community forum at <http://forums.mysql.com/list.php?167> or join
35+
the MySQL Connector/C++ mailing list at <http://lists.mysql.com>.
36+
37+
Bugs can be reported at <http://bugs.mysql.com/report.php>. Please
38+
use the "Connector / C++" or "Connector / C++ Documentation" bug
39+
category.

0 commit comments

Comments
 (0)