Title: [opsview] [11010] Let opsview-base choose its own version number for packages
- Revision
- 11010
- Author
- tvoon
- Date
- 2012-12-19 16:45:36 +0000 (Wed, 19 Dec 2012)
Log Message
Let opsview-base choose its own version number for packages
Modified Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-12-18 17:20:04 UTC (rev 11009)
+++ trunk/Makefile 2012-12-19 16:45:36 UTC (rev 11010)
@@ -21,7 +21,8 @@
# We have a separate version for opsview-base and opsview-perl as this is shared with other projects
# opsview-base will be moved to a separate repository
# While this is an svn:external, update here and in commercial branch as well
-OPSVIEW_BASE_VERSION = 4.3.0
+# These are marked in the dependencies as minimum levels to install
+OPSVIEW_BASE_VERSION = 4.3.1
OPSVIEW_PERL_VERSION = 4.1.0
# Suffix all versions with SVN build number to ensure that versions increment
@@ -82,7 +83,7 @@
DURING_PACKAGING=0
all: check-date version
- cd opsview-base && $(MAKE) VERSION=${OPSVIEW_BASE_VERSION}.${REVISION}
+ cd opsview-base && $(MAKE)
cd opsview-core && $(MAKE) VERSION=${BUILD} OPSVIEW_PERL_VERSION=${OPSVIEW_PERL_VERSION} OPSVIEW_BASE_VERSION=${OPSVIEW_BASE_VERSION}.${REVISION}
cd opsview-web && $(MAKE) VERSION=${BUILD}
cd opsview-compatibility-check && $(MAKE) VERSION=${BUILD}
@@ -94,7 +95,7 @@
# This is like a "make"
version: check-date ${GENERATED}
- cd opsview-base && $(MAKE) version VERSION=${OPSVIEW_BASE_VERSION}.${REVISION}
+ cd opsview-base && $(MAKE) version
cd opsview-core && $(MAKE) version VERSION=${BUILD} OPSVIEW_PERL_VERSION=${OPSVIEW_PERL_VERSION} OPSVIEW_BASE_VERSION=${OPSVIEW_BASE_VERSION}.${REVISION}
cd opsview-web && $(MAKE) version VERSION=${BUILD}
cd opsview-compatibility-check && $(MAKE) version VERSION=${BUILD}
@@ -154,7 +155,7 @@
perl -i -pe 's/^version: .*/version: "${BUILD}/' /usr/local/opsview-web/opsview_web.yml
opsview-base-${BUILD}.tar.gz:
- cd opsview-base && $(MAKE) tar VERSION=${OPSVIEW_BASE_VERSION}.${REVISION}
+ cd opsview-base && $(MAKE) tar
opsview-core-${BUILD}.tar.gz:
cd opsview-core && $(MAKE) tar VERSION=${BUILD} OPSVIEW_PERL_VERSION=${OPSVIEW_PERL_VERSION} OPSVIEW_BASE_VERSION=${OPSVIEW_BASE_VERSION}.${REVISION}
@@ -183,7 +184,7 @@
cd auth-tkt && make rpmpkg WORKDIR=${WORKDIR}/rpmbuild-files
debpkg: version
- cd opsview-base && $(MAKE) debpkg VERSION=${OPSVIEW_BASE_VERSION}.${REVISION}
+ cd opsview-base && $(MAKE) debpkg
cd opsview-core && $(MAKE) debpkg VERSION=${BUILD} OPSVIEW_PERL_VERSION=${OPSVIEW_PERL_VERSION} OPSVIEW_BASE_VERSION=${OPSVIEW_BASE_VERSION}.${REVISION}
cd opsview-web && $(MAKE) debpkg VERSION=${BUILD}
cd opsview-compatibility-check && $(MAKE) debpkg VERSION=${BUILD}
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
