Subversion Repositories tpanel

Rev

Rev 376 | Rev 382 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 376 Rev 381
Line 5... Line 5...
5
#
5
#
6
QT_VERSION="6.6.0"
6
QT_VERSION="6.6.0"
7
QT_VERSION_MAJOR=6
7
QT_VERSION_MAJOR=6
8
QT_PATH="/opt/Qt"
8
QT_PATH="/opt/Qt"
9
QT_ABI="x86_64"
9
QT_ABI="x86_64"
-
 
10
QT_HOST="macos"
10
 
11
 
11
QTBASE="${QT_PATH}/$QT_VERSION"
12
QTBASE="${QT_PATH}/$QT_VERSION"
12
QTDIR="${QTBASE}/android_${QT_ABI}"
13
QTDIR="${QTBASE}/android_${QT_ABI}"
13
 
14
 
14
ANDROID_HOME="$HOME/Android/Sdk"
15
ANDROID_HOME="$HOME/Android/Sdk"
Line 24... Line 25...
24
    QTMACROS="${QT_PATH}/Tools/QtCreator/share/qtcreator/package-manager"
25
    QTMACROS="${QT_PATH}/Tools/QtCreator/share/qtcreator/package-manager"
25
fi
26
fi
26
 
27
 
27
JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
28
JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
28
 
29
 
29
export PATH="${QT}/Tools/Ninja:${QT}/Tools/CMake/bin:${QTDIR}/bin:$PATH"
30
export PATH="${QT_PATH}/Tools/Ninja:${QT_PATH}/Tools/CMake/bin:${QTDIR}/bin:$PATH"
30
ANDROID_TOOLCHAIN="${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake"
31
ANDROID_TOOLCHAIN="${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake"
31
 
32
 
32
KEYSTORE="$HOME/projects/tpanel/android/android_release.keystore"
33
KEYSTORE="$HOME/projects/tpanel/android/android_release.keystore"
33
KEYALIAS="tpanel"
34
KEYALIAS="tpanel"
34
PASSFILE="$HOME/.keypass"
35
PASSFILE="$HOME/.keypass"
Line 40... Line 41...
40
export SSL_PATH="$HOME/Android/openssl"
41
export SSL_PATH="$HOME/Android/openssl"
41
#export ANDROID_ABIS="arm64-v8a armeabi-v7a x86_64 x86"
42
#export ANDROID_ABIS="arm64-v8a armeabi-v7a x86_64 x86"
42
 
43
 
43
# This programs must be taken from the Qt framework
44
# This programs must be taken from the Qt framework
44
QMAKE="$QTDIR/bin/qmake"
45
QMAKE="$QTDIR/bin/qmake"
-
 
46
ANDROIDDEPLOYQT="$QTBASE/${QT_HOST}/bin/androiddeployqt"
45
 
47
 
46
if [ ! -z $OSTYPE ] && [[ "$OSTYPE" == *darwin* ]]
48
if [ ! -z $OSTYPE ] && [[ "$OSTYPE" == *darwin* ]]
47
then
49
then
48
    CMAKE="${QT_PATH}/Tools/CMake/CMake.app/Contents/bin/cmake"
50
    CMAKE="${QT_PATH}/Tools/CMake/CMake.app/Contents/bin/cmake"
49
    ANDROIDDEPLOYQT="$QTBASE/macos/bin/androiddeployqt"
51
    C_COMPILER_CLANG="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang"
-
 
52
    CXX_COMPILER_CLANG="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++"
50
else
53
else
51
    CMAKE="${QT_PATH}/Tools/CMake/bin/cmake"
54
    CMAKE="${QT_PATH}/Tools/CMake/bin/cmake"
52
    ANDROIDDEPLOYQT="$QTBASE/gcc_64/bin/androiddeployqt"
-
 
53
fi
55
fi
54
 
56
 
55
GREP="/usr/bin/grep"
57
GREP="/usr/bin/grep"
56
SED="/usr/bin/sed"
58
SED="/usr/bin/sed"
57
 
59
 
Line 192... Line 194...
192
    ${CMAKE} -S ${CURDIR} -B ${CURDIR}/${BUILDDIR} \
194
    ${CMAKE} -S ${CURDIR} -B ${CURDIR}/${BUILDDIR} \
193
        -DCMAKE_GENERATOR:STRING=Ninja ${_dbg} \
195
        -DCMAKE_GENERATOR:STRING=Ninja ${_dbg} \
194
        -DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=${CURDIR}/${BUILDDIR}/.qtc/package-manager/auto-setup.cmake \
196
        -DCMAKE_PROJECT_INCLUDE_BEFORE:FILEPATH=${CURDIR}/${BUILDDIR}/.qtc/package-manager/auto-setup.cmake \
195
        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QMAKE} \
197
        -DQT_QMAKE_EXECUTABLE:FILEPATH=${QMAKE} \
196
        -DCMAKE_PREFIX_PATH:PATH=${QTDIR} \
198
        -DCMAKE_PREFIX_PATH:PATH=${QTDIR} \
197
        -DCMAKE_C_COMPILER:FILEPATH=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang \
199
        -DCMAKE_C_COMPILER:FILEPATH=${C_COMPILER_CLANG} \
198
        -DCMAKE_CXX_COMPILER:FILEPATH=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ \
200
        -DCMAKE_CXX_COMPILER:FILEPATH=${CXX_COMPILER_CLANG} \
199
        -DANDROID_PLATFORM:STRING=${ANDROID_PLATFORM} \
201
        -DANDROID_PLATFORM:STRING=${ANDROID_PLATFORM} \
200
        -DANDROID_NDK:PATH=${ANDROID_NDK_ROOT} \
202
        -DANDROID_NDK:PATH=${ANDROID_NDK_ROOT} \
201
        -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${ANDROID_TOOLCHAIN} \
203
        -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${ANDROID_TOOLCHAIN} \
202
        -DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF \
204
        -DANDROID_USE_LEGACY_TOOLCHAIN_FILE:BOOL=OFF \
203
        -DANDROID_ABI:STRING=${QT_ABI} \
205
        -DANDROID_ABI:STRING=${QT_ABI} \
204
        -DANDROID_STL:STRING=c++_shared \
206
        -DANDROID_STL:STRING=c++_shared \
205
        -DCMAKE_FIND_ROOT_PATH:PATH=${QTDIR} \
207
        -DCMAKE_FIND_ROOT_PATH:PATH=${QTDIR} \
206
        -DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON \
208
        -DQT_NO_GLOBAL_APK_TARGET_PART_OF_ALL:BOOL=ON \
207
        -DQT_HOST_PATH:PATH=${QTBASE}/gcc_64 \
209
        -DQT_HOST_PATH:PATH=${QTBASE}/${QT_HOST} \
208
        -DANDROID_SDK_ROOT:PATH=${ANDROID_HOME} \
210
        -DANDROID_SDK_ROOT:PATH=${ANDROID_HOME} \
209
        -DQT_ANDROID_BUILD_ALL_ABIS:BOOL=ON \
211
        -DQT_ANDROID_BUILD_ALL_ABIS:BOOL=ON \
210
        -DQT_ANDROID_ABIS:STRING="arm64-v8a;armeabi-v7a;x86;x86_64" \
212
        -DQT_ANDROID_ABIS:STRING="arm64-v8a;armeabi-v7a;x86;x86_64" \
211
        2>&1 | tee -a ${LOGFILE}
213
        2>&1 | tee -a ${LOGFILE}
212
 
214