File tree Expand file tree Collapse file tree 4 files changed +22
-6
lines changed Expand file tree Collapse file tree 4 files changed +22
-6
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ BINPATH=/src/bin/
88DISTROS =$(shell cd dockerfiles;ls)
99DISTROS_SMALL =ubuntu fedora
1010SRC =src/icu
11- REV: =$(shell svnversion $(SRC ) | tr -d ' ' )
11+ REV: =$(shell src/bin/icu-git-rev.sh $(SRC ) )
1212all : dirs src/icu
1313
1414# src/icu: src
Original file line number Diff line number Diff line change 1+ #! /bin/sh
2+ # © 2018 and later: Unicode, Inc. and others.
3+ # License & terms of use: http://www.unicode.org/copyright.html
4+
5+ if ! command -v git > /dev/null 2>&1 ; then
6+ echo ' git-not-installed'
7+ exit 1
8+ fi
9+
10+ DIR=${1:-/ src/ icu}
11+ cd ${DIR} > /dev/null || exit 1
12+
13+ echo $( git rev-parse --short HEAD)
14+ exit 0
Original file line number Diff line number Diff line change @@ -8,13 +8,14 @@ if [ -f /etc/os-release ];
88then
99 . /etc/os-release
1010fi
11- FN=icu-r${REV-$(svnversion / src/ icu/ | tr -d ' ' )} -$( bash /src/icu/icu4c/source/config.guess) -${NAME-${WHAT} } -${VERSION_ID-UNKNOWN}
11+ ICUREV=$( /src/bin/icu-git-rev.sh)
12+ FN=icu-r${REV-${ICUREV} } -$( bash /src/icu/icu4c/source/config.guess) -${NAME-${WHAT} } -${VERSION_ID-UNKNOWN}
1213if [ ! -f config.status ];
1314then
1415 icu-configure.sh || exit 1
1516fi
1617rm -rf /tmp/icu
17- make -j${CORES} check && make -j${CORES} DESTDIR=/tmp/icu releaseDist || exit 1
18+ make -j${CORES} check && make -j${CORES} DESTDIR=/tmp/icu SVNVER= ${ICUREV} releaseDist || exit 1
1819# cp -v *-src-*.tgz /dist/${FN}-src.tgz || true
1920cd /tmp/
2021if [ -f /dist/${FN} .tgz ];
Original file line number Diff line number Diff line change @@ -9,21 +9,22 @@ if [ ! -f config.status ];
99then
1010 icu-configure.sh --disable-tests --disable-extras || exit 1
1111fi
12+ ICUREV=$( /src/bin/icu-git-rev.sh)
1213
1314
1415if [ -f /etc/os-release ];
1516then
1617 . /etc/os-release
1718fi
18- FN=icu-r${REV-$(svnversion / src / icu / | tr -d ' ' ) } -$( bash /src/icu/icu4c/source/config.guess) -${NAME-${WHAT} } -${VERSION_ID-UNKNOWN}
19+ FN=icu-r${ICUREV } -$( bash /src/icu/icu4c/source/config.guess) -${NAME-${WHAT} } -${VERSION_ID-UNKNOWN}
1920
2021rm -rf dist /dist/${FN} -src.d || true
21- make -j${CORES} && make dist
22+ make -j${CORES} && make dist SVNVER= ${ICUREV}
2223
2324mv -v dist /dist/${FN} -src.d
2425
2526rm -rf doc
26- make doc-searchengine
27+ make doc-searchengine SVNVER= ${ICUREV}
2728
2829# FN=icu-r$(svnversion /src/icu/ | tr -d ' ')-$(bash /src/icu/icu4c/source/config.guess)-${1:RANDOM}
2930tar cfpz /dist/${FN} -sdoc.tgz ./doc || exit 1
You can’t perform that action at this time.
0 commit comments