Merge pull request #119 from knguyen99/InstallDirCustomization

add recursive functionality for finding INSTALLDIR

Author: Horcrux7

src/com/inet/gradle/setup/msi/WxsFileBuilder.java

@@ -152,7 +152,10 @@ void build() throws Exception {
         Element directory = getOrCreateChildById( product, "Directory", "TARGETDIR" );
         addAttributeIfNotExists( directory, "Name", "SourceDir" );
         Element programFiles = getOrCreateChildById( directory, "Directory", task.is64Bit() ? "ProgramFiles64Folder" : "ProgramFilesFolder" );
-        Element appDirectory = getOrCreateChildById( programFiles, "Directory", "INSTALLDIR" );
+        Element appDirectory = getChildRecursive(programFiles, "Directory", "Id", "INSTALLDIR");
+        if( appDirectory == null ) {
+            appDirectory = getOrCreateChildById( programFiles, "Directory", "INSTALLDIR" );
+        }
         addAttributeIfNotExists( appDirectory, "Name", setup.getApplication() );
 
         //Files

src/com/inet/gradle/setup/util/XmlFileBuilder.java

@@ -196,4 +196,28 @@ public Element getOrCreateChildByKeyValue( Node parent, String name, String key,
         return child;
     }
 
+    /**
+     * Get a child element (recursive search).
+     *
+     * @param parent the parent node in which we search and create
+     * @param name The tag name of the element
+     * @param key the name of an attribute, can't be null
+     * @param value the value, can be null for not existing
+     * @return the foudn element or null
+     */
+    public Element getChildRecursive( Node parent, String name, String key, String value) {
+        if( name.equals( parent.getNodeName() ) ) {
+            if( Objects.equals( value, ((Element)parent).getAttribute( key ) ) || (value == null && !((Element)parent).hasAttribute( key )) ) {
+                return (Element)parent;
+            }
+        }
+        
+        Node first = parent.getFirstChild();
+        Element res = null;
+        for( Node child = first; child != null && res == null; child = child.getNextSibling() ) {
+            res = getChildRecursive(child, name, key, value);
+        }
+        return (Element)res;
+    }
+
 }