Skip to content

Commit

Permalink
Edit: merge slim version
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonyang-ee committed Oct 18, 2024
1 parent 50075b4 commit d471cad
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 3 additions & 1 deletion Dockerfile.build-slim
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ RUN apt-get -y update && apt-get install -y --no-install-recommends \
libnvidia-egl-wayland-dev \
python3-html5lib \
libclang-dev \
libpq-dev \
&& apt-get clean && apt-get autoremove && rm -rf /var/lib/apt/lists/*


Expand Down Expand Up @@ -90,7 +91,8 @@ RUN /Qt6/Src/configure -prefix /opt/Qt6 -release -nomake examples -nomake tests
-skip qtwebview \
-skip qtserialbus \
-skip qtdoc \
-skip qtpositioning
-skip qtpositioning \
-sql-psql

RUN cmake --build . --parallel $(nproc)
RUN cmake --install .
Expand Down
6 changes: 4 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ fi

# Build Qt from source into a library binary tarball
if [[ $BUILD == true ]]; then
mkdir -p build-$VERSION
docker buildx build \
--target=artifact --output type=local,dest=$(pwd)/build-$VERSION/ \
--platform $TARGET \
Expand All @@ -140,8 +141,9 @@ fi

# Build Slim Version of Qt from source into a library binary tarball
if [[ $SLIM == true ]]; then
mkdir -p build-$VERSION-slim
docker buildx build \
--target=artifact --output type=local,dest=$(pwd)/build-$VERSION/ \
--target=artifact --output type=local,dest=$(pwd)/build-$VERSION-slim/ \
--platform $TARGET \
--build-arg VERSION=$VERSION \
--no-cache \
Expand All @@ -150,7 +152,7 @@ if [[ $SLIM == true ]]; then
# if multi-platform TARGET used, for each subfolder in build-$VERSION, move the compiled file up one folder
if [[ $TARGET == *","* ]]; then
for FOLDER in $(ls build-$VERSION-slim); do
mv build-$VERSION/$FOLDER/* build-$VERSION-slim/
mv build-$VERSION-slim/$FOLDER/* build-$VERSION-slim/
rm -r build-$VERSION-slim/$FOLDER
done
fi
Expand Down

0 comments on commit d471cad

Please sign in to comment.