File tree Expand file tree Collapse file tree 3 files changed +40
-5
lines changed
.github/workflows/dockerfiles Expand file tree Collapse file tree 3 files changed +40
-5
lines changed Original file line number Diff line number Diff line change @@ -25,8 +25,21 @@ WORKDIR work
2525ARG QT_SELECT=qt5
2626RUN uname -a; gcc --version | grep "gcc"; python --version; qmake-qt5 --version
2727
28+ CMD ["make"]
29+
30+ # 1. build PythonQt and the generator
31+
2832RUN qmake-qt5 -r PythonQt.pro \
2933 PYTHON_VERSION=$(python --version | cut -d " " -f 2 | cut -d "." -f1,2) \
3034 PYTHON_DIR=$(which python | xargs dirname | xargs dirname)
35+ RUN make
3136
32- CMD ["make"]
37+ # 2. generate wrappers using the built generator
38+
39+ # workaround to allow to find the Qt include dirs for installed standard qt packages
40+ RUN mkdir /usr/include/qt5ln; ln -s /usr/include/qt5 /usr/include/qt5ln/include
41+
42+ RUN echo "export QTDIR=/usr/include/qt5ln" > generate.sh
43+ RUN echo "cd generator; ./pythonqt_generator" >> generate.sh
44+
45+ CMD ["bash", "generate.sh"]
Original file line number Diff line number Diff line change @@ -29,8 +29,19 @@ WORKDIR work
2929ARG QT_SELECT=qt5
3030RUN uname -a; gcc --version | grep "gcc"; python3 --version; qmake --version
3131
32+ # 1. build PythonQt and the generator
33+
3234RUN qmake -r PythonQt.pro \
3335 PYTHON_VERSION=$(python3 --version | cut -d " " -f 2 | cut -d "." -f1,2) \
34- PYTHON_DIR=$(which python3 | xargs dirname | xargs dirname)
36+ PYTHON_DIR=$(which python3 | xargs dirname | xargs dirname)
37+ RUN make
38+
39+ # 2. generate wrappers using the built generator
40+
41+ # workaround to allow to find the Qt include dirs for installed standard qt packages
42+ RUN mkdir /usr/include/qt5; ln -s /usr/include/x86_64-linux-gnu/qt5 /usr/include/qt5/include
43+
44+ RUN echo "export QTDIR=/usr/include/qt5" > generate.sh
45+ RUN echo "cd generator; ./pythonqt_generator" >> generate.sh
3546
36- CMD ["make "]
47+ CMD ["bash", "generate.sh "]
Original file line number Diff line number Diff line change @@ -29,8 +29,19 @@ WORKDIR work
2929ARG QT_SELECT=qt5
3030RUN uname -a; gcc --version | grep "gcc"; python3 --version; qmake --version
3131
32+ # 1. build PythonQt and the generator
33+
3234RUN qmake -r PythonQt.pro \
3335 PYTHON_VERSION=$(python3 --version | cut -d " " -f 2 | cut -d "." -f1,2) \
34- PYTHON_DIR=$(which python3 | xargs dirname | xargs dirname)
36+ PYTHON_DIR=$(which python3 | xargs dirname | xargs dirname)
37+ RUN make
38+
39+ # 2. generate wrappers using the built generator
40+
41+ # workaround to allow to find the Qt include dirs for installed standard qt packages
42+ RUN mkdir /usr/include/qt5; ln -s /usr/include/x86_64-linux-gnu/qt5 /usr/include/qt5/include
43+
44+ RUN echo "export QTDIR=/usr/include/qt5" > generate.sh
45+ RUN echo "cd generator; ./pythonqt_generator" >> generate.sh
3546
36- CMD ["make "]
47+ CMD ["bash", "generate.sh "]
You can’t perform that action at this time.
0 commit comments