From f1b9ac1f407a5315acd5c17d60aff561bbe123e7 Mon Sep 17 00:00:00 2001 From: xieyijun Date: Mon, 3 Jul 2023 19:11:42 +0800 Subject: [PATCH 1/4] add ft_*** Signed-off-by: x30034819 Signed-off-by: xieyijun --- .gitignore | 1 + build/configs/system_deps.toml | 13 +++++++++++++ build/prebuild.sh | 34 ++++++++++++++++++++++++++++++---- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4bea207..5f6f59e 100755 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ prebuilts/build-tools prebuilts/rpm compile_commands.json .vscode +third_party diff --git a/build/configs/system_deps.toml b/build/configs/system_deps.toml index 24969f0..966d294 100755 --- a/build/configs/system_deps.toml +++ b/build/configs/system_deps.toml @@ -34,4 +34,17 @@ package_deps = [ # DRM Backend "libdrm-devel", "systemd-devel", + "libpng-devel", + "libexif-devel", + "cjson-devel", + # flutter + "harfbuzz-devel", + "jsoncpp-devel", + "expat-devel", + # ft_mmi + "libinput-devel", + # ft_multimedia + "giflib-devel", + "libwebp-devel", + "libjpeg-turbo-devel" ] diff --git a/build/prebuild.sh b/build/prebuild.sh index 925eb90..8fcf3a9 100755 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -70,7 +70,7 @@ python3 ${PROJECT_DIR}/build/builder.py check --install-packages $* # install prebuild library if [ ! -d ${PROJECT_DIR}/prebuilts/libs ]; then -git clone https://gitee.com/yanansong/ft_engine_prebuild.git -b rpms ${PROJECT_DIR}/prebuilts/libs +git clone https://gitee.com/xieyijun3/ft_engine_prebuild.git -b rpms ${PROJECT_DIR}/prebuilts/libs fi ARCHNAME=`uname -m` @@ -79,7 +79,7 @@ cd ${PROJECT_DIR}/prebuilts/libs/rpms/${ARCHNAME} sudo ./installRPM cd ${PROJECT_DIR} -rm -fr ${PROJECT_DIR}/prebuilts/libs +# rm -fr ${PROJECT_DIR}/prebuilts/libs # install prebuild include. delete download files if [ ! -d ${PROJECT_DIR}/prebuilts/inc ]; then @@ -90,7 +90,7 @@ fi cd ${PROJECT_DIR}/prebuilts/inc sudo cp -fr * /usr/local/include cd ${PROJECT_DIR} -rm -fr ${PROJECT_DIR}/prebuilts/inc +# rm -fr ${PROJECT_DIR}/prebuilts/inc # install ft_surface_wrapper if [ ! -d ${PROJECT_DIR}/prebuilts/rpm/ft_surface_wrapper ]; then @@ -110,7 +110,7 @@ cd ${PROJECT_DIR} # install mesa_fangtian if [ ! -d ${PROJECT_DIR}/prebuilts/rpm/binary ]; then - git clone https://gitee.com/ShaoboFeng/rpm-fangtian.git ${PROJECT_DIR}/prebuilts/rpm/binary + git clone https://gitee.com/xieyijun3/rpm-fangtian.git ${PROJECT_DIR}/prebuilts/rpm/binary fi cd ${PROJECT_DIR}/prebuilts/rpm/binary ./install.sh @@ -125,4 +125,30 @@ sudo mkdir -p /usr/local/share/ft/window_manager sudo cp ${PROJECT_DIR}/window_manager/resources/config/other/display_manager_config.xml /usr/local/share/ft/window_manager sudo cp ${PROJECT_DIR}/window_manager/resources/config/other/window_manager_config.xml /usr/local/share/ft/window_manager +# ============================================================================= +# download ft thirt part files +# ============================================================================= + +if [ ! -d ${PROJECT_DIR}/third_party/ft_flutter ]; then +git clone https://gitee.com/xieyijun3/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter +fi +cd ${PROJECT_DIR}/third_party/ft_flutter +# ./project_build/prebuild.sh +./build.sh + +if [ ! -d ${PROJECT_DIR}/third_party/ft_mmi ]; then +git clone https://gitee.com/xieyijun3/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi +fi +cd ${PROJECT_DIR}/third_party/ft_mmi +# ./build/prebuild.sh +./build.sh + +if [ ! -d ${PROJECT_DIR}/third_party/ft_multimedia ]; then +git clone https://gitee.com/xieyijun3/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia +fi +cd ${PROJECT_DIR}/third_party/ft_multimedia +# ./build/prebuild.sh +./build.sh + +cd ${PROJECT_DIR} echo -e "\033[32m[*] Pre-build Done. You need exec 'build.sh'.\033[0m" -- Gitee From 16035e7da8aaa52cb08aacc3b1747c8bdebf0e48 Mon Sep 17 00:00:00 2001 From: xieyijun Date: Tue, 4 Jul 2023 12:58:28 +0800 Subject: [PATCH 2/4] add ft_*** Signed-off-by: x30034819 Signed-off-by: xieyijun --- build/build.sh | 12 ++++++++++++ build/prebuild.sh | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/build/build.sh b/build/build.sh index 1fe4401..95a4d28 100755 --- a/build/build.sh +++ b/build/build.sh @@ -36,6 +36,18 @@ if [[ "${PROJECT_DIR}x" == "x" ]]; then exit 1 fi +# builder third_party +cd ${PROJECT_DIR}/third_party/ft_flutter +./build.sh + +cd ${PROJECT_DIR}/third_party/ft_mmi +./build.sh + +cd ${PROJECT_DIR}/third_party/ft_multimedia +./build.sh + +cd ${PROJECT_DIR} + # Exec builder python3 ${PROJECT_DIR}/build/builder.py --project-dir ${PROJECT_DIR} build $* diff --git a/build/prebuild.sh b/build/prebuild.sh index 8fcf3a9..6d635b9 100755 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -133,21 +133,21 @@ if [ ! -d ${PROJECT_DIR}/third_party/ft_flutter ]; then git clone https://gitee.com/xieyijun3/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter fi cd ${PROJECT_DIR}/third_party/ft_flutter -# ./project_build/prebuild.sh +./project_build/prebuild.sh ./build.sh if [ ! -d ${PROJECT_DIR}/third_party/ft_mmi ]; then git clone https://gitee.com/xieyijun3/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi fi cd ${PROJECT_DIR}/third_party/ft_mmi -# ./build/prebuild.sh +./build/prebuild.sh ./build.sh if [ ! -d ${PROJECT_DIR}/third_party/ft_multimedia ]; then git clone https://gitee.com/xieyijun3/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia fi cd ${PROJECT_DIR}/third_party/ft_multimedia -# ./build/prebuild.sh +./build/prebuild.sh ./build.sh cd ${PROJECT_DIR} -- Gitee From 64d5d0826fe5eee63569a2ac6ba56c20a9f1a78e Mon Sep 17 00:00:00 2001 From: xieyijun Date: Wed, 5 Jul 2023 00:50:37 +0800 Subject: [PATCH 3/4] add ft_*** Signed-off-by: x30034819 Signed-off-by: xieyijun --- build/build.sh | 4 ++-- build/configs/system_deps.toml | 10 ---------- build/prebuild.sh | 16 ++++++++-------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/build/build.sh b/build/build.sh index 95a4d28..acddfd0 100755 --- a/build/build.sh +++ b/build/build.sh @@ -40,8 +40,8 @@ fi cd ${PROJECT_DIR}/third_party/ft_flutter ./build.sh -cd ${PROJECT_DIR}/third_party/ft_mmi -./build.sh +# cd ${PROJECT_DIR}/third_party/ft_mmi +# ./build.sh cd ${PROJECT_DIR}/third_party/ft_multimedia ./build.sh diff --git a/build/configs/system_deps.toml b/build/configs/system_deps.toml index 966d294..95e42a4 100755 --- a/build/configs/system_deps.toml +++ b/build/configs/system_deps.toml @@ -37,14 +37,4 @@ package_deps = [ "libpng-devel", "libexif-devel", "cjson-devel", - # flutter - "harfbuzz-devel", - "jsoncpp-devel", - "expat-devel", - # ft_mmi - "libinput-devel", - # ft_multimedia - "giflib-devel", - "libwebp-devel", - "libjpeg-turbo-devel" ] diff --git a/build/prebuild.sh b/build/prebuild.sh index 6d635b9..6a5147e 100755 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -70,7 +70,7 @@ python3 ${PROJECT_DIR}/build/builder.py check --install-packages $* # install prebuild library if [ ! -d ${PROJECT_DIR}/prebuilts/libs ]; then -git clone https://gitee.com/xieyijun3/ft_engine_prebuild.git -b rpms ${PROJECT_DIR}/prebuilts/libs +git clone https://gitee.com/yanansong/ft_engine_prebuild.git -b rpms ${PROJECT_DIR}/prebuilts/libs fi ARCHNAME=`uname -m` @@ -110,7 +110,7 @@ cd ${PROJECT_DIR} # install mesa_fangtian if [ ! -d ${PROJECT_DIR}/prebuilts/rpm/binary ]; then - git clone https://gitee.com/xieyijun3/rpm-fangtian.git ${PROJECT_DIR}/prebuilts/rpm/binary + git clone https://gitee.com/ShaoboFeng/rpm-fangtian.git ${PROJECT_DIR}/prebuilts/rpm/binary fi cd ${PROJECT_DIR}/prebuilts/rpm/binary ./install.sh @@ -136,12 +136,12 @@ cd ${PROJECT_DIR}/third_party/ft_flutter ./project_build/prebuild.sh ./build.sh -if [ ! -d ${PROJECT_DIR}/third_party/ft_mmi ]; then -git clone https://gitee.com/xieyijun3/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi -fi -cd ${PROJECT_DIR}/third_party/ft_mmi -./build/prebuild.sh -./build.sh +# if [ ! -d ${PROJECT_DIR}/third_party/ft_mmi ]; then +# git clone https://gitee.com/xieyijun3/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi +# fi +# cd ${PROJECT_DIR}/third_party/ft_mmi +# ./build/prebuild.sh +# ./build.sh if [ ! -d ${PROJECT_DIR}/third_party/ft_multimedia ]; then git clone https://gitee.com/xieyijun3/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia -- Gitee From b3232098a1fc660f8c161386eccb453a7780681e Mon Sep 17 00:00:00 2001 From: xieyijun3 Date: Tue, 4 Jul 2023 14:55:32 +0800 Subject: [PATCH 4/4] add ft_*** Signed-off-by: x30034819 Signed-off-by: xieyijun3 --- build/build.sh | 3 --- build/prebuild.sh | 15 ++++----------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/build/build.sh b/build/build.sh index acddfd0..3681534 100755 --- a/build/build.sh +++ b/build/build.sh @@ -40,9 +40,6 @@ fi cd ${PROJECT_DIR}/third_party/ft_flutter ./build.sh -# cd ${PROJECT_DIR}/third_party/ft_mmi -# ./build.sh - cd ${PROJECT_DIR}/third_party/ft_multimedia ./build.sh diff --git a/build/prebuild.sh b/build/prebuild.sh index 6a5147e..6f708db 100755 --- a/build/prebuild.sh +++ b/build/prebuild.sh @@ -130,25 +130,18 @@ sudo cp ${PROJECT_DIR}/window_manager/resources/config/other/window_manager_conf # ============================================================================= if [ ! -d ${PROJECT_DIR}/third_party/ft_flutter ]; then -git clone https://gitee.com/xieyijun3/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter -fi +git clone https://gitee.com/openeuler/ft_flutter.git ${PROJECT_DIR}/third_party/ft_flutter cd ${PROJECT_DIR}/third_party/ft_flutter ./project_build/prebuild.sh ./build.sh - -# if [ ! -d ${PROJECT_DIR}/third_party/ft_mmi ]; then -# git clone https://gitee.com/xieyijun3/ft_mmi.git ${PROJECT_DIR}/third_party/ft_mmi -# fi -# cd ${PROJECT_DIR}/third_party/ft_mmi -# ./build/prebuild.sh -# ./build.sh +fi if [ ! -d ${PROJECT_DIR}/third_party/ft_multimedia ]; then -git clone https://gitee.com/xieyijun3/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia -fi +git clone https://gitee.com/openeuler/ft_multimedia.git ${PROJECT_DIR}/third_party/ft_multimedia cd ${PROJECT_DIR}/third_party/ft_multimedia ./build/prebuild.sh ./build.sh +fi cd ${PROJECT_DIR} echo -e "\033[32m[*] Pre-build Done. You need exec 'build.sh'.\033[0m" -- Gitee