diff options
| author | Phillip Lord | 2018-04-08 13:40:48 +0100 |
|---|---|---|
| committer | Phillip Lord | 2018-05-03 21:15:12 +0100 |
| commit | a2003f9663e5649894b05695f7f2b11a3fa96339 (patch) | |
| tree | c0d84293594680087b8c0edec7f594b3f933bd36 /admin | |
| parent | ef1deb48f4be14956c2fcd5fce947bb301134cf9 (diff) | |
| download | emacs-a2003f9663e5649894b05695f7f2b11a3fa96339.tar.gz emacs-a2003f9663e5649894b05695f7f2b11a3fa96339.zip | |
* admin/nt/dist-build/build-zips.sh: Support building of branches
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/nt/dist-build/build-zips.sh | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh index ec41ec8c46a..d954683c8f5 100755 --- a/admin/nt/dist-build/build-zips.sh +++ b/admin/nt/dist-build/build-zips.sh | |||
| @@ -108,7 +108,7 @@ BUILD_64=1 | |||
| 108 | GIT_UP=0 | 108 | GIT_UP=0 |
| 109 | CONFIG=1 | 109 | CONFIG=1 |
| 110 | 110 | ||
| 111 | while getopts "36ghnsiV:" opt; do | 111 | while getopts "36gb:hnsiV:" opt; do |
| 112 | case $opt in | 112 | case $opt in |
| 113 | 3) | 113 | 3) |
| 114 | BUILD_32=1 | 114 | BUILD_32=1 |
| @@ -132,6 +132,10 @@ while getopts "36ghnsiV:" opt; do | |||
| 132 | i) | 132 | i) |
| 133 | BUILD=0 | 133 | BUILD=0 |
| 134 | ;; | 134 | ;; |
| 135 | b) | ||
| 136 | REQUIRED_BRANCH=$OPTARG | ||
| 137 | echo "Setting Required branch $REQUIRED_BRANCH" | ||
| 138 | ;; | ||
| 135 | V) | 139 | V) |
| 136 | VERSION=$OPTARG | 140 | VERSION=$OPTARG |
| 137 | ;; | 141 | ;; |
| @@ -185,6 +189,17 @@ else | |||
| 185 | OF_VERSION="$VERSION-`date +%Y-%m-%d`" | 189 | OF_VERSION="$VERSION-`date +%Y-%m-%d`" |
| 186 | fi | 190 | fi |
| 187 | 191 | ||
| 192 | echo Checking for required branch | ||
| 193 | if [ -n $REQUIRED_BRANCH ]; | ||
| 194 | then | ||
| 195 | BRANCH=$REQUIRED_BRANCH | ||
| 196 | echo [build] Building from Branch $BRANCH | ||
| 197 | VERSION=$VERSION-$BRANCH | ||
| 198 | OF_VERSION="$VERSION-`date +%Y-%m-%d`" | ||
| 199 | ## Use snapshot dependencies | ||
| 200 | SNAPSHOT=1 | ||
| 201 | fi | ||
| 202 | |||
| 188 | if (($GIT_UP)) | 203 | if (($GIT_UP)) |
| 189 | then | 204 | then |
| 190 | git_up | 205 | git_up |