##// END OF EJS Templates
builddeb: rename --release option to --codename...
av6 -
r27209:7fbab10f default
parent child Browse files
Show More
@@ -162,7 +162,7 b' osx:'
162
162
163 deb:
163 deb:
164 mkdir -p packages/debian-unknown
164 mkdir -p packages/debian-unknown
165 contrib/builddeb --release unknown
165 contrib/builddeb --codename unknown
166
166
167 docker-debian-jessie:
167 docker-debian-jessie:
168 mkdir -p packages/debian-jessie
168 mkdir -p packages/debian-jessie
@@ -8,12 +8,12 b''
8
8
9 BUILD=1
9 BUILD=1
10 CLEANUP=1
10 CLEANUP=1
11 DEBVERSION=jessie
11 CODENAME=jessie
12 while [ "$1" ]; do
12 while [ "$1" ]; do
13 case "$1" in
13 case "$1" in
14 --release )
14 --codename )
15 shift
15 shift
16 DEBVERSION="$1"
16 CODENAME="$1"
17 shift
17 shift
18 ;;
18 ;;
19 --cleanup )
19 --cleanup )
@@ -82,7 +82,7 b' if [ "$BUILD" ]; then'
82 fi
82 fi
83 if [ "$CLEANUP" ] ; then
83 if [ "$CLEANUP" ] ; then
84 echo
84 echo
85 OUTPUTDIR=${OUTPUTDIR:=packages/debian-$DEBVERSION}
85 OUTPUTDIR=${OUTPUTDIR:=packages/debian-$CODENAME}
86 find ../mercurial*.deb ../mercurial_*.build ../mercurial_*.changes \
86 find ../mercurial*.deb ../mercurial_*.build ../mercurial_*.changes \
87 -type f -newer $control -print0 | \
87 -type f -newer $control -print0 | \
88 xargs -Inarf -0 mv narf "$OUTPUTDIR"
88 xargs -Inarf -0 mv narf "$OUTPUTDIR"
@@ -8,7 +8,7 b' export ROOTDIR=$(cd $BUILDDIR/..; pwd)'
8
8
9 checkdocker
9 checkdocker
10
10
11 DEBPLATFORM="$1"
11 CODENAME="$1"
12 PLATFORM="debian-$1"
12 PLATFORM="debian-$1"
13 shift # extra params are passed to build process
13 shift # extra params are passed to build process
14
14
@@ -26,8 +26,8 b' if [ $(uname) = "Darwin" ] ; then'
26 sh -c "cd /mnt/$dn && make clean && make local"
26 sh -c "cd /mnt/$dn && make clean && make local"
27 fi
27 fi
28 $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
28 $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
29 sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/builddeb --build --release $DEBPLATFORM"
29 sh -c "cd /mnt/$dn && DEB_BUILD_OPTIONS='${DEB_BUILD_OPTIONS:=}' contrib/builddeb --build --codename $CODENAME"
30 contrib/builddeb --cleanup --release $DEBPLATFORM
30 contrib/builddeb --cleanup --codename $CODENAME
31 if [ $(uname) = "Darwin" ] ; then
31 if [ $(uname) = "Darwin" ] ; then
32 $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
32 $DOCKER run -u $DBUILDUSER --rm -v $PWD/..:/mnt $CONTAINER \
33 sh -c "cd /mnt/$dn && make clean"
33 sh -c "cd /mnt/$dn && make clean"
General Comments 0
You need to be logged in to leave comments. Login now