Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 63755e4

Browse files
committed
try fix docker build
1 parent 0ebec73 commit 63755e4

File tree

1 file changed

+7
-27
lines changed

1 file changed

+7
-27
lines changed

tools/appserver/dockerbuild/install.sh

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22
set -ex
33

4-
#export MAKEFLAGS=-j$(nproc)
5-
export MAKEFLAGS=-j1
4+
export MAKEFLAGS=-j$(nproc)
5+
#export MAKEFLAGS=-j1
66
export QPMX_CACHE_DIR=/tmp/qpmx-cache
77

88
DS_NAME=qdsappd
@@ -87,32 +87,12 @@ for repo in QtJsonSerializer qpmx QtService; do
8787
cd ..
8888
done
8989

90-
# build cryptopp
91-
git clone --depth 1 https://github.com/weidai11/cryptopp.git ./cryptopp --branch CRYPTOPP_$CRYPTOPP_VERSION
92-
cd cryptopp
93-
CXXFLAGS="$CXXFLAGS -DNDEBUG -fPIC" make dynamic
94-
make install PREFIX="/usr"
95-
install -m644 "/tmp/src/tools/appserver/dockerbuild/libcrypto++.pc" "/usr/lib/pkgconfig/libcrypto++.pc"
96-
cd ..
97-
CPP_PATCHV=${CRYPTOPP_VERSION_MAJOR}.${CRYPTOPP_VERSION_MINOR}.${CRYPTOPP_VERSION_PATCH}
98-
#ln -s /usr/lib/libcryptopp.so.${CPP_PATCHV} /usr/lib/libcryptopp.so.${CRYPTOPP_VERSION_MAJOR}
99-
#ln -s /usr/lib/libcryptopp.so.${CPP_PATCHV} /usr/lib/libcryptopp.so.${CRYPTOPP_VERSION_MAJOR}.${CRYPTOPP_VERSION_MINOR}
100-
#/sbin/ldconfig -n /usr/lib
101-
102-
# build messages
103-
cd /tmp/src/src/messages
104-
ln -s ../../tools/appserver/.qmake.conf
105-
106-
echo "CONFIG+=system_cryptopp" >> .qmake.conf
107-
qmake
108-
make qmake_all
109-
make
110-
111-
# build the server and install it
112-
cd /tmp/src/tools/appserver
113-
ln -s ../../src/messages/lib lib
90+
# build datasync
91+
cd /tmp/src
92+
git submodule init
93+
git submodule update
94+
echo "SUBDIRS = 3rdparty messages" >> src/src.pro
11495

115-
# already done for messages: echo "CONFIG+=system_cryptopp" >> .qmake.conf
11696
qmake
11797
make qmake_all
11898
make

0 commit comments

Comments
 (0)