Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 2b616d8

Browse files
author
Ian Macphail
committed
[[ Prebuilts ]] Fix uploading on Windows
1 parent a6f33e0 commit 2b616d8

2 files changed

Lines changed: 83 additions & 64 deletions

File tree

‎prebuilt/upload-libs.sh‎

Lines changed: 82 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6,77 +6,96 @@ source "scripts/lib_versions.inc"
66
# Package directory
77
PACKAGE_DIR="`pwd`/packaged"
88

9-
PLATFORM=$1
10-
ARCH=$2
9+
function doUpload {
10+
local PLATFORM=$1
11+
local ARCH=$2
12+
local SUBPLATFORM=$3
1113

12-
#only ios subplatforms are used
13-
if [ "${PLATFORM}" = "ios" ] ; then
14-
SUBPLATFORM=$3
15-
else
16-
SUBPLATFORM=
17-
fi
14+
# Linux x86 packages use i386 in their name (but still use x86 in the library folder!)
15+
if [ "${PLATFORM}" == "linux" -a "${ARCH}" == "x86" ] ; then
16+
PACKAGE_ARCH=i386
17+
else
18+
PACKAGE_ARCH="${ARCH}"
19+
fi
1820

19-
# Linux x86 packages use i386 in their name (but still use x86 in the library folder!)
20-
if [ "${PLATFORM}" == "linux" -a "${ARCH}" == "x86" ] ; then
21-
PACKAGE_ARCH=i386
22-
else
23-
PACKAGE_ARCH="${ARCH}"
24-
fi
21+
if [ "${PLATFORM}" == "win32" ] ; then
22+
# Windows packages use <arch>-<platform>-<subplatform> naming
23+
SUFFIX="${PACKAGE_ARCH}-${PLATFORM}-${SUBPLATFORM}"
24+
else
25+
if [ ! -z "${SUBPLATFORM}" ] ; then
26+
SUFFIX="-${PLATFORM}-${PACKAGE_ARCH}-${SUBPLATFORM}"
27+
else
28+
SUFFIX="-${PLATFORM}-${PACKAGE_ARCH}"
29+
fi
30+
fi
2531

26-
if [ ! -z "${SUBPLATFORM}" ] ; then
27-
SUFFIX="-${PLATFORM}-${PACKAGE_ARCH}-${SUBPLATFORM}"
28-
else
29-
SUFFIX="-${PLATFORM}-${PACKAGE_ARCH}"
30-
fi
32+
OPENSSL_PKG="${PACKAGE_DIR}/OpenSSL-${OpenSSL_VERSION}${SUFFIX}.tar.bz2"
33+
CURL_PKG="${PACKAGE_DIR}/Curl-${Curl_VERSION}${SUFFIX}.tar.bz2"
34+
ICU_PKG="${PACKAGE_DIR}/ICU-${ICU_VERSION}${SUFFIX}.tar.bz2"
35+
CEF_PKG="${PACKAGE_DIR}/CEF-${CEF_VERSION}${SUFFIX}.tar.bz2"
36+
OPENSSL_HDR_PKG="${PACKAGE_DIR}/OpenSSL-${OpenSSL_VERSION}-All-Universal-Headers.tar.bz2"
37+
ICU_HDR_PKG="${PACKAGE_DIR}/ICU-${ICU_VERSION}-All-Universal-Headers.tar.bz2"
3138

32-
OPENSSL_PKG="${PACKAGE_DIR}/OpenSSL-${OpenSSL_VERSION}${SUFFIX}.tar.bz2"
33-
CURL_PKG="${PACKAGE_DIR}/Curl-${Curl_VERSION}${SUFFIX}.tar.bz2"
34-
ICU_PKG="${PACKAGE_DIR}/ICU-${ICU_VERSION}${SUFFIX}.tar.bz2"
35-
CEF_PKG="${PACKAGE_DIR}/CEF-${CEF_VERSION}${SUFFIX}.tar.bz2"
36-
OPENSSL_HDR_PKG="${PACKAGE_DIR}/OpenSSL-${OpenSSL_VERSION}-All-Universal-Headers.tar.bz2"
37-
ICU_HDR_PKG="${PACKAGE_DIR}/ICU-${ICU_VERSION}-All-Universal-Headers.tar.bz2"
39+
PACKAGE_FILES=
3840

39-
PACKAGE_FILES=
41+
if [ -f "${OPENSSL_PKG}" ] ; then
42+
PACKAGE_FILES+="${OPENSSL_PKG} "
43+
fi
44+
if [ -f "${CURL_PKG}" ] ; then
45+
PACKAGE_FILES+="${CURL_PKG} "
46+
fi
47+
if [ -f "${ICU_PKG}" ] ; then
48+
PACKAGE_FILES+="${ICU_PKG} "
49+
fi
50+
if [ -f "${CEF_PKG}" ] ; then
51+
PACKAGE_FILES+="${CEF_PKG} "
52+
fi
53+
if [ -f "${OPENSSL_HDR_PKG}" ] ; then
54+
PACKAGE_FILES+="${OPENSSL_HDR_PKG} "
55+
fi
56+
if [ -f "${ICU_HDR_PKG}" ] ; then
57+
PACKAGE_FILES+="${ICU_HDR_PKG} "
58+
fi
4059

41-
if [ -f "${OPENSSL_PKG}" ] ; then
42-
PACKAGE_FILES+="${OPENSSL_PKG} "
43-
fi
44-
if [ -f "${CURL_PKG}" ] ; then
45-
PACKAGE_FILES+="${CURL_PKG} "
46-
fi
47-
if [ -f "${ICU_PKG}" ] ; then
48-
PACKAGE_FILES+="${ICU_PKG} "
49-
fi
50-
if [ -f "${CEF_PKG}" ] ; then
51-
PACKAGE_FILES+="${CEF_PKG} "
52-
fi
53-
if [ -f "${OPENSSL_HDR_PKG}" ] ; then
54-
PACKAGE_FILES+="${OPENSSL_HDR_PKG} "
55-
fi
56-
if [ -f "${ICU_HDR_PKG}" ] ; then
57-
PACKAGE_FILES+="${ICU_HDR_PKG} "
58-
fi
60+
echo "Uploading packages: ${PLATFORM} ${ARCH} ${SUBPLATFORM}"
5961

60-
echo "Uploading packages: ${PLATFORM} ${ARCH} ${SUBPLATFORM}"
62+
# Upload settings
63+
UPLOAD_SERVER="meg.on-rev.com"
64+
# TESTING - using test_upload folder while testing
65+
UPLOAD_FOLDER="prebuilts/test_uploads/"
66+
# TESTING - reduced retry count while testing
67+
UPLOAD_MAX_RETRIES=3
68+
#UPLOAD_MAX_RETRIES=50
6169

62-
# Upload settings
63-
UPLOAD_SERVER="meg.on-rev.com"
64-
# TESTING - using test_upload folder while testing
65-
UPLOAD_FOLDER="prebuilts/test_uploads/"
66-
# TESTING - reduced retry count while testing
67-
UPLOAD_MAX_RETRIES=3
68-
#UPLOAD_MAX_RETRIES=50
70+
trap "echo Interrupted; exit 1;" SIGINT SIGTERM
71+
i=0
72+
false
73+
while [ $? -ne 0 -a $i -lt $UPLOAD_MAX_RETRIES ] ; do
74+
i=$(($i+1))
75+
rsync -v --progress --chmod=ug=rw,o=r --partial ${PACKAGE_FILES} "${UPLOAD_SERVER}:${UPLOAD_FOLDER}"
76+
done
77+
rc=$?
78+
if [ $rc -ne 0 ]; then
79+
echo "Maximum retries reached, giving up"
80+
exit $rc
81+
fi
82+
}
83+
84+
PLATFORM=$1
85+
ARCH=$2
6986

