Skip to content

Commit 0dc127f

Browse files
pmp-ppmp-p
committed
maintenance
1 parent 94905d2 commit 0dc127f

31 files changed

+379
-113
lines changed

‎pydk-all.sh‎

Lines changed: 55 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ export CMAKE_VERSION=3.13.0
3838

3939

4040
export ORIGIN=$(pwd)
41+
export PYDK=$(pwd)
42+
4143
export HOST="${ORIGIN}/host"
4244
export BUILD_SRC=${ORIGIN}/src
4345

@@ -59,14 +61,16 @@ ROOT="${ORIGIN}/${ENV}"
5961
BUILD_PREFIX="${ROOT}/build"
6062

6163
# sdk tools https://developer.android.com/studio/releases/platform-tools
64+
export ANDROID_HOME="${ANDROID_HOME:-$(pwd)/android-sdk}"
65+
# 28.0.3 at time of ndk 21/22
66+
export BUILD_TOOLS="${ANDROID_HOME}/build-tools/28.0.3"
6267

6368
# ndk https://developer.android.com/ndk/downloads
64-
65-
export ANDROID_HOME=${ANDROID_HOME:-$(pwd)/android-sdk}
6669
export NDK_HOME=${NDK_HOME:-${ANDROID_HOME}/ndk-bundle}
6770
export ANDROID_NDK_HOME=${NDK_HOME}
6871

6972

73+
7074
# above are the defaults, can be overridden via CONFIG
7175

7276
if [ -f "CONFIG" ]
@@ -76,16 +80,16 @@ pwd
7680
fi
7781

7882
#tested
79-
PATCHELF_URL="URL https://github.com/NixOS/patchelf/archive/0.12.tar.gz"
80-
PATCHELF_HASH="URL_HASH SHA256=3dca33fb862213b3541350e1da262249959595903f559eae0fbc68966e9c3f56"
83+
URL_PATCHELF="URL https://github.com/NixOS/patchelf/archive/0.12.tar.gz"
84+
HASH_PATCHELF="URL_HASH SHA256=3dca33fb862213b3541350e1da262249959595903f559eae0fbc68966e9c3f56"
8185

8286

83-
ADBFS_URL="GIT_REPOSITORY https://github.com/spion/adbfs-rootless.git"
87+
URL_ADBFS="GIT_REPOSITORY https://github.com/spion/adbfs-rootless.git"
8488
#tested
85-
ADBFS_HASH="GIT_TAG ba64c22dbd373499eea9c9a9d2a9dd1cd25c33e1 # 14 july 2019"
89+
HASH_ADBFS="GIT_TAG ba64c22dbd373499eea9c9a9d2a9dd1cd25c33e1 # 14 july 2019"
8690

8791
#new
88-
ADBFS_HASH="GIT_TAG 5b091a50cd2419e1cebe42aa1d0e1ad1f90fdfad # 29 feb 2020"
92+
HASH_ADBFS="GIT_TAG 5b091a50cd2419e1cebe42aa1d0e1ad1f90fdfad # 29 feb 2020"
8993

9094
# optionnal urls for sources packages
9195
if [ -f "CACHE_URL" ]
@@ -97,7 +101,7 @@ fi
97101
UNITS="unit bzip2 lzma libffi sqlite3 openssl python3"
98102

99103
#extra
100-
UNITS="$UNITS freetype2 harfbuzz ft2_hb bullet3 openal ogg vorbis panda3d sdl2"
104+
UNITS="$UNITS freetype2 harfbuzz ft2_hb bullet3 openal ogg vorbis panda3d sdl2 pcre2"
101105

102106

103107

@@ -199,7 +203,7 @@ cd "${ROOT}"
199203

200204
# because libpython is shared
201205
export LD_LIBRARY_PATH="${HOST}/lib64:${HOST}/lib:$LD_LIBRARY_PATH"
202-
export BASEPATH="${HOST}/bin:$NDK_HOME:${ROOT}/bin:/bin:/usr/bin:/usr/local/bin"
206+
export BASEPATH="${HOST}/bin:$NDK_HOME:${ROOT}/bin:${PYTHONPYCACHEPREFIX}/bin:/bin:/usr/bin:/usr/local/bin"
203207

