Skip to content

Commit

Permalink
udpate project
Browse files Browse the repository at this point in the history
  • Loading branch information
walking98 committed Apr 21, 2020
1 parent 0486ee1 commit 7aa7a8a
Show file tree
Hide file tree
Showing 20 changed files with 16 additions and 113 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*.a
*.la
*.lai
*.so
#*.so
*.dll
*.deb
*.dylib
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MAINTAINER cetc15
USER root
COPY . /home/HelloWorldGui
WORKDIR /home/HelloWorldGui
RUN tar xvf /home/HelloWorldGui/lib.tar -C /usr
RUN apt install -y fcitx-frontend-qt5 && tar xvf /home/HelloWorldGui/lib.tar -C /usr
RUN qmake HelloWorldGui.pro; make
RUN chmod +x /home/HelloWorldGui/HelloWorldGui

Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cd /app/SRC
# apt install free
tar xvf lib.tar -C /usr
#tar xvf lib.tar -C /usr
qmake HelloWorldGui.pro
make
mkdir -p /app/bin/
Expand Down
9 changes: 5 additions & 4 deletions builder/Dockerfile.Builder
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ ENV LC_ALL C.UTF-8
ENV LANG C.UTF-8

COPY sources.list /etc/apt/sources.list
RUN apt update && \
RUN apt update --fix-missing && \
apt upgrade -y && \
apt dist-upgrade -y && \
apt install -y --no-install-recommends \
apt install -y --no-install-recommends \
git \
wget \
xvfb \
Expand All @@ -27,8 +27,9 @@ RUN apt update && \
libx11-dev \
libgl1-mesa-dev \
libudev-dev \
qt5-default \
qtbase5-private-dev &&\
qt5-default qt5-qmltooling-plugins qtmultimedia5-dev qtdeclarative5-dev libqt5qml5 \
qtbase5-private-dev || echo "maybe apt install errors!" &&\
apt update --fix-missing &&\
apt clean

WORKDIR /home/root/
8 changes: 5 additions & 3 deletions builder/sources.list
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
deb http://mirrors.ustc.edu.cn/ubuntu/ eoan main restricted universe multiverse
deb http://mirrors.ustc.edu.cn/ubuntu/ eoan-updates main restricted universe multiverse

deb http://mirrors.aliyun.com/ubuntu/ eoan main restricted universe multiverse
deb http://mirrors.aliyun.com/ubuntu/ eoan-security main restricted universe multiverse
deb http://mirrors.aliyun.com/ubuntu/ eoan-updates main restricted universe multiverse
deb http://mirrors.aliyun.com/ubuntu/ eoan-proposed main restricted universe multiverse
deb http://mirrors.aliyun.com/ubuntu/ eoan-backports main restricted universe multiverse
3 changes: 3 additions & 0 deletions builder/sources.list.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
deb http://mirrors.ustc.edu.cn/ubuntu/ eoan main restricted universe multiverse
deb http://mirrors.ustc.edu.cn/ubuntu/ eoan-updates main restricted universe multiverse

2 changes: 0 additions & 2 deletions debian/gen.sh

This file was deleted.

12 changes: 0 additions & 12 deletions debian/mylib-ext/DEBIAN/control

This file was deleted.

1 change: 0 additions & 1 deletion debian/mylib-ext/DEBIAN/postinst

This file was deleted.

1 change: 0 additions & 1 deletion debian/mylib-ext/DEBIAN/postrm

This file was deleted.

1 change: 0 additions & 1 deletion debian/mylib-ext/DEBIAN/prerm

This file was deleted.

16 changes: 0 additions & 16 deletions debian/mylib-ext/usr/include/mylibext.h

This file was deleted.

Binary file removed debian/mylib-ext/usr/lib/libmylibExt.so
Binary file not shown.
11 changes: 0 additions & 11 deletions debian/mylib/DEBIAN/control

This file was deleted.

1 change: 0 additions & 1 deletion debian/mylib/DEBIAN/postinst

This file was deleted.

1 change: 0 additions & 1 deletion debian/mylib/DEBIAN/postrm

This file was deleted.

1 change: 0 additions & 1 deletion debian/mylib/DEBIAN/prerm

This file was deleted.

16 changes: 0 additions & 16 deletions debian/mylib/usr/include/mylib.h

This file was deleted.

Binary file removed debian/mylib/usr/lib/libmylib.so
Binary file not shown.
40 changes: 0 additions & 40 deletions debian/pkg_upload.py

This file was deleted.

0 comments on commit 7aa7a8a

Please sign in to comment.