From 410106de9505acb8259aa8baa1ec1db691c397c4 Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Fri, 27 Nov 2020 12:30:40 +0200 Subject: [PATCH] [#1580] backport #1469 to 1.8.2 --- src/share/database/scripts/cql/Makefile.am | 15 ++++-- src/share/database/scripts/mysql/Makefile.am | 54 ++++++++------------ src/share/database/scripts/pgsql/Makefile.am | 37 ++++++-------- 3 files changed, 46 insertions(+), 60 deletions(-) diff --git a/src/share/database/scripts/cql/Makefile.am b/src/share/database/scripts/cql/Makefile.am index 88208c33e0..87c15a0ae9 100644 --- a/src/share/database/scripts/cql/Makefile.am +++ b/src/share/database/scripts/cql/Makefile.am @@ -1,12 +1,17 @@ SUBDIRS = . +UPGRADESCRIPTS = +UPGRADESCRIPTS += upgrade_1.0_to_2.0.sh +UPGRADESCRIPTS += upgrade_2.0_to_3.0.sh +UPGRADESCRIPTS += upgrade_3.0_to_4.0.sh +UPGRADESCRIPTS += upgrade_4.0_to_5.0.sh +UPGRADESCRIPTS += wipe_data.sh + sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/cql sqlscripts_DATA = dhcpdb_create.cql sqlscripts_DATA += dhcpdb_drop.cql -sqlscripts_DATA += upgrade_1.0_to_2.0.sh -sqlscripts_DATA += upgrade_2.0_to_3.0.sh -sqlscripts_DATA += upgrade_3.0_to_4.0.sh -sqlscripts_DATA += upgrade_4.0_to_5.0.sh -sqlscripts_DATA += wipe_data.sh +sqlscripts_DATA += ${UPGRADESCRIPTS} + +DISTCLEANFILES = ${UPGRADESCRIPTS} EXTRA_DIST = ${sqlscripts_DATA} diff --git a/src/share/database/scripts/mysql/Makefile.am b/src/share/database/scripts/mysql/Makefile.am index a20ef1fe95..bf9514618a 100644 --- a/src/share/database/scripts/mysql/Makefile.am +++ b/src/share/database/scripts/mysql/Makefile.am @@ -1,41 +1,29 @@ SUBDIRS = . +UPGRADESCRIPTS = +UPGRADESCRIPTS += upgrade_1.0_to_2.0.sh +UPGRADESCRIPTS += upgrade_2.0_to_3.0.sh +UPGRADESCRIPTS += upgrade_3.0_to_4.0.sh +UPGRADESCRIPTS += upgrade_4.0_to_4.1.sh +UPGRADESCRIPTS += upgrade_4.1_to_5.0.sh +UPGRADESCRIPTS += upgrade_5.0_to_5.1.sh +UPGRADESCRIPTS += upgrade_5.1_to_5.2.sh +UPGRADESCRIPTS += upgrade_5.2_to_6.0.sh +UPGRADESCRIPTS += upgrade_6.0_to_7.0.sh +UPGRADESCRIPTS += upgrade_7.0_to_8.0.sh +UPGRADESCRIPTS += upgrade_8.0_to_8.1.sh +UPGRADESCRIPTS += upgrade_8.1_to_8.2.sh +UPGRADESCRIPTS += upgrade_8.2_to_9.0.sh +UPGRADESCRIPTS += upgrade_9.0_to_9.1.sh +UPGRADESCRIPTS += upgrade_9.1_to_9.2.sh +UPGRADESCRIPTS += upgrade_9.2_to_9.3.sh +UPGRADESCRIPTS += wipe_data.sh + sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/mysql sqlscripts_DATA = dhcpdb_create.mysql sqlscripts_DATA += dhcpdb_drop.mysql -sqlscripts_DATA += upgrade_1.0_to_2.0.sh -sqlscripts_DATA += upgrade_2.0_to_3.0.sh -sqlscripts_DATA += upgrade_3.0_to_4.0.sh -sqlscripts_DATA += upgrade_4.0_to_4.1.sh -sqlscripts_DATA += upgrade_4.1_to_5.0.sh -sqlscripts_DATA += upgrade_5.0_to_5.1.sh -sqlscripts_DATA += upgrade_5.1_to_5.2.sh -sqlscripts_DATA += upgrade_5.2_to_6.0.sh -sqlscripts_DATA += upgrade_6.0_to_7.0.sh -sqlscripts_DATA += upgrade_7.0_to_8.0.sh -sqlscripts_DATA += upgrade_8.0_to_8.1.sh -sqlscripts_DATA += upgrade_8.1_to_8.2.sh -sqlscripts_DATA += upgrade_8.2_to_9.0.sh -sqlscripts_DATA += upgrade_9.0_to_9.1.sh -sqlscripts_DATA += upgrade_9.1_to_9.2.sh -sqlscripts_DATA += upgrade_9.2_to_9.3.sh -sqlscripts_DATA += wipe_data.sh +sqlscripts_DATA += ${UPGRADESCRIPTS} -DISTCLEANFILES = upgrade_1.0_to_2.0.sh -DISTCLEANFILES += upgrade_2.0_to_3.0.sh -DISTCLEANFILES += upgrade_3.0_to_4.0.sh -DISTCLEANFILES += upgrade_4.0_to_4.1.sh -DISTCLEANFILES += upgrade_4.1_to_5.0.sh -DISTCLEANFILES += upgrade_5.0_to_5.1.sh -DISTCLEANFILES += upgrade_5.1_to_5.2.sh -DISTCLEANFILES += upgrade_5.2_to_6.0.sh -DISTCLEANFILES += upgrade_6.0_to_7.0.sh -DISTCLEANFILES += upgrade_7.0_to_8.0.sh -DISTCLEANFILES += upgrade_8.1_to_8.2.sh -DISTCLEANFILES += upgrade_8.2_to_9.0.sh -DISTCLEANFILES += upgrade_9.0_to_9.1.sh -DISTCLEANFILES += upgrade_9.1_to_9.2.sh -DISTCLEANFILES += upgrade_9.2_to_9.3.sh -DISTCLEANFILES += wipe_data.sh +DISTCLEANFILES = ${UPGRADESCRIPTS} EXTRA_DIST = ${sqlscripts_DATA} diff --git a/src/share/database/scripts/pgsql/Makefile.am b/src/share/database/scripts/pgsql/Makefile.am index 6fc0376ea7..2ace7eeed7 100644 --- a/src/share/database/scripts/pgsql/Makefile.am +++ b/src/share/database/scripts/pgsql/Makefile.am @@ -1,30 +1,23 @@ SUBDIRS = . +UPGRADESCRIPTS = +UPGRADESCRIPTS += upgrade_1.0_to_2.0.sh +UPGRADESCRIPTS += upgrade_2.0_to_3.0.sh +UPGRADESCRIPTS += upgrade_3.0_to_3.1.sh +UPGRADESCRIPTS += upgrade_3.1_to_3.2.sh +UPGRADESCRIPTS += upgrade_3.2_to_3.3.sh +UPGRADESCRIPTS += upgrade_3.3_to_4.0.sh +UPGRADESCRIPTS += upgrade_4.0_to_5.0.sh +UPGRADESCRIPTS += upgrade_5.0_to_5.1.sh +UPGRADESCRIPTS += upgrade_5.1_to_6.0.sh +UPGRADESCRIPTS += upgrade_6.0_to_6.1.sh +UPGRADESCRIPTS += wipe_data.sh + sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/pgsql sqlscripts_DATA = dhcpdb_create.pgsql sqlscripts_DATA += dhcpdb_drop.pgsql -sqlscripts_DATA += upgrade_1.0_to_2.0.sh -sqlscripts_DATA += upgrade_2.0_to_3.0.sh -sqlscripts_DATA += upgrade_3.0_to_3.1.sh -sqlscripts_DATA += upgrade_3.1_to_3.2.sh -sqlscripts_DATA += upgrade_3.2_to_3.3.sh -sqlscripts_DATA += upgrade_3.3_to_4.0.sh -sqlscripts_DATA += upgrade_4.0_to_5.0.sh -sqlscripts_DATA += upgrade_5.0_to_5.1.sh -sqlscripts_DATA += upgrade_5.1_to_6.0.sh -sqlscripts_DATA += upgrade_6.0_to_6.1.sh -sqlscripts_DATA += wipe_data.sh +sqlscripts_DATA += ${UPGRADESCRIPTS} -DISTCLEANFILES = upgrade_1.0_to_2.0.sh -DISTCLEANFILES += upgrade_2.0_to_3.0.sh -DISTCLEANFILES += upgrade_3.0_to_3.1.sh -DISTCLEANFILES += upgrade_3.1_to_3.2.sh -DISTCLEANFILES += upgrade_3.2_to_3.3.sh -DISTCLEANFILES += upgrade_3.3_to_4.0.sh -DISTCLEANFILES += upgrade_4.0_to_5.0.sh -DISTCLEANFILES += upgrade_5.0_to_5.1.sh -DISTCLEANFILES += upgrade_5.1_to_6.0.sh -DISTCLEANFILES += upgrade_6.0_to_6.1.sh -DISTCLEANFILES += wipe_data.sh +DISTCLEANFILES = ${UPGRADESCRIPTS} EXTRA_DIST = ${sqlscripts_DATA} -- 2.47.2