Changeset: 728e35d1b2f6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=728e35d1b2f6
Added Files:
        misc/packages/deb/changelog
        misc/packages/deb/copyright
Modified Files:
        cmake/monetdb-deb-packages.cmake
        cmake/monetdb-functions.cmake
        cmake/monetdb-packages.cmake
        common/stream/CMakeLists.txt
Branch: default
Log Message:

fix most of the cmake code for building deb packages


diffs (truncated from 6915 to 300 lines):

diff --git a/cmake/monetdb-deb-packages.cmake b/cmake/monetdb-deb-packages.cmake
--- a/cmake/monetdb-deb-packages.cmake
+++ b/cmake/monetdb-deb-packages.cmake
@@ -28,8 +28,7 @@ set(CPACK_COMPONENT_MONETDB_DESCRIPTION 
  single shared library.  If you want to use MonetDB, you will certainly
  need this package, but you will also need at least the monetdb5-server
  package, and most likely also monetdb5-sql, as well as one or
- more client packages.
-")
+ more client packages.")
 
 set(CPACK_DEBIAN_MONETDBDEV_PACKAGE_NAME "libmonetdb-dev")
 set(CPACK_DEBIAN_MONETDBDEV_PACKAGE_DEPENDS "\\\${shlibs:Depends}, 
\\\${misc:Depends}, libmonetdb${GDK_VERSION_MAJOR}, libmonetdb-stream-dev")
@@ -40,8 +39,7 @@ set(CPACK_COMPONENT_MONETDBDEV_DESCRIPTI
  accelerators.  It also has an SQL front end.
  .
  This package contains files needed to develop extensions to the core
- functionality of MonetDB.
-")
+ functionality of MonetDB.")
 
 set(CPACK_DEBIAN_STREAM_PACKAGE_NAME 
"libmonetdb-stream${STREAM_VERSION_MAJOR}")
 set(CPACK_DEBIAN_STREAM_PACKAGE_DEPENDS "\\\${shlibs:Depends}, 
\\\${misc:Depends}")
@@ -52,8 +50,7 @@ set(CPACK_COMPONENT_STREAM_DESCRIPTION "
  accelerators.  It also has an SQL front end.
  .
  This package contains a shared library (libstream) which is needed by
- various other components.
-")
+ various other components.")
 
 set(CPACK_DEBIAN_STREAMDEV_PACKAGE_NAME "libmonetdb-stream-dev")
 set(CPACK_DEBIAN_STREAMDEV_PACKAGE_DEPENDS "\\\${shlibs:Depends}, 
\\\${misc:Depends}, libmonetdb-stream${STREAM_VERSION_MAJOR} (= 
\\\${source:Version}")
@@ -64,8 +61,7 @@ set(CPACK_COMPONENT_STREAMDEV_DESCRIPTIO
  accelerators.  It also has an SQL front end.
  .
  This package contains the files to develop with the
- libmonetdb-stream13 library.
-")
+ libmonetdb-stream13 library.")
 
 set(CPACK_DEBIAN_CLIENT_PACKAGE_NAME "libmonetdb-client${MAPI_VERSION_MAJOR}")
 set(CPACK_DEBIAN_CLIENT_PACKAGE_DEPENDS "\\\${shlibs:Depends}, 
\\\${misc:Depends}")
@@ -76,8 +72,7 @@ set(CPACK_COMPONENT_CLIENT_DESCRIPTION "
  accelerators.  It also has an SQL front end.
  .
  This package contains a shared library (libmapi) which is needed by
- various other components.
-")
+ various other components.")
 
 set(CPACK_DEBIAN_CLIENTDEV_PACKAGE_NAME "libmonetdb-client-dev")
 set(CPACK_DEBIAN_CLIENTDEV_PACKAGE_DEPENDS "\\\${shlibs:Depends}, 
\\\${misc:Depends}, libmonetdb-client${MAPI_VERSION_MAJOR} (= 
\\\${source:Version}")
@@ -88,8 +83,7 @@ set(CPACK_COMPONENT_CLIENTDEV_DESCRIPTIO
  accelerators.  It also has an SQL front end.
  .
  This package contains the files to develop with the libmonetdb-client12
- library.
-")
+ library.")
 
 set(CPACK_DEBIAN_MCLIENT_PACKAGE_NAME "monetdb-client")
 set(CPACK_DEBIAN_MCLIENT_PACKAGE_RECOMMENDS "monetdb5-sql (= 
\\\${source:Version}")
@@ -103,8 +97,7 @@ set(CPACK_COMPONENT_MCLIENT_DESCRIPTION 
  This package contains mclient, the main client program to communicate
  with the MonetDB database server, and msqldump, a program to dump the
  SQL database so that it can be loaded back later.  If you want to use
- MonetDB, you will very likely need this package.
-")
+ MonetDB, you will very likely need this package.")
 
 set(CPACK_DEBIAN_ODBC_PACKAGE_NAME "libmonetdb-client-odbc")
 set(CPACK_DEBIAN_ODBC_PACKAGE_DEPENDS "\\\${shlibs:Depends}\\\${misc:Depends}")
@@ -114,8 +107,7 @@ set(CPACK_COMPONENT_ODBC_DESCRIPTION "Mo
  automatic index management, extensibility of data types and search
  accelerators.  It also has an SQL front end.
  .
- This package contains the MonetDB ODBC driver.
-")
+ This package contains the MonetDB ODBC driver.")
 
 set(CPACK_DEBIAN_CLIENTTEST_PACKAGE_NAME "monetdb-client-testing")
 set(CPACK_DEBIAN_CLIENTTEST_PACKAGE_DEPENDS "\\\${shlibs:Depends} 
,libmonetdb-client-odbc (= \\\${source:Version}),
@@ -132,8 +124,7 @@ set(CPACK_COMPONENT_CLIENTTEST_DESCRIPTI
  .
  This package contains the sample MAPI programs used for testing other
  MonetDB packages.  You probably don't need this, unless you are a
- developer.
-")
+ developer.")
 
 set(CPACK_DEBIAN_GEOM_PACKAGE_NAME "libmonetdb5-server-geom")
 set(CPACK_DEBIAN_GEOM_PACKAGE_DEPENDS "\\\${shlibs:Depends}\\\${misc:Depends}, 
monetdb5-sql (= \\\${source:Version}")
@@ -145,8 +136,7 @@ set(CPACK_COMPONENT_GEOM_DESCRIPTION "Mo
  accelerators.  It also has an SQL front end.
  .
  This package contains the GIS (Geographic Information System)
- extensions for MonetDB-SQL-server5.
-")
+ extensions for MonetDB-SQL-server5.")
 
 set(CPACK_DEBIAN_FITS_PACKAGE_NAME "libmonetdb5-server-cfitsio")
 set(CPACK_DEBIAN_FITS_PACKAGE_DEPENDS "\\\${shlibs:Depends}, 
\\\${misc:Depends}, monetdb5-sql (= \\\${source:Version}")
@@ -158,8 +148,7 @@ set(CPACK_COMPONENT_FITS_DESCRIPTION "Mo
  accelerators.  It also has an SQL front end.
  .
  This package contains a module for accessing data in the FITS file
- format.
-")
+ format.")
 
 set(CPACK_DEBIAN_SERVER_PACKAGE_NAME "monetdb5-server")
 #set(CPACK_DEBIAN_SERVER_PACKAGE_DEPENDS "\\\${misc:Depends}, adduser")
@@ -174,8 +163,7 @@ set(CPACK_COMPONENT_SERVER_DESCRIPTION "
  .
  This package contains the MonetDB server component.  You need this
  package if you want to use the MonetDB database system.  If you want
- to use the SQL front end, you also need monetdb5-sql.
-")
+ to use the SQL front end, you also need monetdb5-sql.")
 set(CPACK_DEBIAN_SERVER_PACKAGE_CONTROL_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/debian/monetdb5-server.dirs
   ${CMAKE_CURRENT_SOURCE_DIR}/debian/monetdb5-server.docs
@@ -193,8 +181,7 @@ set(CPACK_COMPONENT_HUGEINT_DESCRIPTION 
  accelerators.  It also has an SQL front end.
  .
  This package provides HUGEINT (128-bit integer) support for the
- MonetDB5-server component.
-")
+ MonetDB5-server component.")
 
 set(CPACK_DEBIAN_SERVERDEV_PACKAGE_NAME "monetdb5-server-dev")
 set(CPACK_DEBIAN_SERVERDEV_PACKAGE_DEPENDS "\\\${shlibs:Depends}, 
\\\${misc:Depends},
@@ -206,8 +193,7 @@ set(CPACK_COMPONENT_SERVERDEV_DESCRIPTIO
  accelerators.  It also has an SQL front end.
  .
  This package contains files needed to develop extensions that can be
- used from the MAL level.
-")
+ used from the MAL level.")
 
 set(CPACK_DEBIAN_SQL_PACKAGE_NAME "monetdb5-sql")
 set(CPACK_DEBIAN_SQL_PACKAGE_DEPENDS
@@ -223,8 +209,7 @@ set(CPACK_COMPONENT_SQL_DESCRIPTION "Mon
  automatic index management, extensibility of data types and search
  accelerators.  It also has an SQL front end.
  .
- This package contains the SQL front end for MonetDB.
-")
+ This package contains the SQL front end for MonetDB.")
 set(CPACK_DEBIAN_SQL_PACKAGE_CONTROL_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/debian/monetdb5-sql.default
   ${CMAKE_CURRENT_SOURCE_DIR}/debian/monetdb5-sql.dirs
@@ -245,8 +230,7 @@ set(CPACK_COMPONENT_SQLINT128_DESCRIPTIO
  accelerators.  It also has an SQL front end.
  .
  This package provides HUGEINT (128-bit integer) support for the SQL
- front end of MonetDB.
-")
+ front end of MonetDB.")
 
 set(CPACK_DEBIAN_PYAPI3_PACKAGE_NAME "monetdb-python3")
 set(CPACK_DEBIAN_PYAPI3_PACKAGE_DEPENDS
@@ -265,8 +249,7 @@ set(CPACK_COMPONENT_PYAPI3_DESCRIPTION "
  .
  NOTE: INSTALLING THIS PACKAGE OPENS UP SECURITY ISSUES.  If you don't
  know how this package affects the security of your system, do not
- install it.
-")
+ install it.")
 
 set(CPACK_DEBIAN_RAPI_PACKAGE_NAME "monetdb-r")
 set(CPACK_DEBIAN_RAPI_PACKAGE_DEPENDS
@@ -285,8 +268,7 @@ set(CPACK_COMPONENT_RAPI_DESCRIPTION "In
  .
  NOTE: INSTALLING THIS PACKAGE OPENS UP SECURITY ISSUES.  If you don't
  know how this package affects the security of your system, do not
- install it.
-")
+ install it.")
 
 set(CPACK_DEBIAN_TESTING_PACKAGE_NAME "monetdb-testing")
 set(CPACK_DEBIAN_TESTING_PACKAGE_DEPENDS
@@ -300,8 +282,7 @@ set(CPACK_COMPONENT_TESTING_DESCRIPTION 
  .
  This package contains the programs and files needed for testing the
  MonetDB packages.  You probably don't need this, unless you are a
- developer.  If you do want to test, install monetdb-testing-python.
-")
+ developer.  If you do want to test, install monetdb-testing-python.")
 
 set(CPACK_DEBIAN_PYTESTING_PACKAGE_NAME "monetdb-testing-python")
 set(CPACK_DEBIAN_PYTESTING_PACKAGE_DEPENDS
@@ -319,8 +300,7 @@ set(CPACK_COMPONENT_PYTESTING_DESCRIPTIO
  This package contains the Python programs and files needed for
  testing the MonetDB packages.  You probably don't need this, unless
  you are a developer, but if you do want to test, this is the package
- you need.
-")
+ you need.")
 
 set(CPACK_DEBIAN_DEBUG_PACKAGE_NAME "monetdb-dbg")
 set(CPACK_DEBIAN_DEBUG_PACKAGE_SECTION "debug")
@@ -333,5 +313,4 @@ set(CPACK_COMPONENT_PYTESTING_DESCRIPTIO
  accelerators.  It also has an SQL front end.
  .
  This package contains the debugging symbols for all monetdb binary
- packages.
-")
+ packages.")
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -226,3 +226,103 @@ function(assert_package_detected)
   add_test("testDetect${assert_package_variablename}Detect"
     "test_${assert_package_variablename}_detect_var")
 endfunction()
+
+function(monetdb_debian_extra_files)
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb-client-dev
+    COMPONENT clientdev)
+
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb-client12
+    COMPONENT client)
+
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb-client-odbc
+    COMPONENT odbc)
+
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb-dev
+    COMPONENT monetdb-dev)
+
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb-stream-dev
+    COMPONENT streamdev)
+
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb-stream13
+    COMPONENT stream)
+
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb19
+    COMPONENT monetdb)
+
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/libmonetdb-dev
+    COMPONENT monetdbdev)
+
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/monetdb-client-testing
+    COMPONENT clienttest)
+
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/monetdb-testing-python
+    COMPONENT pytesting)
+
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/monetdb-testing
+    COMPONENT testing)
+
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/changelog
+    ${CMAKE_SOURCE_DIR}/misc/packages/deb/copyright
+    DESTINATION
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to