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