X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Fx-win%2Fpackage.sh;h=7830f06a6889f69b31f82187c985be1d78da565c;hb=ac40945ff96f27606ff5d3600cf06b0ba663a5e1;hp=efc6a6e93f9d980348838585ac63785cd2dc63db;hpb=8f0f88915277460c292d87103647c29bc01dfcb5;p=ardour.git

diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index efc6a6e93f..7830f06a68 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -1,15 +1,78 @@
 #!/bin/bash
 
-# we assuem this script is <ardour-src>/tools/x-win/package
+# we assume this script is <ardour-src>/tools/x-win/package.sh
 pushd "`/usr/bin/dirname \"$0\"`" > /dev/null; this_script_dir="`pwd`"; popd > /dev/null
+cd $this_script_dir
+
+. ../define_versions.sh
+
 cd $this_script_dir/../..
+
 test -f gtk2_ardour/wscript || exit 1
 
+# Defaults (overridden by environment)
 : ${XARCH=i686} # or x86_64
 : ${ROOT=/home/ardour}
 : ${MAKEFLAGS=-j4}
 : ${TMPDIR=/var/tmp}
-: ${SRCDIR=/var/tmp/winsrc}  # source-code tgz cache
+: ${SRCCACHE=/var/tmp/winsrc}  # source-code tgz cache
+
+: ${HARRISONCHANNELSTRIP=harrison_channelstrip}
+: ${HARRISONLV2=harrison_lv2s-n}
+: ${HARRISONDSPURL=http://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
+PROGRAM_NAME=Ardour
+PROGRAM_KEY=Ardour
+PROGRAM_VERSION=${major_version}
+
+PRODUCT_NAME=ardour
+PRODUCT_VERSION=${major_version}
+
+WITH_HARRISON_LV2=1 ;
+WITH_X42_LV2=1 ;
+
+# TODO: grep from build/config.log instead
+while [ $# -gt 0 ] ; do
+	echo "arg = $1"
+	case $1 in
+		--mixbus)
+			MIXBUS=1
+			WITH_HARRISON_LV2=1 ;
+			WITH_X42_LV2=1 ;
+			PROGRAM_NAME=Mixbus
+			PROGRAM_KEY=Mixbus
+			PRODUCT_NAME=mixbus
+			MANUAL_NAME="mixbus${major_version}-live-manual"
+			shift ;;
+		--mixbus32c)
+			MIXBUS=1
+			WITH_HARRISON_LV2=1 ;
+			WITH_X42_LV2=1 ;
+			PRODUCT_NAME=mixbus32c
+			PROGRAM_KEY=Mixbus32C
+			PROGRAM_NAME=Mixbus32C-${PROGRAM_VERSION}
+			PROGRAM_VERSION=""
+			MANUAL_NAME="mixbus32c-${major_version}-live-manual"
+			shift ;;
+		--chanstrip) HARRISONCHANNELSTRIP=$2 ; shift; shift ;;
+	esac
+done
+
+
+LOWERCASE_DIRNAME=ardour${major_version}
+STATEFILE_SUFFIX=ardour # see filename_extensions.cc
+
+
+# derived variables
+PRODUCT_ID=${PROGRAM_NAME}${PROGRAM_VERSION}
+PRODUCT_EXE=${PRODUCT_NAME}.exe
+PRODUCT_ICON=${PRODUCT_NAME}.ico
+
+###############################################################################
+
+echo "Packaging $PRODUCT_ID"
 
 if test "$XARCH" = "x86_64" -o "$XARCH" = "amd64"; then
 	echo "Target: 64bit Windows (x86_64)"
@@ -22,7 +85,7 @@ else
 fi
 
 : ${PREFIX=${ROOT}/win-stack-$WARCH}
-export SRCDIR
+export SRCCACHE
 
 if [ "$(id -u)" = "0" ]; then
 	apt-get -y install nsis curl
