Bundle the build-docker script directly in the container
This commit is contained in:
parent
26c59ccb15
commit
9552bd1be8
2 changed files with 25 additions and 9 deletions
|
@ -32,3 +32,7 @@ RUN curl -O -J -L https://github.com/linuxdeploy/linuxdeploy/releases/download/c
|
||||||
ln -s /usr/lib/linuxdeploy/plugins/linuxdeploy-plugin-conda/linuxdeploy-plugin-conda.sh /usr/lib/linuxdeploy/usr/bin/linuxdeploy-plugin-conda && \
|
ln -s /usr/lib/linuxdeploy/plugins/linuxdeploy-plugin-conda/linuxdeploy-plugin-conda.sh /usr/lib/linuxdeploy/usr/bin/linuxdeploy-plugin-conda && \
|
||||||
rm -rf *.AppImage /tmp/* /var/tmp/*
|
rm -rf *.AppImage /tmp/* /var/tmp/*
|
||||||
|
|
||||||
|
COPY build-docker.sh /build-docker.sh
|
||||||
|
|
||||||
|
ENTRYPOINT ["/bin/bash", "/build-docker.sh"]
|
||||||
|
CMD ["/kicad"]
|
||||||
|
|
|
@ -1,22 +1,34 @@
|
||||||
cd $(dirname $0)
|
cd "$1"
|
||||||
|
|
||||||
|
BUILD_TYPE="$2"
|
||||||
|
if [ -z "$BUILD_TYPE" ]; then
|
||||||
|
BUILD_TYPE="Debug"
|
||||||
|
fi
|
||||||
|
|
||||||
rm -rf build
|
rm -rf build
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
cmake -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr -DKICAD_SCRIPTING_PYTHON3=on -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=on ../
|
cmake \
|
||||||
make -j$(nproc) --output-sync
|
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
|
||||||
|
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
|
||||||
|
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
|
||||||
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
|
-DKICAD_SCRIPTING_PYTHON3=on \
|
||||||
|
-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=on \
|
||||||
|
../
|
||||||
|
|
||||||
|
make -j$(nproc) --output-sync
|
||||||
make install DESTDIR=AppDir
|
make install DESTDIR=AppDir
|
||||||
|
|
||||||
cp -r /usr/lib/python2.7/dist-packages/wx-3.0-gtk2 AppDir/usr/lib/python2.7/dist-packages/
|
mkdir -p AppDir/usr/lib/python3/dist-packages/
|
||||||
cp /usr/lib/python2.7/dist-packages/wxPython_common-3.0.2.0.egg-info AppDir/usr/lib/python2.7/dist-packages/
|
|
||||||
mkdir -p AppDir/usr/lib/wx/python/
|
cp -r /usr/lib/python3/dist-packages/wx \
|
||||||
cp /usr/lib/wx/python/wx3.0.pth AppDir/usr/lib/wx/python/
|
/usr/lib/python3/dist-packages/wxPython-4.0.4.egg-info \
|
||||||
cp -r /usr/share/wx-3.0-gtk/ AppDir/usr/share/
|
AppDir/usr/lib/python3/dist-packages/
|
||||||
|
|
||||||
mv AppDir/usr/bin/kicad AppDir/usr/bin/kicad_bin
|
mv AppDir/usr/bin/kicad AppDir/usr/bin/kicad_bin
|
||||||
|
|
||||||
echo -ne '#!/bin/sh\nHERE="$(dirname "$(readlink -f "${0}")")/../../"\nexport PYTHON_PATH="${HERE}"/usr/lib/python2.7:${PYTHON_PATH}\nexec "${HERE}/usr/bin/kicad_bin" "$@"\n' > AppDir/usr/bin/kicad
|
echo -ne '#!/bin/sh\nHERE="$(dirname "$(readlink -f "${0}")")/../../"\nexport PYTHON_PATH="${HERE}"/usr/lib/python3:${PYTHON_PATH}\nexec "${HERE}/usr/bin/kicad_bin" "$@"\n' > AppDir/usr/bin/kicad
|
||||||
|
|
||||||
chmod +x AppDir/usr/bin/kicad
|
chmod +x AppDir/usr/bin/kicad
|
||||||
|
|
||||||
|
|
Reference in a new issue