From 65a80f70425c7680283a5d6db48b40ef4101ec5a Mon Sep 17 00:00:00 2001
From: esaunders <esaunders@basistech.com>
Date: Mon, 1 Apr 2019 17:15:00 -0400
Subject: [PATCH] Deletion of Gstreamer binaries was not right so now just
 remove them from installer.

---
 build-windows-installer.xml | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/build-windows-installer.xml b/build-windows-installer.xml
index a82f033545..3cb3876df9 100644
--- a/build-windows-installer.xml
+++ b/build-windows-installer.xml
@@ -109,6 +109,8 @@
         <var name="aut-bin-name-todelete" value="${app.name}64.exe"/>
         <var name="aut-bin-name" value="${app.name}.exe"/>
 
+        <var name="gstreamer-path-todelete" value="${app.name}\gstreamer\1.0\x86_64"/>
+
         <var name="jvm.max.mem" value="512m" />
         
         <var name="jre-path" value="${env.JRE_HOME_32}"/>
@@ -118,12 +120,6 @@
             <arg line="/edit ${aip-path-base} /SetAppdir -buildname DefaultBuild -path [ProgramFilesFolder][ProductName]-${app.version}"/>
         </exec>
 
-        <!-- Delete the 64 bit version of gstreamer since its not needed by the 32 bit installer -->
-        <var name="gstreamer-relative-path" value="gstreamer/1.0/x86_64"/>
-        <delete includeEmptyDirs="true">
-            <fileset dir="${inst-path}/${app.name}/${gstreamer-relative-path}"/>
-        </delete>
-
         <antcall target="ai-build" inheritAll="true" />
 
         <delete dir="${nbdist.dir}/installer_${app.name}_32-cache"/>
@@ -138,7 +134,9 @@
         
         <var name="aut-bin-name" value="${app.name}64.exe"/>
         <var name="aut-bin-name-todelete" value="${app.name}.exe"/>
-        
+
+        <var name="gstreamer-path-todelete" value="${app.name}\gstreamer\1.0\x86"/>
+
         <var name="jvm.max.mem" value="4G"/>
         
         <var name="jre-path" value="${env.JRE_HOME_64}"/>
@@ -153,12 +151,6 @@
             <arg line="/edit ${aip-path} /SetPackageType x64"/>
         </exec>
 
-        <!-- Delete the 32 bit version of gstreamer since its not needed by the 64 bit installer -->
-        <var name="gstreamer-relative-path" value="gstreamer/1.0/x86"/>
-        <delete includeEmptyDirs="true">
-            <fileset dir="${inst-path}/${app.name}/${gstreamer-relative-path}"/>
-        </delete>
-
         <antcall target="ai-build" inheritAll="true" />
 
         <delete dir="${nbdist.dir}/installer_${app.name}_64-cache"/>
@@ -198,6 +190,11 @@
         <exec executable="${ai-exe-path}">
             <arg line="/edit ${aip-path} /DelFile APPDIR\bin\${aut-bin-name-todelete}"/>
         </exec>
+
+        <echo message="Removing extra Gstreamer binaries..."/>
+        <exec executable="${ai-exe-path}">
+            <arg line="/edit ${aip-path} /DelFolder APPDIR\${gstreamer-path-todelete}"/>
+        </exec>
     </target>
 
     <target name="add-file-or-dir">