Skip to content

Commit 1bb3783

Browse files
committed
Build binaries (mainly tzinit) also for 68020+ and coldfire
They are put in separate archives now. The archive with the libraries still contains a duplicate of the m68000 binaries, just in case.
1 parent 05590c6 commit 1bb3783

File tree

2 files changed

+44
-10
lines changed

2 files changed

+44
-10
lines changed

.scripts/build.sh

+39-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,42 @@
66
make SHELL=/bin/bash
77
make SHELL=/bin/bash DESTDIR="${INSTALL_DIR}" install
88

9-
find "${INSTALL_DIR}" -type f -perm -a=x -exec m68k-atari-mint-strip -s {} \;
10-
find "${INSTALL_DIR}" -type f \( -name '*.a' -o -name '*.o' \) -exec m68k-atari-mint-strip -S -X -w -N '.L[0-9]*' {} \;
9+
ARCHIVE_NAME="${PROJECT_NAME}-${PROJECT_VERSION}-${SHORT_ID}"
10+
BINFILES="
11+
sbin/tzinit
12+
usr/sbin/tzselect
13+
usr/sbin/zdump
14+
usr/sbin/zic
15+
"
16+
17+
if file ${INSTALL_DIR}/usr/sbin/zic | grep a.out; then
18+
TARGET=m68k-atari-mint
19+
elif file ${INSTALL_DIR}/usr/sbin/zic | grep ELF; then
20+
TARGET=m68k-atari-mintelf
21+
else
22+
echo "unknown file format" >&2
23+
exit 2
24+
fi
25+
26+
rm -f tz/*.o
27+
make -C tz DESTDIR="${INSTALL_DIR}" type=m68020 install
28+
cd "${INSTALL_DIR}"
29+
${TARGET}-strip $BINFILES
30+
tar cjf "${DEPLOY_DIR}/${ARCHIVE_NAME}-020.${DEPLOY_ARCHIVE} $BINFILES usr/share/zoneinfo
31+
rm -f $BINFILES
32+
cd -
33+
34+
rm -f tz/*.o
35+
make -C tz DESTDIR="${INSTALL_DIR}" type=coldfire install
36+
cd "${INSTALL_DIR}"
37+
${TARGET}-strip $BINFILES
38+
tar cjf "${DEPLOY_DIR}/${ARCHIVE_NAME}-v4e.${DEPLOY_ARCHIVE} $BINFILES usr/share/zoneinfo
39+
rm -f $BINFILES
40+
cd -
41+
42+
rm -f tz/*.o
43+
make -C tz DESTDIR="${INSTALL_DIR}" type=m68000 install
44+
cd "${INSTALL_DIR}"
45+
${TARGET}-strip $BINFILES
46+
tar cjf "${DEPLOY_DIR}/${ARCHIVE_NAME}-000.${DEPLOY_ARCHIVE} $BINFILES usr/share/zoneinfo
47+
cd -

.scripts/deploy.sh

+5-8
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@ then
88
DEPLOY_ARCHIVE="zip"
99
fi
1010

11-
if [ -n "${CPU_TARGET+x}" ]
12-
then
13-
ARCHIVE_NAME="${PROJECT_NAME}-${PROJECT_VERSION}-${SHORT_ID}-${CPU_TARGET}.${DEPLOY_ARCHIVE}"
14-
else
15-
ARCHIVE_NAME="${PROJECT_NAME}-${PROJECT_VERSION}-${SHORT_ID}.${DEPLOY_ARCHIVE}"
16-
fi
17-
ARCHIVE_PATH="${DEPLOY_DIR}/${ARCHIVE_NAME}"
11+
ARCHIVE_NAME="${PROJECT_NAME}-${PROJECT_VERSION}-${SHORT_ID}"
12+
ARCHIVE_PATH="${DEPLOY_DIR}/${ARCHIVE_NAME}.${DEPLOY_ARCHIVE}"
1813

1914
mkdir -p "${DEPLOY_DIR}"
2015

@@ -54,7 +49,9 @@ upload_file() {
5449
exit 1
5550
}
5651

57-
upload_file "$ARCHIVE_PATH" "${UPLOAD_DIR}/${PROJECT_DIR}/${ARCHIVE_NAME}"
52+
for f in "" -000 -020 -v4e; do
53+
upload_file "${DEPLOY_DIR}/${ARCHIVE_NAME}${f}.${DEPLOY_ARCHIVE}" "${UPLOAD_DIR}/${ARCHIVE_NAME}${f}.${DEPLOY_ARCHIVE}"
54+
done
5855
if test -z "${CPU_TARGET}"
5956
then
6057
upload_file "$ARCHIVE_PATH" "${UPLOAD_DIR}/${PROJECT_DIR}/${PROJECT_DIR}-latest.${DEPLOY_ARCHIVE}"

0 commit comments

Comments
 (0)