@@ -31,19 +94,21 @@ fi
 
 function download {
 echo "--- Downloading.. $2"
-test -f ${SRCDIR}/$1 || curl -k -L -o ${SRCDIR}/$1 $2
+test -f ${SRCCACHE}/$1 || curl -k -L -o ${SRCCACHE}/$1 $2
 }
 
 ################################################################################
 set -e
 
-ARDOURVERSION=$(git describe | sed 's/-g.*$//')
+ARDOURVERSION=${release_version}
 ARDOURDATE=$(date -R)
-BINVERSION=$(git describe | sed 's/-g.*$//' | sed 's/-/./')
-if ! test -f build/gtk2_ardour/ardour-${BINVERSION}.exe; then
-	echo "*** Please compile ardour ${ARDOURVERSION} first."
+if ! test -f build/gtk2_ardour/ardour-${ARDOURVERSION}.exe; then
+	echo "*** Please compile  ardour-${ARDOURVERSION}.exe first."
 	exit 1
 fi
+
+echo " === bundle to $DESTDIR"
+
 ./waf install
 
 ################################################################################
@@ -55,7 +120,7 @@ fi
 
 echo " === bundle to $DESTDIR"
 
-ALIBDIR=$DESTDIR/lib/ardour3
+ALIBDIR=$DESTDIR/lib/${LOWERCASE_DIRNAME}
 
 rm -rf $DESTDIR
 mkdir -p $DESTDIR/bin
@@ -64,24 +129,28 @@ mkdir -p $ALIBDIR/surfaces
 mkdir -p $ALIBDIR/backends
 mkdir -p $ALIBDIR/panners
 mkdir -p $ALIBDIR/vamp
+mkdir -p $ALIBDIR/suil
 
 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/qm-dsp/qmdsp-*.dll $DESTDIR/bin/
 cp build/libs/canvas/canvas-*.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/
 cp build/libs/fst/ardour-vst-scanner.exe $DESTDIR/bin/ || true
-cp `ls -t build/gtk2_ardour/ardour-*.exe | head -n1` $DESTDIR/bin/ardour.exe
+cp build/session_utils/*-*.exe $DESTDIR/bin/ || true
+cp `ls -t build/gtk2_ardour/ardour-*.exe | head -n1` $DESTDIR/bin/${PRODUCT_EXE}
 
 mkdir -p $DESTDIR/lib/gtk-2.0/engines
 cp build/libs/clearlooks-newer/clearlooks.dll $DESTDIR/lib/gtk-2.0/engines/libclearlooks.la
 
 cp $PREFIX/bin/*dll $DESTDIR/bin/
 cp $PREFIX/lib/*dll $DESTDIR/bin/
+# special case libportaudio (wasapi), old stack has no wasapi and hence no .xp
+cp $PREFIX/bin/libportaudio-2.xp $DESTDIR/bin/ || cp $PREFIX/bin/libportaudio-2.dll $DESTDIR/bin/libportaudio-2.xp
 rm -rf $DESTDIR/bin/libjack*.dll
 
 cp `find build/libs/surfaces/ -iname "*.dll"` $ALIBDIR/surfaces/
@@ -90,8 +159,14 @@ cp `find build/libs/panners/ -iname "*.dll"` $ALIBDIR/panners/
 
 cp -r build/libs/LV2 $ALIBDIR/
 cp -r build/libs/vamp-plugins/*ardourvampplugins*.dll $ALIBDIR/vamp/libardourvampplugins.dll
+cp $PREFIX/lib/suil-*/*.dll $ALIBDIR/suil/ || true
+
+# lv2 core, classifications etc - TODO check if we need the complete LV2 ontology
+if test -d $PREFIX/lib/lv2/lv2core.lv2 ; then
+	cp -R $PREFIX/lib/lv2/lv2core.lv2 $ALIBDIR/LV2/
+fi
 