204208
# prevent system path interference in build tools
205209
export PATH="$BASEPATH"
@@ -227,8 +231,10 @@ export PATH="$BASEPATH"
227231
228232
export PYDK="${ORIGIN}"
229233
234+
export CMAKE_INSTALL_PREFIX=${APKUSR}
230235
export PREFIX="${APKUSR}"
231236
237+
232238
export PYTHONPATH=${HOST}/lib/python$PYVER:${HOST}/lib/python${PYMAJOR}.${PYMINOR}/site-packages
233239
234240
alias python="${HOST}/bin/python${PYMAJOR}.${PYMINOR} -i -u -B"
@@ -286,8 +292,8 @@ set(_downloadOptions SHOW_PROGRESS)
286292
287293
ExternalProject_Add(
288294
patchelf
289-
${PATCHELF_URL}
290-
${PATCHELF_HASH}
295+
${URL_PATCHELF}
296+
${HASH_PATCHELF}
291297
292298
DOWNLOAD_NO_PROGRESS ${CI}
293299
@@ -301,8 +307,8 @@ ExternalProject_Add(
301307
302308
ExternalProject_Add(
303309
adbfs
304-
${ADBFS_URL}
305-
${ADBFS_HASH}
310+
${URL_ADBFS}
311+
${HASH_ADBFS}
306312
307313
DOWNLOAD_NO_PROGRESS ${CI}
308314
@@ -340,8 +346,9 @@ END
340346
echo " -> host tools now in CMAKE_INSTALL_PREFIX=${HOST}"
341347

342348
echo " -> upgrading host build pip"
343-
#FIXME PYPA "${HOST}/bin/python3" -m pip install --upgrade pip
344-
"${HOST}/bin/python3" -m pip install pip==20.3.1
349+
#FIXME PYPA
350+
"${HOST}/bin/python3" -m pip install --upgrade pip
351+
#"${HOST}/bin/python3" -m pip install pip==20.3.1
345352
fi
346353

347354
# small fix for panda3d cmake
@@ -503,10 +510,23 @@ do
503510
504511
export PKG_CONFIG_PATH=${APKUSR}/lib/pkgconfig
505512
513+
export CMAKE_INSTALL_PREFIX=${APKUSR}
514+
export PREFIX=${APKUSR}
515+
506516
export PS1="[PyDK:$ABI_NAME] \w \$ "
507517
508518
export PYDK="${ORIGIN}"
509519
520+
ndk_build () {
521+
ndk-build \
522+
APP_PLATFORM=\${APP_PLATFORM} APP_ABI=\${APP_ABI} \
523+
NDK_PROJECT_PATH=. \
524+
APP_BUILD_SCRIPT=Android.mk \
525+
APP_ALLOW_MISSING_DEPS=true \
526+
PREFIX=${PREFIX} \
527+
CFLAGS=-fPIC \$@
528+
}
529+
510530
acmake () {
511531
reset
512532
echo " == cmake for target ${ABI_NAME} =="
@@ -639,11 +659,11 @@ export CC=$CC
639659
export RANLIB=$RANLIB
640660
641661
#ndk-build
642-
export PREFIX="${APKUSR}"
662+
export APP_PREFIX="${APKUSR}"
643663
export APP_ABI=$ABI_NAME
644664
export APP_PLATFORM=android-$API
645665
646-
export PATH=$BASEPATH
666+
export PATH=${NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${BUILD_TOOLS}:$BASEPATH
647667
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
648668
649669
END
@@ -669,12 +689,12 @@ done
669689
# if CI does not use bash
670690
if $NOBASH
671691
then
672-
unset ENV ROOT BUILD_PREFIX SUPPORT APKUSR PKG_CONFIG_PATH TOOLCHAIN UNITS PYTHON3_URL PYTHON3_HASH
692+
unset ENV ROOT BUILD_PREFIX SUPPORT APKUSR PKG_CONFIG_PATH TOOLCHAIN UNITS URL_PYTHON3 HASH_PYTHON3
673693
fi
674694

675695
# until webgl is merged into master
676-
unset PANDA3D_URL
677-
unset PANDA3D_HASH
696+
unset URL_PANDA3D
697+
unset HASH_PANDA3D
678698

679699
if echo $ABI_NAME|grep -q wasm
680700
then
@@ -714,7 +734,7 @@ export WCMAKE="emcmake $CMAKE -Wno-dev -DCMAKE_INSTALL_PREFIX=${APKUSR}"
714734
cat > ${HOST}/${ABI_NAME}.sh <<END
715735
#!/bin/sh
716736
717-
export PATH=${HOST}/bin:${ROOT}/bin:/bin:/usr/bin:/usr/local/bin
737+
export PATH=${HOST}/bin:${ROOT}/bin:${PYTHONPYCACHEPREFIX}/bin:/bin:/usr/bin:/usr/local/bin
718738
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${HOST}/lib64:${HOST}/lib
719739
720740
. ${TOOLCHAIN}
@@ -751,6 +771,19 @@ export PS1="[PyDK:$ABI_NAME] \w \$ "
751771
752772
export PYDK="${ORIGIN}"
753773
774+
export CMAKE_INSTALL_PREFIX=${APKUSR}
775+
export PREFIX="${APKUSR}"
776+
777+
# gather \$HOME/.local/bin
778+
779+
export HOME="${PYTHONPYCACHEPREFIX}"
780+
rm "${PYTHONPYCACHEPREFIX}/.local"
781+
ln -s "${PYTHONPYCACHEPREFIX}" "${PYTHONPYCACHEPREFIX}/.local"
782+
783+
784+
wconfigure () {
785+
CC=emcc CXX=em++ ./configure --prefix=${APKUSR} \$@
786+
}
754787
755788
wcmake () {
756789
reset
@@ -766,7 +799,7 @@ fi
766799
767800
END
768801

769-
export UNITS="openssl libffi python3 vorbis panda3d panda3dffi"
802+
export UNITS="openssl libffi python3 vorbis panda3d panda3dffi pcre2"
770803

771804
if [ -f "${SUPPORT}/cross_pip.wasm.sh" ]
772805
then

‎sources.aosp/bullet3.aosp.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# https://github.com/bulletphysics/bullet3
44

55
# valid
6-
#export BULLET_URL=${BULLET_URL:-"URL https://github.com/bulletphysics/bullet3/archive/2.89.tar.gz"}
7-
#export BULLET_HASH=${BULLET_HASH:-"URL_HASH MD5=d239b4800ec30513879834be6fcdc376"}
6+
#export URL_BULLET=${URL_BULLET:-"URL https://github.com/bulletphysics/bullet3/archive/2.89.tar.gz"}
7+
#export HASH_BULLET=${HASH_BULLET:-"URL_HASH MD5=d239b4800ec30513879834be6fcdc376"}
88

99
# testing
10-
export BULLET_URL=${BULLET_URL:-"GIT_REPOSITORY https://github.com/bulletphysics/bullet3.git"}
10+
export URL_BULLET=${URL_BULLET:-"GIT_REPOSITORY https://github.com/bulletphysics/bullet3.git"}
1111

1212
bullet3_host_cmake () {
1313
cat >> CMakeLists.txt <<END
@@ -18,8 +18,8 @@ if(1)
1818
ExternalProject_Add(
1919
bullet3
2020
21-
${BULLET_URL}
22-
${BULLET_HASH}
21+
${URL_BULLET}
22+
${HASH_BULLET}
2323
2424
DOWNLOAD_NO_PROGRESS ${CI}
2525

‎sources.aosp/bzip2.aosp.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

2-
export BZ2_URL=${BZ2_URL:-"URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz"}
3-
export BZ2_HASH=${BZ2_HASH:-"URL_HASH SHA256=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"}
2+
export URL_BZ2=${URL_BZ2:-"URL https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz"}
3+
export HASH_BZ2=${HASH_BZ2:-"URL_HASH SHA256=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"}
44

55
bzip2_host_cmake () {
66
cat >> CMakeLists.txt <<END
@@ -10,8 +10,8 @@ if(1)
1010
message(" processing unit : ${unit}")
1111
ExternalProject_Add(
1212
bz2
13-
${BZ2_URL}
14-
${BZ2_HASH}
13+
${URL_BZ2}
14+
${HASH_BZ2}
1515
1616
DOWNLOAD_NO_PROGRESS ${CI}
1717

‎sources.aosp/cross_pip.aosp.sh‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ cross_pip_host_cmake () {
2121
if(0)
2222
ExternalProject_Add(
2323
${unit}
24-
${cross_pip_URL}
25-
${cross_pip_HASH}
24+
${URL_cross_pip}
25+
${HASH_cross_pip}
2626
2727
DOWNLOAD_NO_PROGRESS ${CI}
2828
@@ -53,13 +53,17 @@ cross_pip_crosscompile () {
5353
5454
export _PYTHON_HOST_PLATFORM=$HOST_PLATFORM
5555
56+
export PREFIX="${APKUSR}"
5657
5758
export PKG_CONFIG_PATH=${APKUSR}/lib/pkgconfig
5859
5960
export PS1="[PyDK:$ABI_NAME] \w \$ "
6061
6162
export PYTHONPYCACHEPREFIX=${PYTHONPYCACHEPREFIX}
62-
export HOME=${PYTHONPYCACHEPREFIX}
63+
export HOME="${APKUSR}"
64+
65+
rm "${APKUSR}/.local"
66+
ln -s "${APKUSR}" "${APKUSR}/.local"
6367
6468
cat >$PYTHONPYCACHEPREFIX/.numpy-site.cfg <<NUMPY
6569
[DEFAULT]

‎sources.aosp/freetype2.aosp.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# https://github.com/roxlu
33
# https://gist.github.com/roxlu/0108d45308a0434e27d4320396399153
44

5-
export FREETYPE2_URL=${FREETYPE2_URL:-"URL https://download.savannah.gnu.org/releases/freetype/freetype-2.10.0.tar.bz2"}
6-
export FREETYPE2_HASH=${FREETYPE2_HASH:-"URL_HASH SHA256=fccc62928c65192fff6c98847233b28eb7ce05f12d2fea3f6cc90e8b4e5fbe06"}
5+
export URL_FREETYPE2=${URL_FREETYPE2:-"URL https://download.savannah.gnu.org/releases/freetype/freetype-2.10.0.tar.bz2"}
6+
export HASH_FREETYPE2=${HASH_FREETYPE2:-"URL_HASH SHA256=fccc62928c65192fff6c98847233b28eb7ce05f12d2fea3f6cc90e8b4e5fbe06"}
77

88

99

@@ -15,8 +15,8 @@ if(1)
1515
message(" processing unit : ${unit}")
1616
ExternalProject_Add(
1717
freetype2
18-
${FREETYPE2_URL}
19-
${FREETYPE2_HASH}
18+
${URL_FREETYPE2}
19+
${HASH_FREETYPE2}
2020
2121
DOWNLOAD_NO_PROGRESS ${CI}
2222

‎sources.aosp/ft2_hb.aosp.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# https://github.com/roxlu
33
# https://gist.github.com/roxlu/0108d45308a0434e27d4320396399153
44

5-
#export FREETYPE2_URL=${FREETYPE2_URL:-"URL https://download.savannah.gnu.org/releases/freetype/freetype-2.10.0.tar.bz2"}
6-
#export FREETYPE2_HASH=${FREETYPE2_HASH:-"URL_HASH SHA256=fccc62928c65192fff6c98847233b28eb7ce05f12d2fea3f6cc90e8b4e5fbe06"}
5+
#export URL_FREETYPE2=${URL_FREETYPE2:-"URL https://download.savannah.gnu.org/releases/freetype/freetype-2.10.0.tar.bz2"}
6+
#export HASH_FREETYPE2=${HASH_FREETYPE2:-"URL_HASH SHA256=fccc62928c65192fff6c98847233b28eb7ce05f12d2fea3f6cc90e8b4e5fbe06"}
77

88

99

‎sources.aosp/harfbuzz.aosp.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
#BAD https://github.com/tamaskenez/harfbuzz-cmake.git
33

4-
export HARFBUZZ_URL=${HARFBUZZ_URL:-"GIT_REPOSITORY https://github.com/harfbuzz/harfbuzz.git"}
5-
export HARFBUZZ_HASH=${HARFBUZZ_HASH:-}
4+
export URL_HARFBUZZ=${URL_HARFBUZZ:-"GIT_REPOSITORY https://github.com/harfbuzz/harfbuzz.git"}
5+
export HASH_HARFBUZZ=${HASH_HARFBUZZ:-}
66

77

88
harfbuzz_host_cmake () {
@@ -12,8 +12,8 @@ if(1)
1212
message(" processing unit : ${unit}")
1313
ExternalProject_Add(
1414
harfbuzz
15-
${HARFBUZZ_URL}
16-
${HARFBUZZ_HASH}
15+
${URL_HARFBUZZ}
16+
${HASH_HARFBUZZ}
1717
1818
DOWNLOAD_NO_PROGRESS ${CI}
1919

‎sources.aosp/jpegturbo.aosp.sh‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
export URL_JPEGTURBO=${URL_JPEGTURBO:-"GIT_REPOSITORY https://github.com/libjpeg-turbo/libjpeg-turbo.git"}
2+
export HASH_JPEGTURBO=${HASH_JPEGTURBO:-"GIT_TAG 3e9e7c70559d820d874fb2abea1ebcdd63c118b2"}
3+
4+
5+
jpegturbo_host_cmake () {
6+
cat >> CMakeLists.txt <<END
7+
#${unit}
8+
9+
if(1)
10+
ExternalProject_Add(
11+
${unit}
12+
${URL_JPEGTURBO}
13+
${HASH_JPEGTURBO}
14+
15+
DOWNLOAD_NO_PROGRESS ${CI}
16+
17+
CONFIGURE_COMMAND sh -c "echo 1>&1;echo external.configure ${unit} 1>&2"
18+
BUILD_COMMAND ""
19+
INSTALL_COMMAND ""
20+
)
21+
else()
22+
message(" ********************************************************************")
23+
message(" No cmake ExternalProject_Add defined for unit : ${unit}")
24+
message(" ********************************************************************")
25+
endif()
26+
27+
END
28+
}
29+
30+
jpegturbo_patch () {
31+
echo
32+
}
33+
34+
jpegturbo_build () {
35+
echo
36+
}
37+
38+
jpegturbo_crosscompile () {
39+
if [ -f ${APKUSR}/lib/libturbojpeg.so ]
40+
then
41+
echo " -> libjpeg-turbo already built for $ABI_NAME"
42+
else
43+
PrepareBuild ${unit}
44+
$ACMAKE ${BUILD_SRC}/${unit}-prefix/src/${unit} && make -s install
45+
fi
46+
}

0 commit comments

Comments
 (0)