File tree 4 files changed +22
-6
lines changed 4 files changed +22
-6
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ BINPATH=/src/bin/
8
8
DISTROS =$(shell cd dockerfiles;ls)
9
9
DISTROS_SMALL =ubuntu fedora
10
10
SRC =src/icu
11
- REV: =$(shell svnversion $(SRC ) | tr -d ' ' )
11
+ REV: =$(shell src/bin/icu-git-rev.sh $(SRC ) )
12
12
all : dirs src/icu
13
13
14
14
# 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 ];
8
8
then
9
9
. /etc/os-release
10
10
fi
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}
12
13
if [ ! -f config.status ];
13
14
then
14
15
icu-configure.sh || exit 1
15
16
fi
16
17
rm -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
18
19
# cp -v *-src-*.tgz /dist/${FN}-src.tgz || true
19
20
cd /tmp/
20
21
if [ -f /dist/${FN} .tgz ];
Original file line number Diff line number Diff line change @@ -9,21 +9,22 @@ if [ ! -f config.status ];
9
9
then
10
10
icu-configure.sh --disable-tests --disable-extras || exit 1
11
11
fi
12
+ ICUREV=$( /src/bin/icu-git-rev.sh)
12
13
13
14
14
15
if [ -f /etc/os-release ];
15
16
then
16
17
. /etc/os-release
17
18
fi
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}
19
20
20
21
rm -rf dist /dist/${FN} -src.d || true
21
- make -j${CORES} && make dist
22
+ make -j${CORES} && make dist SVNVER= ${ICUREV}
22
23
23
24
mv -v dist /dist/${FN} -src.d
24
25
25
26
rm -rf doc
26
- make doc-searchengine
27
+ make doc-searchengine SVNVER= ${ICUREV}
27
28
28
29
# FN=icu-r$(svnversion /src/icu/ | tr -d ' ')-$(bash /src/icu/icu4c/source/config.guess)-${1:RANDOM}
29
30
tar cfpz /dist/${FN} -sdoc.tgz ./doc || exit 1
You can’t perform that action at this time.
0 commit comments