##// END OF EJS Templates
match: handle excludes using new differencematcher...
match: handle excludes using new differencematcher As I've said on earlier patches, I'm hoping to use more composition of simpler matchers instead of the single complex matcher we currently have. This extracts a first new matcher that composes two other matchers. It matches if the first matcher matches but the second does not. As such, we can use it for excludes, which this patch also does. We'll remove the now-unncessary code for excludes in the next patch.

File last commit:

r29007:78074575 stable
r32465:a83a7d27 default
Show More
dockerdeb
35 lines | 1.1 KiB | text/plain | TextLexer
Augie Fackler
dockerdeb: rules to build a debian package using docker...
r24973 #!/bin/bash -eu
. $(dirname $0)/dockerlib.sh
. $(dirname $0)/packagelib.sh
BUILDDIR=$(dirname $0)
Sean Farley
dockerdeb: redirect 'cd' in export command to /dev/null...
r28987 export ROOTDIR=$(cd $BUILDDIR/.. > /dev/null; pwd)
Augie Fackler
dockerdeb: rules to build a debian package using docker...
r24973
checkdocker
av6
builddeb: add --distid option to specify Distributor ID...
r27210 DISTID="$1"
CODENAME="$2"
PLATFORM="$1-$2"
Sean Farley
dockerdeb: fix incorrect number of shifts...
r29006 shift; shift # extra params are passed to build process
Augie Fackler
dockerdeb: rules to build a debian package using docker...
r24973
Augie Fackler
debian: switch to using debhelper and dh_python2 to build debs...
r26148 OUTPUTDIR=${OUTPUTDIR:=$ROOTDIR/packages/$PLATFORM}
Augie Fackler
dockerdeb: rules to build a debian package using docker...
r24973 initcontainer $PLATFORM
Augie Fackler
debian: switch to using debhelper and dh_python2 to build debs...
r26148 # debuild only appears to be able to save built debs etc to .., so we
# have to share the .. of the current directory with the docker
# container and hope it's writable. Whee.
dn=$(basename $PWD)
Augie Fackler
dockerdeb: rules to build a debian package using docker...
r24973
if [ $(uname) = "Darwin" ] ; then
Augie Fackler
debian: switch to using debhelper and dh_python2 to build debs...
r26148 $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
sh -c "cd /mnt/$dn && make clean && make local"
Augie Fackler
dockerdeb: rules to build a debian package using docker...
r24973 fi
Augie Fackler
debian: switch to using debhelper and dh_python2 to build debs...
r26148 $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
Sean Farley
dockerdeb: pass the rest of the args to the builder script...
r29007 sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/builddeb --build --distid $DISTID --codename $CODENAME $@"
av6
builddeb: add --distid option to specify Distributor ID...
r27210 contrib/builddeb --cleanup --distid $DISTID --codename $CODENAME
Augie Fackler
dockerdeb: rules to build a debian package using docker...
r24973 if [ $(uname) = "Darwin" ] ; then
Augie Fackler
debian: switch to using debhelper and dh_python2 to build debs...
r26148 $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
sh -c "cd /mnt/$dn && make clean"
Augie Fackler
dockerdeb: rules to build a debian package using docker...
r24973 fi