diff --git a/build-opentoonz-testing.sh b/build-opentoonz-testing.sh index f21116f..d7b6932 100755 --- a/build-opentoonz-testing.sh +++ b/build-opentoonz-testing.sh @@ -45,6 +45,7 @@ run_nsis() { echo "" echo "Update and build opentoonz for $PLATFORM-$ARCH" echo "" + PLATFORM=win ARCH=32 $SCRIPT clean_before_do env zlib-1.2.11 # for NSIS $SCRIPT chain update opentoonz-testing \ chain clean_before_do install_release opentoonz-testingnsis diff --git a/build-opentoonz.sh b/build-opentoonz.sh index adf38e8..aa20500 100755 --- a/build-opentoonz.sh +++ b/build-opentoonz.sh @@ -44,6 +44,7 @@ run_nsis() { echo "" echo "Update and build opentoonz for $PLATFORM-$ARCH" echo "" + PLATFORM=win ARCH=32 $SCRIPT clean_before_do env zlib-1.2.11 # for NSIS $SCRIPT chain update opentoonz-master \ chain clean_before_do install_release opentoonz-nsis diff --git a/build-papagayong.sh b/build-papagayong.sh index a4cafae..7232640 100755 --- a/build-papagayong.sh +++ b/build-papagayong.sh @@ -45,8 +45,9 @@ run_nsis() { echo "Update and build papagayong for $PLATFORM-$ARCH" echo "" # QUICK HACK: + PLATFORM=win ARCH=32 $SCRIPT clean_before_do env zlib-1.2.11 # for NSIS $SCRIPT chain update papagayong-testing \ - chain clean_before_do unpack papagayong-testing \ + chain clean_before_do build papagayong-testing \ chain shell papagayong-testing "/build/script/packet/papagayong-testing.files/build-win.sh" local TEMPLATE=`gen_name_template "PapagayoNG" "" "$PLATFORM" "$ARCH" ".exe"` diff --git a/build-synfigstudio-debug.sh b/build-synfigstudio-debug.sh index 916a62f..3423a86 100755 --- a/build-synfigstudio-debug.sh +++ b/build-synfigstudio-debug.sh @@ -49,6 +49,7 @@ run_nsis() { echo "" echo "Update synfigstudio-debug for $PLATFORM-$ARCH" echo "" + PLATFORM=win ARCH=32 $SCRIPT clean_before_do env zlib-1.2.11 # for NSIS $SCRIPT chain native update synfigetl-debug \ chain native update synfigcore-debug \ chain update synfigetl-debug \ diff --git a/build-synfigstudio.sh b/build-synfigstudio.sh index 549d597..d2d3d31 100755 --- a/build-synfigstudio.sh +++ b/build-synfigstudio.sh @@ -49,6 +49,7 @@ run_nsis() { echo "" echo "Update and build synfigstudio for $PLATFORM-$ARCH" echo "" + PLATFORM=win ARCH=32 $SCRIPT clean_before_do env zlib-1.2.11 # for NSIS $SCRIPT chain native update synfigetl-master \ chain native update synfigcore-master \ chain update synfigetl-master \ diff --git a/docker-builder-data/build/script/packet/nsis-3.02.1.sh b/docker-builder-data/build/script/packet/nsis-3.02.1.sh index a74e308..dd55af5 100644 --- a/docker-builder-data/build/script/packet/nsis-3.02.1.sh +++ b/docker-builder-data/build/script/packet/nsis-3.02.1.sh @@ -5,25 +5,32 @@ PK_DIRNAME="nsis-3.02.1-src" PK_ARCHIVE="$PK_DIRNAME.tar.bz2" PK_URL="http://prdownloads.sourceforge.net/nsis/$PK_ARCHIVE" +#TODO: hardcoded path to mingw binaries +#TODO: untracked dependency for zlib win32 + +PK_PATH="/usr/local/i686-w64-mingw32/sys-root/bin:$PATH" +PK_ZLIB_W32="$PACKET_BUILD_DIR/win-32/zlib-1.2.11/env" +PK_NSIS_MAX_STRLEN=131072 + source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh pkbuild() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME" || return 1 - native_at_place with_envvar PATH "$PATH" scons \ + PATH="$PK_PATH" scons \ PREFIX="$INSTALL_PACKET_DIR" \ - ZLIB_W32="$ENVDEPS_PACKET_DIR" \ + ZLIB_W32="$PK_ZLIB_W32" \ SKIPUTILS="NSIS Menu" \ - NSIS_MAX_STRLEN=131072 \ + NSIS_MAX_STRLEN=$PK_NSIS_MAX_STRLEN \ || return 1 } pkinstall() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME" - native_at_place with_envvar PATH "$PATH" scons \ + PATH="$PK_PATH" scons \ PREFIX="$INSTALL_PACKET_DIR" \ - ZLIB_W32="$ENVDEPS_PACKET_DIR" \ + ZLIB_W32="$PK_ZLIB_W32" \ SKIPUTILS="NSIS Menu" \ - NSIS_MAX_STRLEN=8192 \ + NSIS_MAX_STRLEN=$PK_NSIS_MAX_STRLEN \ install \ || return 1 } diff --git a/docker-builder-data/build/script/packet/opentoonz-nsis.sh b/docker-builder-data/build/script/packet/opentoonz-nsis.sh index 36a9cfa..ff540d2 100644 --- a/docker-builder-data/build/script/packet/opentoonz-nsis.sh +++ b/docker-builder-data/build/script/packet/opentoonz-nsis.sh @@ -1,4 +1,5 @@ -DEPS="opentoonz-master nsis-3.02.1" +DEPS="opentoonz-master" +DEPS_NATIVE="nsis-3.02.1" pkfunc_register_file() { local FILE=$1 diff --git a/docker-builder-data/build/script/packet/papagayong-master.sh b/docker-builder-data/build/script/packet/papagayong-master.sh index 7547d0b..7f44521 100644 --- a/docker-builder-data/build/script/packet/papagayong-master.sh +++ b/docker-builder-data/build/script/packet/papagayong-master.sh @@ -1,5 +1,9 @@ DEPS="wxphoenix-master python3pyaudio-master" +if [ "$PLATFORM" = "win" ]; then + DEPS_NATIVE="nsis-3.02.1" +fi + PK_DIRNAME="papagayo-ng" PK_URL="https://github.com/morevnaproject/$PK_DIRNAME.git" diff --git a/docker-builder-data/build/script/packet/synfigstudio-nsis.sh b/docker-builder-data/build/script/packet/synfigstudio-nsis.sh index c3bb16c..47aacc4 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-nsis.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-nsis.sh @@ -1,4 +1,5 @@ -DEPS="synfigstudio-master nsis-3.02.1" +DEPS="synfigstudio-master" +DEPS_NATIVE="nsis-3.02.1" PK_PYTHON_DIRNAME="python" PK_PYTHON_ARCHIVE="portable-python-3.2.5.1.zip"