diff --git a/docker-builder-data/build/script/common/manager.sh b/docker-builder-data/build/script/common/manager.sh index 491d421..701aac8 100755 --- a/docker-builder-data/build/script/common/manager.sh +++ b/docker-builder-data/build/script/common/manager.sh @@ -185,6 +185,7 @@ call_packet_function() { mkdir -p $FUNC_CURRENT_PACKET_DIR cd $FUNC_CURRENT_PACKET_DIR + source $INCLUDE_SCRIPT_DIR/inc-pkall-none.sh source "$PACKET_SCRIPT_DIR/$NAME.sh" [ ! $? -eq 0 ] && return 1 @@ -287,7 +288,7 @@ build() { } install() { - if ! (check_packet_function $1 install || (build $1 && call_packet_function $1 install)); then + if ! (check_packet_function $1 install || (envdeps $1 && build $1 && call_packet_function $1 install)); then return 1 fi } @@ -437,6 +438,8 @@ clean_all_install() { } clean_all_env() { + clean_install $1 + clean_install_release $1 clean_envdeps $1 clean_env $1 clean_envdeps_release $1 diff --git a/docker-builder-data/build/script/include/inc-pkall-none.sh b/docker-builder-data/build/script/include/inc-pkall-none.sh new file mode 100644 index 0000000..358f527 --- /dev/null +++ b/docker-builder-data/build/script/include/inc-pkall-none.sh @@ -0,0 +1,20 @@ + +pkdownload() { + return 0 +} + +pkunpack() { + return 0 +} + +pkbuild() { + return 0 +} + +pkinstall() { + return 0 +} + +pkinstall_release() { + return 0 +} diff --git a/docker-builder-data/build/script/packet/boost-1.61.0.sh b/docker-builder-data/build/script/packet/boost-1.61.0.sh index 2b4e751..7775baa 100644 --- a/docker-builder-data/build/script/packet/boost-1.61.0.sh +++ b/docker-builder-data/build/script/packet/boost-1.61.0.sh @@ -7,10 +7,6 @@ PK_URL="https://sourceforge.net/projects/boost/files/boost/1.61.0/$PK_ARCHIVE/do source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-default.sh source $INCLUDE_SCRIPT_DIR/inc-pkinstall_release-default.sh -pkbuild() { - return 0 -} - pkinstall() { mkdir -p "$INSTALL_PACKET_DIR/include/" if ! cp -r "$BUILD_PACKET_DIR/$PK_DIRNAME/boost" "$INSTALL_PACKET_DIR/include/"; then diff --git a/docker-builder-data/build/script/packet/freeglut-3.0.0.sh b/docker-builder-data/build/script/packet/freeglut-3.0.0.sh new file mode 100644 index 0000000..848c34c --- /dev/null +++ b/docker-builder-data/build/script/packet/freeglut-3.0.0.sh @@ -0,0 +1,25 @@ +DEPS="cmake-3.6.2" + +PK_DIRNAME="freeglut-3.0.0" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="http://prdownloads.sourceforge.net/freeglut/$PK_ARCHIVE?download" + +source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-default.sh +source $INCLUDE_SCRIPT_DIR/inc-pkinstall-default.sh +source $INCLUDE_SCRIPT_DIR/inc-pkinstall_release-default.sh + +pkbuild() { + cd "$BUILD_PACKET_DIR/$PK_DIRNAME" + + if ! check_packet_function $NAME build.cunfigure; then + if ! cmake -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PACKET_DIR .; then + return 1 + fi + set_done $NAME build.cunfigure + fi + + if ! make -j${THREADS}; then + return 1 + fi +} + diff --git a/docker-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh b/docker-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh index f550a4e..8071157 100755 --- a/docker-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh +++ b/docker-builder-data/build/script/packet/opentoonz-master.files/launch-opentoonz.sh @@ -6,7 +6,7 @@ BASE_DIR=`dirname "$SCRIPT_DIR"` if [ ! -d "$HOME/.config/OpenToonz" ]; then mkdir -p $HOME/.config/OpenToonz - cp -r $BASE_DIR/share/openttonz/stuff $HOME/.config/OpenToonz/ + cp -r $BASE_DIR/share/openttoonz/stuff $HOME/.config/OpenToonz/ cat << EOF > $HOME/.config/OpenToonz/SystemVar.ini [General] diff --git a/docker-builder-data/build/script/packet/opentoonz-master.sh b/docker-builder-data/build/script/packet/opentoonz-master.sh index 5db1998..0fcbb5e 100644 --- a/docker-builder-data/build/script/packet/opentoonz-master.sh +++ b/docker-builder-data/build/script/packet/opentoonz-master.sh @@ -1,4 +1,4 @@ -DEPS="jpeg-9b png-1.6.25 lz4-master glew-2.0.0 usb-1.0.20 sdl-2.0.4 superlu-4.3 cmake-3.6.2 openblas-master boost-1.61.0 qt-5.7" +DEPS="jpeg-9b png-1.6.25 lz4-master glew-2.0.0 usb-1.0.20 sdl-2.0.4 superlu-4.3 cmake-3.6.2 freeglut-3.0.0 openblas-master boost-1.61.0 qt-5.7" PK_DIRNAME="opentoonz" PK_URL="https://github.com/opentoonz/$PK_DIRNAME.git" @@ -54,4 +54,13 @@ pkinstall() { if ! cp -f "$FILES_PACKET_DIR/launch-opentoonz.sh" "$INSTALL_PACKET_DIR/bin"; then return 1 fi + if ! cp -f $BUILD_PACKET_DIR/$PK_DIRNAME/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.so* "$INSTALL_PACKET_DIR/lib"; then + return 1 + fi + if ! cp -f $BUILD_PACKET_DIR/$PK_DIRNAME/thirdparty/tiff-4.0.3/libtiff/.libs/libtiffxx.so* "$INSTALL_PACKET_DIR/lib"; then + return 1 + fi + if ! cp -f "/usr/bin/realpath" "$INSTALL_PACKET_DIR/bin"; then + return 1 + fi } diff --git a/docker-builder-data/build/script/packet/qt-5.7.sh b/docker-builder-data/build/script/packet/qt-5.7.sh index 891dd30..318c8c2 100644 --- a/docker-builder-data/build/script/packet/qt-5.7.sh +++ b/docker-builder-data/build/script/packet/qt-5.7.sh @@ -1,4 +1,4 @@ -DEPS="xcb-1.12" +DEPS="xcbfull-1.12" PK_DIRNAME="qt-everywhere-opensource-src-5.7.0" PK_ARCHIVE="$PK_DIRNAME.tar.gz" diff --git a/docker-builder-data/build/script/packet/xcbfull-1.12.sh b/docker-builder-data/build/script/packet/xcbfull-1.12.sh new file mode 100644 index 0000000..1982d65 --- /dev/null +++ b/docker-builder-data/build/script/packet/xcbfull-1.12.sh @@ -0,0 +1 @@ +DEPS="xcb-1.12 xcbproto-1.12 xcbutil-0.4.0 xcbutilcursor-0.1.3 xcbutilerrors-1.0 xcbutilimage-0.4.0 xcbutilkeysyms-0.4.0 xcbutilrenderutil-0.3.9 xcbutilwm-0.4.1" diff --git a/docker-builder-data/build/script/packet/xcbutil-0.4.0.sh b/docker-builder-data/build/script/packet/xcbutil-0.4.0.sh new file mode 100644 index 0000000..42a8313 --- /dev/null +++ b/docker-builder-data/build/script/packet/xcbutil-0.4.0.sh @@ -0,0 +1,7 @@ +DEPS="xcb-1.12" + +PK_DIRNAME="xcb-util-0.4.0" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="https://xcb.freedesktop.org/dist/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/xcbutilcursor-0.1.3.sh b/docker-builder-data/build/script/packet/xcbutilcursor-0.1.3.sh new file mode 100644 index 0000000..fd6ecda --- /dev/null +++ b/docker-builder-data/build/script/packet/xcbutilcursor-0.1.3.sh @@ -0,0 +1,7 @@ +DEPS="xcb-1.12 xcbutil-0.4.0 xcbutilrenderutil-0.3.9 xcbutilimage-0.4.0" + +PK_DIRNAME="xcb-util-cursor-0.1.3" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="https://xcb.freedesktop.org/dist/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/xcbutilerrors-1.0.sh b/docker-builder-data/build/script/packet/xcbutilerrors-1.0.sh new file mode 100644 index 0000000..12a30fd --- /dev/null +++ b/docker-builder-data/build/script/packet/xcbutilerrors-1.0.sh @@ -0,0 +1,7 @@ +DEPS="xcb-1.12 xcbutil-0.4.0" + +PK_DIRNAME="xcb-util-errors-1.0" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="https://xcb.freedesktop.org/dist/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/xcbutilimage-0.4.0.sh b/docker-builder-data/build/script/packet/xcbutilimage-0.4.0.sh new file mode 100644 index 0000000..7c1a96e --- /dev/null +++ b/docker-builder-data/build/script/packet/xcbutilimage-0.4.0.sh @@ -0,0 +1,7 @@ +DEPS="xcb-1.12 xcbutil-0.4.0" + +PK_DIRNAME="xcb-util-image-0.4.0" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="https://xcb.freedesktop.org/dist/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/xcbutilkeysyms-0.4.0.sh b/docker-builder-data/build/script/packet/xcbutilkeysyms-0.4.0.sh new file mode 100644 index 0000000..cc9e744 --- /dev/null +++ b/docker-builder-data/build/script/packet/xcbutilkeysyms-0.4.0.sh @@ -0,0 +1,7 @@ +DEPS="xcb-1.12 xcbutil-0.4.0" + +PK_DIRNAME="xcb-util-keysyms-0.4.0" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="https://xcb.freedesktop.org/dist/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/xcbutilrenderutil-0.3.9.sh b/docker-builder-data/build/script/packet/xcbutilrenderutil-0.3.9.sh new file mode 100644 index 0000000..818741b --- /dev/null +++ b/docker-builder-data/build/script/packet/xcbutilrenderutil-0.3.9.sh @@ -0,0 +1,7 @@ +DEPS="xcb-1.12 xcbutil-0.4.0" + +PK_DIRNAME="xcb-util-renderutil-0.3.9" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="https://xcb.freedesktop.org/dist/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/xcbutilwm-0.4.1.sh b/docker-builder-data/build/script/packet/xcbutilwm-0.4.1.sh new file mode 100644 index 0000000..c281fb7 --- /dev/null +++ b/docker-builder-data/build/script/packet/xcbutilwm-0.4.1.sh @@ -0,0 +1,7 @@ +DEPS="xcb-1.12 xcbutil-0.4.0" + +PK_DIRNAME="xcb-util-wm-0.4.1" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="https://xcb.freedesktop.org/dist/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-i386/Dockerfile b/docker-builder-i386/Dockerfile index 8bcbfcd..a2ab6da 100644 --- a/docker-builder-i386/Dockerfile +++ b/docker-builder-i386/Dockerfile @@ -6,32 +6,17 @@ RUN apt-get -yq update # Upgrade RUN apt-get -yq upgrade -# Install compilers -RUN apt-get -yq install \ - g++ \ - make - # Install tools RUN apt-get -yq install \ sudo \ realpath \ - pkg-config + pkg-config \ + g++ \ + make # qt deps see: http://doc.qt.io/qt-5/linux-requirements.html RUN apt-get -yq install \ libxrender-dev \ - libxcb1-dev \ - libxcb-render0-dev \ - libxcb-render-util0-dev \ - libxcb-shape0-dev \ - libxcb-randr0-dev \ - libxcb-sync0-dev \ - libxcb-shm0-dev \ - libxcb-icccm4-dev \ - libxcb-keysyms1-dev \ - libxcb-image0-dev \ - libxcb-glx0-dev \ - libxcb-xfixes0-dev \ libfontconfig1-dev \ libfreetype6-dev \ libxi-dev \ @@ -42,17 +27,31 @@ RUN apt-get -yq install \ libice-dev \ libglib2.0-dev \ libglu1-mesa-dev + +# xcb (for qt) +#RUN apt-get -yq install \ +# libxcb1-dev \ +# libxcb-glx0-dev \ +# libxcb-icccm4-dev \ +# libxcb-image0-dev \ +# libxcb-keysyms1-dev \ +# libxcb-randr0-dev \ +# libxcb-render0-dev \ +# libxcb-render-util0-dev \ +# libxcb-shape0-dev \ +# libxcb-sync0-dev \ +# libxcb-shm0-dev \ +# libxcb-xfixes0-dev \ +# libxcb-xinerama0-dev -RUN apt-get -yq install \ - liblzma-dev \ - liblzo2-dev \ - freeglut3-dev - +# other deps + +RUN apt-get -yq install liblzma-dev +RUN apt-get -yq install liblzo2-dev RUN apt-get -yq install gfortran -RUN apt-get -yq install ratfor RUN apt-get -yq install csh -RUN apt-get -yq install libxcb-xinerama0-dev RUN apt-get -yq install xsltproc RUN apt-get -yq install libudev-dev +RUN apt-get -yq install m4 -CMD mkdir /build \ No newline at end of file +CMD mkdir /build diff --git a/docker-builder/Dockerfile b/docker-builder/Dockerfile index eb8ca6f..d0095b7 100644 --- a/docker-builder/Dockerfile +++ b/docker-builder/Dockerfile @@ -6,33 +6,17 @@ RUN apt-get -yq update # Upgrade RUN apt-get -yq upgrade -# Install compilers -RUN apt-get -yq install \ - g++ \ - make - # Install tools RUN apt-get -yq install \ sudo \ - multiarch-support \ realpath \ - pkg-config + pkg-config \ + g++ \ + make # qt deps see: http://doc.qt.io/qt-5/linux-requirements.html RUN apt-get -yq install \ libxrender-dev \ - libxcb1-dev \ - libxcb-render0-dev \ - libxcb-render-util0-dev \ - libxcb-shape0-dev \ - libxcb-randr0-dev \ - libxcb-sync0-dev \ - libxcb-shm0-dev \ - libxcb-icccm4-dev \ - libxcb-keysyms1-dev \ - libxcb-image0-dev \ - libxcb-glx0-dev \ - libxcb-xfixes0-dev \ libfontconfig1-dev \ libfreetype6-dev \ libxi-dev \ @@ -43,17 +27,31 @@ RUN apt-get -yq install \ libice-dev \ libglib2.0-dev \ libglu1-mesa-dev + +# xcb (for qt) +#RUN apt-get -yq install \ +# libxcb1-dev \ +# libxcb-glx0-dev \ +# libxcb-icccm4-dev \ +# libxcb-image0-dev \ +# libxcb-keysyms1-dev \ +# libxcb-randr0-dev \ +# libxcb-render0-dev \ +# libxcb-render-util0-dev \ +# libxcb-shape0-dev \ +# libxcb-sync0-dev \ +# libxcb-shm0-dev \ +# libxcb-xfixes0-dev \ +# libxcb-xinerama0-dev -RUN apt-get -yq install \ - liblzma-dev \ - liblzo2-dev \ - freeglut3-dev - +# other deps + +RUN apt-get -yq install liblzma-dev +RUN apt-get -yq install liblzo2-dev RUN apt-get -yq install gfortran -RUN apt-get -yq install ratfor RUN apt-get -yq install csh -RUN apt-get -yq install libxcb-xinerama0-dev RUN apt-get -yq install xsltproc RUN apt-get -yq install libudev-dev +RUN apt-get -yq install m4 -CMD mkdir /build \ No newline at end of file +CMD mkdir /build