Night of the typos III (amend prev 2 commits)

[ardour.git] / tools / x-win / package.sh

diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index 6073e6c99b596bc3bfbd200b378587f76c9a3b50..f5ac7cae4302e90d8256d2e166e65191098c6b0a 100755 (executable)
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -19,7 +19,7 @@ test -f gtk2_ardour/wscript || exit 1
 
 : ${HARRISONCHANNELSTRIP=harrison_channelstrip}
 : ${HARRISONLV2=harrison_lv2s-n}
-: ${HARRISONDSPURL=http://www.harrisonconsoles.com/plugins/releases/public}
+: ${HARRISONDSPURL=https://www.harrisonconsoles.com/plugins/releases/public}
 
 # see also wscript, video_tool_paths.cc, bundle_env_mingw.cc
 # registry keys based on this are used there
@@ -135,8 +135,10 @@ cp build/libs/gtkmm2ext/gtkmm2ext-*.dll $DESTDIR/bin/
 cp build/libs/midi++2/midipp-*.dll $DESTDIR/bin/
 cp build/libs/evoral/evoral-*.dll $DESTDIR/bin/
 cp build/libs/ardour/ardour-*.dll $DESTDIR/bin/
-cp build/libs/timecode/timecode.dll $DESTDIR/bin/
+cp build/libs/temporal/temporal-*.dll $DESTDIR/bin/
 cp build/libs/canvas/canvas-*.dll $DESTDIR/bin/
+cp build/libs/widgets/widgets-*.dll $DESTDIR/bin/
+cp build/libs/waveview/waveview-*.dll $DESTDIR/bin/
 cp build/libs/pbd/pbd-*.dll $DESTDIR/bin/
 cp build/libs/ptformat/ptformat-*.dll $DESTDIR/bin/
 cp build/libs/audiographer/audiographer-*.dll $DESTDIR/bin/
@@ -209,16 +211,16 @@ if test -z "$NOVIDEOTOOLS"; then
        XJADEO_VERSION=$(curl -s -S http://ardour.org/files/video-tools/xjadeo_version.txt)
 
        rsync -a -q --partial \
-               rsync://ardour.org/video-tools/harvid_win-${HARVID_VERSION}.tar.xz \
-               "${SRCCACHE}/harvid_win-${HARVID_VERSION}.tar.xz"
+               rsync://ardour.org/video-tools/harvid_${WARCH}-${HARVID_VERSION}.tar.xz \
+               "${SRCCACHE}/harvid_${WARCH}-${HARVID_VERSION}.tar.xz"
 
        rsync -a -q --partial \
-               rsync://ardour.org/video-tools/xjadeo_win-${XJADEO_VERSION}.tar.xz \
-               "${SRCCACHE}/xjadeo_win-${XJADEO_VERSION}.tar.xz"
+               rsync://ardour.org/video-tools/xjadeo_${WARCH}-${XJADEO_VERSION}.tar.xz \
+               "${SRCCACHE}/xjadeo_${WARCH}-${XJADEO_VERSION}.tar.xz"
 
        mkdir $DESTDIR/video
-       tar -xf "${SRCCACHE}/harvid_win-${HARVID_VERSION}.tar.xz" -C "$DESTDIR/video/"
-       tar -xf "${SRCCACHE}/xjadeo_win-${XJADEO_VERSION}.tar.xz" -C "$DESTDIR/video/"
+       tar -xf "${SRCCACHE}/harvid_${WARCH}-${HARVID_VERSION}.tar.xz" -C "$DESTDIR/video/"
+       tar -xf "${SRCCACHE}/xjadeo_${WARCH}-${XJADEO_VERSION}.tar.xz" -C "$DESTDIR/video/"
 
        echo " === unzipped"
        du -sh $DESTDIR/video
@@ -269,7 +271,7 @@ if test x$WITH_X42_LV2 != x ; then
 
        echo "Adding x42 Plugins"
 
-       for proj in x42-meters x42-midifilter x42-midimap x42-stereoroute x42-eq setBfree x42-avldrums; do
+       for proj in x42-meters x42-midifilter x42-midimap x42-stereoroute x42-eq setBfree x42-avldrums x42-whirl x42-limiter; do
                X42_VERSION=$(curl -s -S http://x42-plugins.com/x42/win/${proj}.latest.txt)
                rsync -a -q --partial \
                        rsync://x42-plugins.com/x42/win/${proj}-lv2-${WARCH}-${X42_VERSION}.zip \