Changeset: 436be0627a59 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=436be0627a59
Modified Files:
MonetDB.spec
cmake/monetdb-versions.cmake
debian/rules
Branch: Oct2020
Log Message:
Use RELEASE_VERSION for release build.
diffs (37 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -764,6 +764,7 @@ fi
%build
%cmake3 \
+ -DRELEASE_VERSION=ON \
-DASSERT=OFF \
-DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
-DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -11,10 +11,7 @@ set(MONETDB_VERSION_MINOR "39")
set(MONETDB_VERSION_PATCH "0")
if(RELEASE_VERSION)
- math(EXPR MONETDB_VERSION_PATCH "${MONETDB_VERSION_PATCH} + 1")
- set(MONETDB_RELEASE "default")
-#else()
-# set(MONETDB_RELEASE "unreleased")
+ set(MONETDB_RELEASE "unreleased")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ DH_VERBOSE=1
override_dh_auto_configure:
dh_auto_configure -- \
+ -DRELEASE_VERSION=ON \
-DASSERT=OFF \
-DCINTEGRATION=ON \
-DFITS=ON \
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
