From 46c4def0733a78ce08702d188e3e1a141fb07316 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Mon, 29 Aug 2011 10:53:50 +0200 Subject: Support non-standard install locations This build system overhaul allows for adding (define-style) macros to our scripts. All source files are now suffixed with ".in" to clarify that they might contain unprocessed defines. The Makefile provides a new rule to preprocess source files and generate proper output scripts. Also, add a "@pkgdatadir@" define (as used in GNU Autotools) and use it instead of hardcoded paths to "/usr/share/devtools" everywhere. We missed this when adding PREFIX support to the build system in commit 35fc83ce7d8dc26cd424321f2e8638d05da0a6d4. Signed-off-by: Lukas Fleischer --- archrelease.in | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 archrelease.in (limited to 'archrelease.in') diff --git a/archrelease.in b/archrelease.in new file mode 100644 index 0000000..2f6a563 --- /dev/null +++ b/archrelease.in @@ -0,0 +1,67 @@ +#!/bin/bash + +abort() { + echo ${1:-'archrelease: Cancelled'} + exit 1 +} + +if [[ -z $1 ]]; then + abort 'Usage: archrelease ...' +fi + +# TODO: validate repo is really repo-arch + +if [[ ! -f PKGBUILD ]]; then + abort 'archrelease: PKGBUILD not found' +fi + +trunk=${PWD##*/} + +# Normally this should be trunk, but it may be something +# such as 'gnome-unstable' +IFS='/' read -r -d '' -a parts <<< "$PWD" +if [[ "${parts[@]:(-2):1}" == "repos" ]]; then + abort 'archrelease: Should not be in repos dir (try from trunk/)' +fi +unset parts + +if [[ $(svn status -q) ]]; then + abort 'archrelease: You have not committed your changes yet!' +fi + +pushd .. >/dev/null +IFS=$'\n' read -r -d '' -a known_files < <(svn ls -r HEAD "$trunk") +for file in "${known_files[@]}"; do + if [[ ${file:(-1)} = '/' ]]; then + abort "archrelease: subdirectories are not supported in package directories!" + fi +done + +for tag in "$@"; do + echo -n "copying ${trunk} to ${tag}..." + + if [[ -d repos/$tag ]]; then + declare -a trash + trash=() + while read -r file; do + trash+=("repos/$tag/$file") + done < <(svn ls "repos/$tag") + svn rm -q "${trash[@]}" + else + mkdir -p "repos/$tag" + svn add --parents -q "repos/$tag" + fi + + for file in "${known_files[@]}"; do + svn copy -q -r HEAD "$trunk/$file" "repos/$tag/" + done + + echo 'done' +done + +echo -n "releasing package..." +printf -v tag_list ", %s" "$@"; tag_list="${tag_list#, }" +svn commit -q -m "archrelease: copy ${trunk} to $tag_list" || abort +echo 'done' + +popd >/dev/null -- cgit v1.2.3-70-g09d2 From 022cd3d523a416ec2eba99220b82bfff40875c9d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 8 Sep 2011 16:38:28 -0500 Subject: archrelease: call 'svn copy' once for all files We don't need to invoke svn copy on each file; it accepts multiple arguments. This cut Allan's time releasing one patch-friendly package from 5 minutes to 2 minutes. Signed-off-by: Dan McGee Signed-off-by: Lukas Fleischer --- archrelease.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'archrelease.in') diff --git a/archrelease.in b/archrelease.in index 2f6a563..7bb4c8a 100644 --- a/archrelease.in +++ b/archrelease.in @@ -52,9 +52,8 @@ for tag in "$@"; do svn add --parents -q "repos/$tag" fi - for file in "${known_files[@]}"; do - svn copy -q -r HEAD "$trunk/$file" "repos/$tag/" - done + # copy all files at once from trunk to the subdirectory in repos/ + svn copy -q -r HEAD ${known_files[@]/#/$trunk/} "repos/$tag/" echo 'done' done -- cgit v1.2.3-70-g09d2 From fe2040cd145344bfbe006e89c79348cce2ad2e13 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Wed, 12 Oct 2011 16:26:29 +0200 Subject: archrelease: Fix SVN error when repository is empty MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If trash is empty, `svn rm -q "${trash[@]}"` fails with: svn: Try 'svn help' for more info and then svn: Not enough arguments provided This doesn't result in any further malfunction but is kind of confusing and unexpected. Skipping `svn rm` on an empty trash fixes this. Reported-by: Alexander Rødseth Signed-off-by: Lukas Fleischer --- archrelease.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archrelease.in') diff --git a/archrelease.in b/archrelease.in index 7bb4c8a..2f7725e 100644 --- a/archrelease.in +++ b/archrelease.in @@ -46,7 +46,7 @@ for tag in "$@"; do while read -r file; do trash+=("repos/$tag/$file") done < <(svn ls "repos/$tag") - svn rm -q "${trash[@]}" + [[ $trash ]] && svn rm -q "${trash[@]}" else mkdir -p "repos/$tag" svn add --parents -q "repos/$tag" -- cgit v1.2.3-70-g09d2