aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPhillip Lord2018-04-08 13:40:48 +0100
committerPhillip Lord2018-05-03 21:15:12 +0100
commita2003f9663e5649894b05695f7f2b11a3fa96339 (patch)
treec0d84293594680087b8c0edec7f594b3f933bd36 /admin
parentef1deb48f4be14956c2fcd5fce947bb301134cf9 (diff)
downloademacs-a2003f9663e5649894b05695f7f2b11a3fa96339.tar.gz
emacs-a2003f9663e5649894b05695f7f2b11a3fa96339.zip
* admin/nt/dist-build/build-zips.sh: Support building of branches
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/nt/dist-build/build-zips.sh17
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
108GIT_UP=0 108GIT_UP=0
109CONFIG=1 109CONFIG=1
110 110
111while getopts "36ghnsiV:" opt; do 111while 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`"
186fi 190fi
187 191
192echo Checking for required branch
193if [ -n $REQUIRED_BRANCH ];
194then
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
201fi
202
188if (($GIT_UP)) 203if (($GIT_UP))
189then 204then
190 git_up 205 git_up