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