From eb09872c61ea580c0dd1cea756ef62173b1269bd Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Fri, 12 Jan 2018 00:53:58 -0700 Subject: [PATCH] devops-0.4: Add git-tag-create-options. NEWS: Fix formatting of 0.3 entry. build.scm: Use set-file-modes! rather than execing chmod. build.scm (build-core-pkg): Delete build directory upon success. build.scm (build-plugin-dpkg): Set .buildinfo and dbgsym .ddeb read-only. devops.scm (git-tag-create-options): New variable to config tag signing. devops.scm (release-core, release-plugin): Use new variable to config tag signing. --- src/devops/NEWS | 13 +++++++++---- src/devops/build.scm | 19 ++++++++++++------- src/devops/configure.ac | 2 +- src/devops/debian/changelog | 12 ++++++++++-- src/devops/devops.scm | 8 +++++--- src/devops/make.scm | 2 +- 6 files changed, 38 insertions(+), 18 deletions(-) diff --git a/src/devops/NEWS b/src/devops/NEWS index 1b40c036f..2921f5749 100644 --- a/src/devops/NEWS +++ b/src/devops/NEWS @@ -20,13 +20,18 @@ You should have received a copy of the GNU General Public License along with this plugin; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -mit-scheme-pucked-devops 0.3 - Matt Birkholz, 2017-12-28 +mit-scheme-pucked-devops 0.4 - Matt Birkholz, 2018-01-02 ======================================================== - * New upstream. New devops:status parameter (plugin name). Filenames - and "warning:" in lint reports. +Add new variable, git-tag-create-options, for configuring optional tag +signing. Improve support for new .buildinfo and dbgsym .ddeb build +products. + +mit-scheme-pucked-devops 0.3 - Matt Birkholz, 2017-12-28 +======================================================== - -- Matt Birkholz Thu, 28 Dec 2017 00:00:00 -0000 +New devops:status parameter (plugin name). Filenames and "warning:" +in lint reports. mit-scheme-pucked-devops 0.2 - Matt Birkholz, 2017-11-06 ======================================================== diff --git a/src/devops/build.scm b/src/devops/build.scm index 88af40e26..659c0eb90 100644 --- a/src/devops/build.scm +++ b/src/devops/build.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -Copyright (C) 2016, 2017 Matthew Birkholz +Copyright (C) 2016, 2017, 2018 Matthew Birkholz This file is part of a devops plugin for MIT/GNU Scheme Pucked. @@ -117,14 +117,15 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. (run "cd "pkgdir"/doc && make") (run "chmod -R go-w "pkgdir) (run "cd "build-dir" && tar czf "name"-"vers"-"sarch".tar.gz "name"-"vers) - (run "chmod 444 "pkgdir"-"sarch".tar.gz") + (set-file-modes! (string pkgdir"-"sarch".tar.gz") #o444) (run "rm -rf "pkgdir) (run "cd "build-dir" && tar xzf "name"-"vers"-"sarch".tar.gz") (run "cd "pkgdir"/src && ./configure"cross" --enable-native-code="target) (run "cd "pkgdir"/src && make compile-microcode") (run "cd "pkgdir"/src && umask 022 && make install") (run "cd "pkgdir"/doc && ./configure") - (run "cd "pkgdir"/doc && umask 022 && make install install-pdf"))) + (run "cd "pkgdir"/doc && umask 022 && make install install-pdf") + (run "rm -rf "pkgdir))) (define (build-core-dpkg name vers) (let ((pkgdir (string build-dir"/"name"-"vers))) @@ -132,8 +133,8 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. (run "cd "build-dir" && tar xJf "name"_"vers".tar.xz") (run "cd "pkgdir" && dpkg-buildpackage -b -uc") (let ((darch build-debian-architecture)) - (run "chmod 444 "build-dir"/"name"_"vers"_"darch".deb") - (run "chmod 444 "build-dir"/"name"_"vers"_"darch".changes") + (set-file-modes! (string build-dir"/"name"_"vers"_"darch".deb") #o444) + (set-file-modes! (string build-dir"/"name"_"vers"_"darch".changes") #o444) (run "rm -rf "pkgdir) (run "sudo "project-name"-install "name"_"vers"_"darch".deb")))) @@ -159,8 +160,12 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. (lambda () (run "cd "pkgdir" && dpkg-buildpackage -b -uc"))) (let ((darch build-debian-architecture)) - (run "chmod 444 "build-dir"/"name"_"vers"_"darch".deb") - (run "chmod 444 "build-dir"/"name"_"vers"_"darch".changes") + (set-file-modes! (string build-dir"/"name"_"vers"_"darch".deb") #o444) + (set-file-modes! (string build-dir"/"name"_"vers"_"darch".changes") #o444) + (let ((f (string build-dir"/"name"_"vers"_"darch".buildinfo"))) + (if (file-exists? f) (set-file-modes! f #o444))) + (let ((f (string build-dir"/"name"-dbgsym_"vers"_"darch".ddeb"))) + (if (file-exists? f) (set-file-modes! f #o444))) (run "rm -rf "pkgdir) (run "sudo "project-name"-install "name"_"vers"_"darch".deb")))) diff --git a/src/devops/configure.ac b/src/devops/configure.ac index cb238d62b..a570cf3e3 100644 --- a/src/devops/configure.ac +++ b/src/devops/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([MIT/GNU Scheme Pucked Developer Operations plugin], - [0.3], + [0.4], [matt@birchwood-abbey.net], [mit-scheme-pucked-devops]) AC_CONFIG_SRCDIR([devops.pkg]) diff --git a/src/devops/debian/changelog b/src/devops/debian/changelog index b5d1281cf..56495d23e 100644 --- a/src/devops/debian/changelog +++ b/src/devops/debian/changelog @@ -1,7 +1,15 @@ +mit-scheme-pucked-devops (0.4) birchwood; urgency=low + + * New git-tag-create-options, for configuring optional tag signing. + Improve support for new .buildinfo and dbgsym .ddeb build products. + Delete core build directories upon success. + + -- Matt Birkholz Tue, 02 Jan 2018 00:00:00 -0000 + mit-scheme-pucked-devops (0.3) birchwood; urgency=low - * New upstream. New devops:status parameter (plugin name). Filenames - and "warning:" in lint reports. + * New devops:status parameter (plugin name). Filenames and + "warning:" in lint reports. -- Matt Birkholz Thu, 28 Dec 2017 00:00:00 -0000 diff --git a/src/devops/devops.scm b/src/devops/devops.scm index 3c7662dd4..41597cd3f 100644 --- a/src/devops/devops.scm +++ b/src/devops/devops.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -Copyright (C) 2016, 2017 Matthew Birkholz +Copyright (C) 2016, 2017, 2018 Matthew Birkholz This file is part of a devops plugin for MIT/GNU Scheme Pucked. @@ -366,6 +366,8 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. ;;;; Release +(define git-tag-create-options "") + (define (devops:release #!optional plugin) (let ((dirt (shell-lines "git status --porcelain --untracked-files=no"))) (cond ((default-object? plugin) @@ -398,7 +400,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. (run "git archive --prefix="project"/ HEAD" " | ( cd devops/"pkgvers" && tar xf - )") (begin - (run "git tag -s -m \"\" "pkgvers) + (run "git tag "git-tag-create-options" -m \"\" "pkgvers) (run "git archive --prefix="project"/ "pkgvers " | ( cd devops/"pkgvers" && tar xf - )"))) (run "cd devops/"pkgvers" && "project"/dist/make-src-files standard") @@ -428,7 +430,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. (run "git archive --prefix="pkgvers"/ HEAD -- "dir " | ( cd devops && tar xf - )") (begin - (run "git tag -s -m \"\" "pkgvers) + (run "git tag "git-tag-create-options" -m \"\" "pkgvers) (run "git archive --prefix="pkgvers"/ "pkgvers" -- "dir " | ( cd devops && tar xf - )"))) (run "cd devops/"pkgvers"/"dir" && ./autogen.sh") diff --git a/src/devops/make.scm b/src/devops/make.scm index 18e76cc4d..292950b01 100644 --- a/src/devops/make.scm +++ b/src/devops/make.scm @@ -5,4 +5,4 @@ Load the Developer Operations plugin. |# (with-loader-base-uri (system-library-uri "devops/") (lambda () (load-package-set "devops"))) -(add-subsystem-identification! "DevOps" '(0 3)) \ No newline at end of file +(add-subsystem-identification! "DevOps" '(0 4)) \ No newline at end of file -- 2.25.1