-mv $ALIBDIR/surfaces/ardourcp-*.dll $DESTDIR/bin/
+mv $ALIBDIR/surfaces/ardourcp*.dll $DESTDIR/bin/
 
 # TODO use -static-libgcc -static-libstdc++ -- but for .exe files only
 if update-alternatives --query ${XPREFIX}-gcc | grep Value: | grep -q win32; then
@@ -109,16 +184,22 @@ if test -f /usr/${XPREFIX}/lib/libwinpthread-1.dll; then
 	cp /usr/${XPREFIX}/lib/libwinpthread-1.dll $DESTDIR/bin/
 fi
 
-cp -r $PREFIX/share/ardour3 $DESTDIR/share/
-cp -r $PREFIX/etc/ardour3/* $DESTDIR/share/ardour3/
+cp -r $PREFIX/share/${LOWERCASE_DIRNAME} $DESTDIR/share/
+cp -r $PREFIX/share/locale $DESTDIR/share/
+cp -r $PREFIX/etc/${LOWERCASE_DIRNAME}/* $DESTDIR/share/${LOWERCASE_DIRNAME}/
 
 cp COPYING $DESTDIR/share/
-cp gtk2_ardour/icons/ardour.ico $DESTDIR/share/
+cp gtk2_ardour/icons/${PRODUCT_ICON} $DESTDIR/share/
+cp gtk2_ardour/icons/ardour_bug.ico $DESTDIR/share/
+
+#prefer built-in defaults
+rm -f $DESTDIR/share/${LOWERCASE_DIRNAME}/system_config
 
 # replace default cursor with square version (sans hotspot file)
-cp gtk2_ardour/icons/cursor_square/* $DESTDIR/share/ardour3/icons/
+cp gtk2_ardour/icons/cursor_square/* $DESTDIR/share/${LOWERCASE_DIRNAME}/icons/
 
 # clean build-dir after depoyment
+echo " === bundle completed, cleaning up"
 ./waf uninstall
 echo " === complete"
 du -sh $DESTDIR
@@ -130,17 +211,21 @@ if test -z "$NOVIDEOTOOLS"; then
 	HARVID_VERSION=$(curl -s -S http://ardour.org/files/video-tools/harvid_version.txt)
 	XJADEO_VERSION=$(curl -s -S http://ardour.org/files/video-tools/xjadeo_version.txt)
 
-	rsync -Pa \
+	rsync -a -q --partial \
 		rsync://ardour.org/video-tools/harvid_win-${HARVID_VERSION}.tar.xz \
-		"${SRCDIR}/harvid_win-${HARVID_VERSION}.tar.xz"
+		"${SRCCACHE}/harvid_win-${HARVID_VERSION}.tar.xz"
 
-	rsync -Pa \
+	rsync -a -q --partial \
 		rsync://ardour.org/video-tools/xjadeo_win-${XJADEO_VERSION}.tar.xz \
-		"${SRCDIR}/xjadeo_win-${XJADEO_VERSION}.tar.xz"
+		"${SRCCACHE}/xjadeo_win-${XJADEO_VERSION}.tar.xz"
 
 	mkdir $DESTDIR/video
-	tar -xf "${SRCDIR}/harvid_win-${HARVID_VERSION}.tar.xz" -C "$DESTDIR/video/"
-	tar -xf "${SRCDIR}/xjadeo_win-${XJADEO_VERSION}.tar.xz" -C "$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/"
+
+	echo " === unzipped"
+	du -sh $DESTDIR/video
+	du -sh $DESTDIR
 fi
 
 ################################################################################
@@ -149,31 +234,113 @@ fi
 ### http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.1/threads-win32/sjlj/x86_64-4.9.1-release-win32-sjlj-rt_v3-rev1.7z
 if ! grep " using ./waf configure" build/config.log | grep -q -- "--optimize"; then
 	download gdb-static-win3264.tar.xz http://robin.linuxaudio.org/gdb-static-win3264.tar.xz
-	cd ${SRCDIR}
+	cd ${SRCCACHE}
 	tar xf gdb-static-win3264.tar.xz
 	cd - > /dev/null
 
-	echo " === Creating ardbg.bat"
-	cp -r ${SRCDIR}/gdb_$WARCH $DESTDIR/gdb
-	cat > $DESTDIR/ardbg.bat << EOF
+	echo " === Creating debug.bat"
+	cp -r ${SRCCACHE}/gdb_$WARCH $DESTDIR/gdb
+	cat > $DESTDIR/debug.bat << EOF
 cd bin
-START ..\\gdb\\bin\\gdb.exe ardour.exe
+START ..\\gdb\\bin\\gdb.exe -iex "set logging overwrite on" -iex "set height 0" -iex "set logging on %UserProfile%\\${PRODUCT_NAME}-debug.log" -iex "target exec ${PRODUCT_EXE}" -iex "run"
 EOF
-	OUTFILE="${TMPDIR}/ardour-${ARDOURVERSION}-dbg-${WARCH}-Setup.exe"
+	OUTFILE="${TMPDIR}/${PRODUCT_NAME}-${ARDOURVERSION}-dbg-${WARCH}-Setup.exe"
 	VERSIONINFO="Debug Version."
 else
-	OUTFILE="${TMPDIR}/ardour-${ARDOURVERSION}-${WARCH}-Setup.exe"
+	OUTFILE="${TMPDIR}/${PRODUCT_NAME}-${ARDOURVERSION}-${WARCH}-Setup.exe"
 	VERSIONINFO="Optimized Version."
 fi
 
+################################################################################
+### Mixbus plugins, etc
+if true ; then
+	mkdir -p $ALIBDIR/LV2
+
+	echo "Adding General MIDI Synth LV2"
+
+	for proj in x42-gmsynth; 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 \
+			"${SRCCACHE}/${proj}-lv2-${WARCH}-${X42_VERSION}.zip"
+		unzip -q -d "$ALIBDIR/LV2/" "${SRCCACHE}/${proj}-lv2-${WARCH}-${X42_VERSION}.zip"
+	done
+fi
+
+if test x$WITH_X42_LV2 != x ; then
+	mkdir -p $ALIBDIR/LV2
+
+	echo "Adding x42 Plugins"
+
+	for proj in x42-meters x42-midifilter x42-midimap x42-stereoroute x42-eq setBfree x42-avldrums; 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 \
+			"${SRCCACHE}/${proj}-lv2-${WARCH}-${X42_VERSION}.zip"
+		unzip -q -d "$ALIBDIR/LV2/" "${SRCCACHE}/${proj}-lv2-${WARCH}-${X42_VERSION}.zip"
+	done
+fi
+
+if test x$WITH_HARRISON_LV2 != x ; then
+	mkdir -p $ALIBDIR/LV2
+
+	echo "Including Harrison LV2s"
+
+	curl -s -S --fail -# \
+		-z "${SRCCACHE}/${HARRISONLV2}.${WARCH}.zip" \
+		-o "${SRCCACHE}/${HARRISONLV2}.${WARCH}.zip" \
+		"${HARRISONDSPURL}/${HARRISONLV2}.${WARCH}.zip"
+	unzip -q -d "$ALIBDIR/LV2/" "${SRCCACHE}/${HARRISONLV2}.${WARCH}.zip"
+fi
+
+if test -n "$MIXBUS"; then
+	echo "Deploying Harrison Mixbus Channelstrip"
+
+	mkdir -p $ALIBDIR/ladspa/strip
+	curl -s -S --fail -# \
+		-z "${SRCCACHE}/${HARRISONCHANNELSTRIP}.${WARCH}.dll" \
+		-o "${SRCCACHE}/${HARRISONCHANNELSTRIP}.${WARCH}.dll" \
+		"${HARRISONDSPURL}/${HARRISONCHANNELSTRIP}.${WARCH}.dll"
+
+	cp "${SRCCACHE}/${HARRISONCHANNELSTRIP}.${WARCH}.dll" \
+		"$ALIBDIR/ladspa/strip/${HARRISONCHANNELSTRIP}.dll"
+
+	echo "Deploying Harrison Vamp Plugins"
+	mkdir -p $ALIBDIR/vamp
+	curl -s -S --fail -# \
+		-z "${SRCCACHE}/harrison_vamp.${WARCH}.dll" \
+		-o "${SRCCACHE}/harrison_vamp.${WARCH}.dll" \
+		"${HARRISONDSPURL}/harrison_vamp.${WARCH}.dll"
+
+	cp "${SRCCACHE}/harrison_vamp.${WARCH}.dll" \
+		"$ALIBDIR/vamp/harrison_vamp.dll"
+fi
+
+################################################################################
+
+if test x$DEMO_SESSION_URL != x ; then
+	mkdir -p $Shared/sessions
+	DEMO_SESSIONS=$(curl -s -S --fail $DEMO_SESSION_URL/index.txt)
+	for demo in $DEMO_SESSIONS; do
+		curl -s -S --fail -# -o $Shared/sessions/$demo $DEMO_SESSION_URL/$demo
+	done
+fi
+
+################################################################################
+
+( cd $DESTDIR ; find . ) > ${TMPDIR}/file_list.txt
+
 ################################################################################
 echo " === Preparing Windows Installer"
 NSISFILE=$DESTDIR/a3.nsis
 
 if test "$WARCH" = "w64"; then
 	PGF=PROGRAMFILES64
+	SFX=
 else
 	PGF=PROGRAMFILES
+	# TODO we should only add this for 32bit on 64bit windows!
+	SFX=" (x86)"
 fi
 
 if test -n "$QUICKZIP" ; then
@@ -188,22 +355,46 @@ EOF
 fi
 
 cat >> $NSISFILE << EOF
+!addincludedir "${this_script_dir}\\nsis"
 !include MUI2.nsh
-Name "Ardour3"
+!include FileAssociation.nsh
+!include WinVer.nsh
+
+Name "${PROGRAM_NAME}${PROGRAM_VERSION}"
 OutFile "${OUTFILE}"
 RequestExecutionLevel admin
-InstallDir "\$${PGF}\\ardour3"
-InstallDirRegKey HKLM "Software\\Ardour\\ardour3\\$WARCH" "Install_Dir"
+InstallDir "\$${PGF}\\${PRODUCT_ID}"
+InstallDirRegKey HKLM "Software\\${PRODUCT_NAME}\\${PRODUCT_ID}\\$WARCH" "Install_Dir"
+!define MUI_ICON "share\\${PRODUCT_ICON}"
+
+EOF
+
+if test -n "$MIXBUS"; then
 
-!define MUI_ICON "share\\ardour.ico"
+# TODO: proper welcome/finish text.
+	cat >> $NSISFILE << EOF
+!define MUI_FINISHPAGE_TITLE "Welcome to Harrison Mixbus"
+!define MUI_FINISHPAGE_TEXT "Thanks for your purchase of Mixbus!\$\\r\$\\nYou will find the Mixbus application in the Start Menu (or the All Apps panel for Windows 8) \$\\r\$\\nClick the link below to view the Mixbus manual, and learn ways to get involved with the Mixbus community."
+!define MUI_FINISHPAGE_LINK "Mixbus Manual"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://www.harrisonconsoles.com/mixbus/${MANUAL_NAME}/"
+!define MUI_FINISHPAGE_NOREBOOTSUPPORT
+EOF
+
+else
+
+	cat >> $NSISFILE << EOF
 !define MUI_FINISHPAGE_TITLE "Welcome to Ardour"
-!define MUI_FINISHPAGE_TEXT "This windows versions or Ardour is provided as-is.\$\\r\$\\nThe ardour community currently has no expertise in supporting windows users, and there are no developers focusing on windows specific issues either.\$\\r\$\\nIf you like Ardour, please consider helping out."
+!define MUI_FINISHPAGE_TEXT "This windows versions or Ardour is provided as-is.\$\\r\$\\nThe Ardour community currently has no expertise in supporting windows users, and there are no developers focusing on windows specific issues either.\$\\r\$\\nIf you like Ardour, please consider helping out."
 !define MUI_FINISHPAGE_LINK "Ardour Manual"
-!define MUI_FINISHPAGE_LINK_LOCATION "http://manual.ardour.org"
+!define MUI_FINISHPAGE_LINK_LOCATION "http://manual.ardour.org/"
 #this would run as admin - see http://forums.winamp.com/showthread.php?t=353366
-#!define MUI_FINISHPAGE_RUN "\$INSTDIR\\bin\\ardour.exe"
+#!define MUI_FINISHPAGE_RUN "\$INSTDIR\\bin\\${PRODUCT_EXE}"
 !define MUI_FINISHPAGE_NOREBOOTSUPPORT
+EOF
+
+fi
 
+cat >> $NSISFILE << EOF
 !define MUI_ABORTWARNING
 !insertmacro MUI_PAGE_LICENSE "share\\COPYING"
 !insertmacro MUI_PAGE_COMPONENTS
@@ -214,21 +405,25 @@ InstallDirRegKey HKLM "Software\\Ardour\\ardour3\\$WARCH" "Install_Dir"
 !insertmacro MUI_UNPAGE_INSTFILES
 !insertmacro MUI_LANGUAGE "English"
 
-Section "Ardour3 (required)" SecArdour
+Section "${PROGRAM_NAME}${PROGRAM_VERSION} (required)" SecMainProg
   SectionIn RO
   SetOutPath \$INSTDIR
   File /r bin
   File /r lib
   File /r share
-  File /nonfatal ardbg.bat
+  File /nonfatal debug.bat
   File /nonfatal /r gdb
-  WriteRegStr HKLM SOFTWARE\\Ardour\\ardour3\\$WARCH "Install_Dir" "\$INSTDIR"
-  WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\ardour3" "DisplayName" "Ardour3"
-  WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\ardour3" "UninstallString" '"\$INSTDIR\\uninstall.exe"'
-  WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\ardour3" "NoModify" 1
-  WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\ardour3" "NoRepair" 1
+  WriteRegStr HKLM "Software\\${PROGRAM_KEY}\\v${major_version}\\$WARCH" "Install_Dir" "\$INSTDIR"
+  WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}-${WARCH}" "DisplayName" "${PROGRAM_NAME}${PROGRAM_VERSION}"
+  WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}-${WARCH}" "UninstallString" '"\$INSTDIR\\uninstall.exe"'
+  WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}-${WARCH}" "NoModify" 1
+  WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}-${WARCH}" "NoRepair" 1
   WriteUninstaller "\$INSTDIR\uninstall.exe"
-  CreateShortCut "\$INSTDIR\\Ardour3.lnk" "\$INSTDIR\\bin\\ardour.exe" "" "\$INSTDIR\\bin\\ardour.exe" 0
+  CreateShortCut "\$INSTDIR\\${PROGRAM_NAME}${PROGRAM_VERSION}.lnk" "\$INSTDIR\\bin\\${PRODUCT_EXE}" "" "\$INSTDIR\\bin\\${PRODUCT_EXE}" 0
+  \${registerExtension} "\$INSTDIR\\bin\\${STATEFILE_SUFFIX}" ".${PRODUCT_NAME}" "${PROGRAM_NAME} Session"
+SectionEnd
+
+Section "WASAPI sound driver" SecWASAPI
 SectionEnd
 EOF
 
@@ -236,7 +431,7 @@ if test -z "$NOVIDEOTOOLS"; then
 
 	cat >> $NSISFILE << EOF
 Section "Videotimeline Tools" SecVideo
-  WriteRegStr HKLM SOFTWARE\\Ardour\\video "Install_Dir" "\$INSTDIR\\video"
+  WriteRegStr HKLM "Software\\${PROGRAM_KEY}\\v${major_version}\\video" "Install_Dir" "\$INSTDIR\\video"
   SetOutPath \$INSTDIR
   File /r video
 SectionEnd
@@ -247,20 +442,28 @@ fi
 cat >> $NSISFILE << EOF
 Section "Start Menu Shortcuts" SecMenu
   SetShellVarContext all
-  CreateDirectory "\$SMPROGRAMS\\ardour3"
-  CreateShortCut "\$SMPROGRAMS\\ardour3\\Ardour3.lnk" "\$INSTDIR\\bin\\ardour.exe" "" "\$INSTDIR\\bin\\ardour.exe" 0
+  CreateDirectory "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}"
+  CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\${PROGRAM_NAME}${PROGRAM_VERSION}.lnk" "\$INSTDIR\\bin\\${PRODUCT_EXE}" "" "\$INSTDIR\\bin\\${PRODUCT_EXE}" 0
 EOF
 
-if test -f "$DESTDIR/ardbg.bat"; then
+if test -f "$DESTDIR/debug.bat"; then
 	cat >> $NSISFILE << EOF
-  CreateShortCut "\$SMPROGRAMS\\ardour3\\Ardour3 GDB.lnk" "\$INSTDIR\\ardbg.bat" "" "\$INSTDIR\\ardbg.bat" 0
+  CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\${PROGRAM_NAME}${PROGRAM_VERSION} GDB.lnk" "\$INSTDIR\\debug.bat" "" "\$INSTDIR\\share\\ardour_bug.ico" 0
+EOF
+fi
+
+if test -z "$NOVIDEOTOOLS"; then
+	cat >> $NSISFILE << EOF
+  IfFileExists "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" 0 +2
+  CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\Video Monitor.lnk" "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" "" "\$INSTDIR\\video\\xjadeo\\xjadeo.exe" 0
 EOF
 fi
 
 cat >> $NSISFILE << EOF
-  CreateShortCut "\$SMPROGRAMS\\ardour3\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
+  CreateShortCut "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
 SectionEnd
-LangString DESC_SecArdour \${LANG_ENGLISH} "Ardour ${ARDOURVERSION}\$\\r\$\\n${VERSIONINFO}\$\\r\$\\n${ARDOURDATE}"
+LangString DESC_SecMainProg \${LANG_ENGLISH} "${PROGRAM_NAME} ${ARDOURVERSION}\$\\r\$\\n${VERSIONINFO}\$\\r\$\\n${ARDOURDATE}"
+LangString DESC_SecWASAPI \${LANG_ENGLISH} "WASAPI Audio Driver\$\\r\$\\nOnly works on Vista or later. Windows 10 Users may currently also experience issues if this is installed."
 EOF
 
 if test -z "$NOVIDEOTOOLS"; then
@@ -272,7 +475,8 @@ fi
 cat >> $NSISFILE << EOF
 LangString DESC_SecMenu \${LANG_ENGLISH} "Create Start-Menu Shortcuts (recommended)."
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-!insertmacro MUI_DESCRIPTION_TEXT \${SecArdour} \$(DESC_SecArdour)
+!insertmacro MUI_DESCRIPTION_TEXT \${SecMainProg} \$(DESC_SecMainProg)
+!insertmacro MUI_DESCRIPTION_TEXT \${SecWASAPI} \$(DESC_SecWASAPI)
 EOF
 
 if test -z "$NOVIDEOTOOLS"; then
@@ -286,20 +490,91 @@ cat >> $NSISFILE << EOF
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 Section "Uninstall"
   SetShellVarContext all
-  DeleteRegKey HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\ardour"
-  DeleteRegKey HKLM SOFTWARE\\Ardour\\ardour3
+  DeleteRegKey HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}-${WARCH}"
+  DeleteRegKey HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}"
+  DeleteRegKey HKLM "Software\\${PROGRAM_KEY}\\v${major_version}"
   RMDir /r "\$INSTDIR\\bin"
   RMDir /r "\$INSTDIR\\lib"
   RMDir /r "\$INSTDIR\\share"
   RMDir /r "\$INSTDIR\\gdb"
   RMDir /r "\$INSTDIR\\video"
-  Delete "\$INSTDIR\\ardbg.bat"
+  Delete "\$INSTDIR\\debug.bat"
   Delete "\$INSTDIR\\uninstall.exe"
-  Delete "\$INSTDIR\\Ardour3.lnk"
+  Delete "\$INSTDIR\\${PROGRAM_NAME}${PROGRAM_VERSION}.lnk"
   RMDir "\$INSTDIR"
-  Delete "\$SMPROGRAMS\\ardour3\\*.*"
-  RMDir "\$SMPROGRAMS\\ardour3"
+  Delete "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}\\*.*"
+  RMDir "\$SMPROGRAMS\\${PRODUCT_ID}${SFX}"
+  \${unregisterExtension} ".${STATEFILE_SUFFIX}" "${PROGRAM_NAME} Session"
 SectionEnd
+
+
+Function .onInit
+
+  ReadRegStr \$R0 HKLM \
+    "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}-${WARCH}" \
+    "UninstallString"
+  StrCmp \$R0 "" done
+
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+    "${PROGRAM_NAME} is already installed. Click 'OK' to remove the previous version or 'Cancel' to cancel this upgrade." \
+    IDOK uninst
+    Abort
+
+  uninst:
+    ClearErrors
+    ExecWait '\$R0 _?=\$INSTDIR'
+    IfErrors uninstall_error
+
+    ReadRegStr \$R1 HKLM \
+      "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${PRODUCT_ID}-${WARCH}" \
+      "UninstallString"
+    StrCmp \$R1 "" 0 done
+
+    Delete "\$INSTDIR\\uninstall.exe"
+    RMDir "\$INSTDIR"
+    goto done
+
+  uninstall_error:
+
+    MessageBox MB_OK|MB_ICONEXCLAMATION \
+      "Uninstaller did not complete successfully. Continue at your own risk..." \
+      IDOK done
+
+  done:
+
+  \${If} \${AtMostWinXP}
+    SectionSetFlags \${SecWASAPI} \${SF_RO}
+  \${Else}
+    SectionSetFlags \${SecWASAPI} \${SF_SELECTED}
+  \${EndIf}
+
+FunctionEnd
+
+Function .onInstSuccess
+
+  \${If} \${AtMostWinXP}
+    goto pa_no_wasapi
+  \${EndIf}
+
+  SectionGetFlags \${SecWASAPI} \$R0
+
+  IntOp \$R0 \$R0 & \${SF_SELECTED}
+  IntCmp \$R0 \${SF_SELECTED} pa_with_wasapi pa_no_wasapi
+
+  pa_with_wasapi:
+; VISTA .. 9, libportaudio with WASAPI is good.
+  Delete "\$INSTDIR\\bin\\libportaudio-2.xp"
+  goto endportaudio
+
+; Windows XP lacks support for WASAPI, Windows10 on some system has issues
+; http://tracker.ardour.org/view.php?id=6507
+  pa_no_wasapi:
+  Delete "\$INSTDIR\\bin\\libportaudio-2.dll"
+  Rename "\$INSTDIR\\bin\\libportaudio-2.xp" "\$INSTDIR\\bin\\libportaudio-2.dll"
+
+  endportaudio:
+
+FunctionEnd
 EOF
 
 rm -f ${OUTFILE}
@@ -312,4 +587,4 @@ echo " === Building Windows Installer (lzma compression takes ages)"
 fi
 time makensis -V2 $NSISFILE
 rm -rf $DESTDIR
-ls -lh "$OUTFILE"
+ls -lgGh "$OUTFILE"