Title: [opsview-base] [12] add package build macros
- Revision
- 12
- Author
- aburzynski
- Date
- 2012-07-30 15:07:44 +0100 (Mon, 30 Jul 2012)
Log Message
add package build macros
Modified Paths
Added Paths
Removed Paths
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-07-30 12:41:03 UTC (rev 11)
+++ trunk/Makefile 2012-07-30 14:07:44 UTC (rev 12)
@@ -23,7 +23,7 @@
# Check that /usr/local/nagios does not have any files in there
VERSION = 4.2.0
-REVISION := $(shell ./utils/get_version)
+REVISION := $(shell ./tools/get_version)
RELEASE=1
WORKDIR := $(shell pwd)
@@ -194,6 +194,21 @@
$(MAKE) NAGIOSPLUG_CONFIGURE_PERL_MODULES=
$(MAKE) all
+package: package-clean
+ $(MAKE) $(PACKAGE_MACRO)
+
+package-upload:
+ PACKAGE_UPLOAD_FILES="$(PACKAGE_UPLOAD_FILES)" tools/package_upload
+
+package-clean:
+ $(MAKE) $(PACKAGE_MACRO)-clean
+
+debpkg-clean solpkg-clean:
+ rm -f $(PACKAGE_UPLOAD_FILES) debian/changelog.dch
+
+rpmpkg-clean:
+ sudo rm -rf $(PACKAGE_UPLOAD_FILES) rpmbuild rpmbuild-files
+
install-fladmin:
build-aux/fladmin -r ${DESTDIR} install filelist
Copied: trunk/tools/get_version (from rev 11, trunk/utils/get_version)
===================================================================
--- trunk/tools/get_version (rev 0)
+++ trunk/tools/get_version 2012-07-30 14:07:44 UTC (rev 12)
@@ -0,0 +1,34 @@
+#!/usr/bin/perl
+#
+# small script to get svn version number out of either svn or git local
+# repository, depending on how code has been checked out
+#
+use strict;
+use warnings;
+use Cwd;
+
+if ( -d cwd() . '/.svn' ) {
+ my $svnrevision = qx/ svnversion . /;
+ chomp($svnrevision);
+
+ if ( $svnrevision !~ m/exported/xsm ) {
+ $svnrevision =~ s/.*://;
+ $svnrevision =~ s/M//;
+ print $svnrevision, $/;
+ }
+
+}
+elsif ( -d cwd() . '/.git' ) {
+
+ my @svnlog = qx/git svn log --limit=1/;
+ my ($revision) = $svnlog[1] =~ m/^r(\d+)\s/xsm;
+
+ if ( !$revision ) {
+ die 'Unable to parse revision number out of git', $/;
+ }
+ print $revision, $/;
+
+}
+else {
+ print '0', $/;
+}
Added: trunk/tools/package_upload
===================================================================
--- trunk/tools/package_upload (rev 0)
+++ trunk/tools/package_upload 2012-07-30 14:07:44 UTC (rev 12)
@@ -0,0 +1,14 @@
+#!/bin/bash -ex
+die() { echo $1; exit 1; }
+
+trim_script=/home/buildbot/support_scripts/trim_versions
+import_script=/home/buildbot/support_scripts/import_to_nightly_repository
+
+[[ -n $PACKAGE_UPLOAD_SERVER ]] || die "Need PACKAGE_UPLOAD_SERVER set"
+[[ -n $PACKAGE_UPLOAD_PATH ]] || die "Need PACKAGE_UPLOAD_PATH set"
+[[ -n $PACKAGE_UPLOAD_FILES ]] || die "Need PACKAGE_UPLOAD_FILES set"
+
+ssh $PACKAGE_UPLOAD_SERVER mkdir -p $PACKAGE_UPLOAD_PATH
+rsync -Pavz $PACKAGE_UPLOAD_FILES $PACKAGE_UPLOAD_SERVER:$PACKAGE_UPLOAD_PATH
+ssh $PACKAGE_UPLOAD_SERVER $trim_script $PACKAGE_UPLOAD_PATH
+ssh $PACKAGE_UPLOAD_SERVER $import_script $PACKAGE_UPLOAD_PATH
Property changes on: trunk/tools/package_upload
___________________________________________________________________
Added: svn:executable
+ *
Deleted: trunk/utils/get_version
===================================================================
--- trunk/utils/get_version 2012-07-30 12:41:03 UTC (rev 11)
+++ trunk/utils/get_version 2012-07-30 14:07:44 UTC (rev 12)
@@ -1,34 +0,0 @@
-#!/usr/bin/perl
-#
-# small script to get svn version number out of either svn or git local
-# repository, depending on how code has been checked out
-#
-use strict;
-use warnings;
-use Cwd;
-
-if ( -d cwd() . '/.svn' ) {
- my $svnrevision = qx/ svnversion . /;
- chomp($svnrevision);
-
- if ( $svnrevision !~ m/exported/xsm ) {
- $svnrevision =~ s/.*://;
- $svnrevision =~ s/M//;
- print $svnrevision, $/;
- }
-
-}
-elsif ( -d cwd() . '/.git' ) {
-
- my @svnlog = qx/git svn log --limit=1/;
- my ($revision) = $svnlog[1] =~ m/^r(\d+)\s/xsm;
-
- if ( !$revision ) {
- die 'Unable to parse revision number out of git', $/;
- }
- print $revision, $/;
-
-}
-else {
- print '0', $/;
-}
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