70-
trap "echo Interrupted; exit 1;" SIGINT SIGTERM
71-
i=0
72-
false
73-
while [ $? -ne 0 -a $i -lt $UPLOAD_MAX_RETRIES ] ; do
74-
i=$(($i+1))
75-
rsync -v --progress --chmod=ug=rw,o=r --partial ${PACKAGE_FILES} "${UPLOAD_SERVER}:${UPLOAD_FOLDER}"
76-
done
77-
rc=$?
78-
if [ $rc -ne 0 ]; then
79-
echo "Maximum retries reached, giving up"
87+
#only ios subplatforms are used
88+
if [ "${PLATFORM}" == "ios" ] ; then
89+
SUBPLATFORM=$3
90+
else
91+
SUBPLATFORM=
8092
fi
81-
exit $rc
8293

94+
if [ "${PLATFORM}" == "win32" ] ; then
95+
# Windows build produces 'release' and 'debug' packages
96+
for t_subplatform in v140_static_release v140_static_debug ; do
97+
doUpload "${PLATFORM}" "${ARCH}" "${t_subplatform}"
98+
done
99+
else
100+
doUpload "${PLATFORM}" "${ARCH}" "${SUBPLATFORM}"
101+
fi

‎prebuilt/upload.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def exec_upload_prebuilts(build_platform, build_arch, build_subplatform):
131131
# set curdir to prebuilt folder
132132
os.chdir(os.path.dirname(__file__))
133133
if platform.system() == 'Windows':
134-
args = ["..\util\invoke-unix.bat", "./upload-libs.sh", build_platform, build_subplatform]
134+
args = ["..\util\invoke-unix.bat", "./upload-libs.sh", build_platform, build_arch, build_subplatform]
135135
else:
136136
args = ["./upload-libs.sh", build_platform, build_arch, build_subplatform]
137137
print(' '.join(args))

0 commit comments

Comments
 (0)