From a12fe5859cc5f96d574f59c3bdef9bf749e0d922 Mon Sep 17 00:00:00 2001 From: Martin Dvorak Date: Fri, 10 Aug 2018 20:17:03 +0200 Subject: [PATCH] Finishing Ubuntu build scripts. --- ...r-ppa-add.sh => launchpad-add-hstr-ppa.sh} | 0 ...ases.sh => launchpad-make-all-releases.sh} | 5 +- ...w-distro.sh => pbuilder-add-new-distro.sh} | 0 ...all.sh => pbuilder-refresh-all-distros.sh} | 0 build/ubuntu/ubuntu-make-all-distros.sh | 49 ------------------- 5 files changed, 2 insertions(+), 52 deletions(-) rename build/ubuntu/{launchpad-hstr-ppa-add.sh => launchpad-add-hstr-ppa.sh} (100%) rename build/ubuntu/{ubuntu-launchpad-releases.sh => launchpad-make-all-releases.sh} (98%) rename build/ubuntu/{ubuntu-pbuilder-add-new-distro.sh => pbuilder-add-new-distro.sh} (100%) rename build/ubuntu/{ubuntu-pbuilder-refresh-all.sh => pbuilder-refresh-all-distros.sh} (100%) delete mode 100755 build/ubuntu/ubuntu-make-all-distros.sh diff --git a/build/ubuntu/launchpad-hstr-ppa-add.sh b/build/ubuntu/launchpad-add-hstr-ppa.sh similarity index 100% rename from build/ubuntu/launchpad-hstr-ppa-add.sh rename to build/ubuntu/launchpad-add-hstr-ppa.sh diff --git a/build/ubuntu/ubuntu-launchpad-releases.sh b/build/ubuntu/launchpad-make-all-releases.sh similarity index 98% rename from build/ubuntu/ubuntu-launchpad-releases.sh rename to build/ubuntu/launchpad-make-all-releases.sh index fb6a933..d745e60 100755 --- a/build/ubuntu/ubuntu-launchpad-releases.sh +++ b/build/ubuntu/launchpad-make-all-releases.sh @@ -161,15 +161,14 @@ then exit 1 fi -export ARG_BAZAAR_MSG="Experimental packaging." +export ARG_BAZAAR_MSG="Release 1.27.x" export ARG_MAJOR_VERSION=1.27. export ARG_MINOR_VERSION=0 # minor version is incremented for every Ubuntu version # https://wiki.ubuntu.com/Releases # old: precise quantal saucy precise utopic vivid wily yakkety artful # current: trusty xenial bionic -for UBUNTU_VERSION in xenial -#for UBUNTU_VERSION in trusty xenial bionic +for UBUNTU_VERSION in trusty xenial bionic do echo "Releasing HSTR for Ubuntu version: ${UBUNTU_VERSION}" releaseForParticularUbuntuVersion ${UBUNTU_VERSION} ${ARG_MAJOR_VERSION}${ARG_MINOR_VERSION} "${ARG_BAZAAR_MSG}" diff --git a/build/ubuntu/ubuntu-pbuilder-add-new-distro.sh b/build/ubuntu/pbuilder-add-new-distro.sh similarity index 100% rename from build/ubuntu/ubuntu-pbuilder-add-new-distro.sh rename to build/ubuntu/pbuilder-add-new-distro.sh diff --git a/build/ubuntu/ubuntu-pbuilder-refresh-all.sh b/build/ubuntu/pbuilder-refresh-all-distros.sh similarity index 100% rename from build/ubuntu/ubuntu-pbuilder-refresh-all.sh rename to build/ubuntu/pbuilder-refresh-all-distros.sh diff --git a/build/ubuntu/ubuntu-make-all-distros.sh b/build/ubuntu/ubuntu-make-all-distros.sh deleted file mode 100755 index 4f2e4e4..0000000 --- a/build/ubuntu/ubuntu-make-all-distros.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2014-2018 Martin Dvorak -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Launchpad release checklist: -# - update version in source code (hstr.c) -# - update version in configure.ac -# - update release message in this file -# - update version in this file -# - check target Ubuntu distributions in this file -# - check minor version in this file -# - run this script from ~/p/hstr/launchpad - -export HHBZRMSG="Top and bottom prompt." -export VERSION=1.27. -export MINOR=1 - -change it - script to be run from GIT repo, launchpad dir is hardcoded - -if [ -e "../.git" ] -then - echo "This script MUST NOT be run from Git repository - run it e.g. from ~/p/hstr/launchpad instead" - exit 1 -fi - -update this based on MF - -# precise quantal saucy precise utopic vivid wily yakkety zesty / trusty xenial artful bionic -for DISTRO in trusty xenial artful bionic -do - -./ubuntu-make-distro.sh ${DISTRO} ${VERSION}${MINOR} "${HHBZRMSG}" -MINOR=`expr $MINOR + 1` - -done - -# eof