Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Mar 4, 2023. It is now read-only.
/QtDataSyncPublic archive

Commitf3a4aad

Browse files
committed
try fix docker/osx
1 parentb9824f0 commitf3a4aad

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

‎tests/ci/setup.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ fi
1515

1616
# debug test
1717
if [[$TRAVIS_OS_NAME=="osx" ]];then
18-
echo"QDEP_PATH =$(which qdep)"> /opt/qt/$QT_VER/$PLATFORM/mkspecs/features/qdep.prf
19-
cat$scriptdir/qdep.prf>> /opt/qt/$QT_VER/$PLATFORM/mkspecs/features/qdep.prf
18+
echo"QDEP_PATH =$(which qdep)"> /tmp/qdep.prf
19+
cat$scriptdir/qdep.prf>> /tmp/qdep.prf
20+
$SUDO mv /tmp/qdep.prf /opt/qt/$QT_VER/$PLATFORM/mkspecs/features/qdep.prf
2021
fi

‎tools/appserver/dockerbuild/install.sh

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
set -ex
33

44
export MAKEFLAGS=-j$(nproc)
5-
exportQPMX_CACHE_DIR=/tmp/qpmx-cache
5+
exportQDEP_CACHE_DIR=/tmp/qdep-cache
66

77
DS_NAME=qdsappd
8-
QT_VERSION_TAG=v5.12.0
8+
QT_VERSION_TAG=v5.12.1
99
MAIN_DEP="libssl1.1 zlib1g libdbus-1-3 libc6 libglib2.0-0 libudev1 libpcre2-16-0 libpq5 libdouble-conversion1 libicu57 libinput10 ca-certificates"
10-
DEV_DEP="openssl libssl-dev zlib1g-dev dbus libdbus-1-dev libc6-dev libglib2.0-dev libudev-dev libdouble-conversion-dev libicu-dev libpcre2-dev libpq-dev libinput-dev make gcc g++ curl python3 git perl gawk"
10+
DEV_DEP="openssl libssl-dev zlib1g-dev dbus libdbus-1-dev libc6-dev libglib2.0-dev libudev-dev libdouble-conversion-dev libicu-dev libpcre2-dev libpq-dev libinput-dev make gcc g++ curl python3 python3-pip git perl gawk"
11+
PIP_DEV_DEPS="qdep appdirs lockfile argcomplete"
1112

1213
if [!-d"/tmp/src/.git" ];then
1314
echo"Failed to find .git directory - not supported!"
@@ -16,10 +17,7 @@ fi
1617

1718
apt-get -qq update
1819
apt-get -qq install --no-install-recommends$MAIN_DEP$DEV_DEP
19-
20-
# get QPM
21-
curl -O https://www.qpm.io/download/v0.11.0/linux_386/qpm
22-
install -m 755 ./qpm /usr/local/bin/
20+
pip3 install$PIP_DEV_DEPS
2321

2422
mkdir /tmp/sysbuild
2523
cd /tmp/sysbuild
@@ -55,25 +53,23 @@ make > /dev/null
5553
make install
5654
cd ..
5755

58-
# build json serializer, qpmx, qtservice
59-
forrepoin QtJsonSerializer qpmx QtService;do
56+
# prepare qdep
57+
qdep prfgen
58+
59+
# build json serializer, qtservice
60+
forrepoin QtJsonSerializer QtService;do
6061
git clone https://github.com/Skycoder42/$repo.git ./$repo
6162
cd$repo
6263
latesttag=$(git describe --tags --abbrev=0)
6364
echo checking out${latesttag}
6465
git checkout${latesttag}
6566

66-
if [["$repo"=="qpmx" ]];then
67-
git submodule init
68-
git submodule update
69-
fi
70-
7167
if [[-f src/imports/imports.pro ]];then
7268
echo"SUBDIRS -= imports">> src/src.pro
7369
fi
7470

7571
qmake
76-
make> /dev/null|| (cat /tmp/qpmx-*/*;exit 1)
72+
make> /dev/null
7773
make install
7874
cd ..
7975
done
@@ -98,6 +94,7 @@ mv /tmp/src/tools/appserver/dockerbuild/env_start.sh /usr/bin/
9894
/usr/bin/$DS_NAME --version
9995

10096
# remove unused stuff
97+
pip3 uninstall$PIP_DEV_DEPS
10198
apt-get -qq autoremove --purge$DEV_DEP
10299
rm -rf /tmp/*
103100
rm -rf$HOME/.cache/qpmx

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp