Merge remote-tracking branch 'origin/master' into develop

Author: JavaSaBr

README.md

@@ -41,13 +41,13 @@ an option to the Settings Dialog to enable/disable native Folder Chooser.
 
 ## ver. 1.0.1 ##
 * -Implemented D&D of controls in a model tree.
-* -Implemented to load compiled classes from any IDE to improve integration with IDE's.
+* -Implemented a setting to load compiled classes from any IDE to improve integration with IDE's.
 * -Updated toneg0d.emitter library.
-* -Added glTF loader.
-* -Implemented auto-finding all available controls to create it in model tree.
-* -Added to show custom objects from user data of Spatial.
+* -Added glTF converter.
+* -Implemented auto-finding all available controls for the action to create a custom control.
+* -Added to show custom objects from user data of Spatial on the property panel.
 * -Included jME font creator plugin.
-* -Added to create editable sky nodes.
+* -Added an action to create editable sky nodes in Model Editor.
 * -Added image preview tooltips to Asset tree.
 * -Improved usability and fixed a lot of little bugs with UI.
 

build-native.xml

@@ -172,13 +172,14 @@
             <fx:resources refid="appRes"/>
 
             <manifest>
-                <attribute name="Implementation-Vendor" value="bitbucket.org/JavaSabr"/>
+                <attribute name="Implementation-Vendor" value="javasabr@gmail.com"/>
                 <attribute name="Implementation-Title" value="jMonkeyBuilder"/>
                 <attribute name="Implementation-Version" value="${editor.version}"/>
             </manifest>
         </fx:jar>
 
         <replace file="package/linux/control" token="@version@" value="${editor.version}"/>
+        <replace file="package/windows/jMonkeyBuilder.wxs" token="@version@" value="${editor.version}"/>
 
         <mkdir dir="deploy"/>
         <!-- Need to use ${basedir} because somehow the ant task is calculating the directory differently -->
@@ -199,13 +200,14 @@
             <preferences shortcut="true" menu="true" install="false"/>
 
             <info category="graphics"
-                  description="The 3D Editor for jMonkeyEngine 3.2 by JavaSaBr"
-                  email="javasabr@gmail.com" license="Freeware" title="jMonkeyBuilder" vendor="bitbucket.org/JavaSabr"/>
+                  description="The 3D Editor for jMonkeyEngine 3.2"
+                  email="javasabr@gmail.com" license="Freeware" title="jMonkeyBuilder" vendor="javasabr@gmail.com"/>
 
             <application refId="fxApplication"/>
             <resources refid="appRes"/>
         </fx:deploy>
 
         <replace file="package/linux/control" token="${editor.version}" value="@version@"/>
+        <replace file="package/windows/jMonkeyBuilder.wxs" token="${editor.version}" value="@version@"/>
     </target>
 </project>

native-build/package/linux/control

@@ -6,4 +6,4 @@ Priority: optional
 Architecture: amd64
 Provides: jmonkeybuilder
 Homepage: https://bitbucket.org/JavaSabr/jmonkeybuilder
-Description: 3D Editor for jMonkeyEngine 3.2 by JavaSaBr
+Description: 3D Editor for jMonkeyEngine 3.2

native-build/package/windows/jMonkeyBuilder.wxs

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+>
+    <Product Id="1c551573-db3b-4ad7-ac3b-5feaba25b1ad" Name="jMonkeyBuilder"
+             Language="1033" Version="@version@"
+             Manufacturer="javasabr@gmail.com"
+             UpgradeCode="b74e8cb2-60ac-445f-8e9e-27a04727e0b3">
+        <Package Description="The 3D Editor for jMonkeyEngine 3.2" Comments="None"
+                 InstallerVersion="200" Compressed="yes"
+                 InstallScope="perUser" Platform="x64"/>
+        <Media Id="1" Cabinet="simple.cab" EmbedCab="yes"/>
+
+        <!-- We use RemoveFolderEx to ensure application folder is fully 
+             removed on uninstall. Including files created outside of MSI
+             after application had been installed (e.g. on AU or user state).
+             
+             Hovewer, RemoveFolderEx is only available in WiX 3.6, 
+             we will comment it out if we running older WiX.
+
+             RemoveFolderEx requires that we "remember" the path for uninstall.
+             Read the path value and set the APPLICATIONFOLDER property with the value.
+        -->
+        <Property Id="APPLICATIONFOLDER">
+            <RegistrySearch Key="SOFTWARE\jmonkeyengine\jMonkeyBuilder"
+                            Root="HKCU" Type="raw"
+                            Id="APPLICATIONFOLDER_REGSEARCH" Name="Path"/>
+        </Property>
+        <DirectoryRef Id="APPLICATIONFOLDER">
+            <Component Id="CleanupMainApplicationFolder" Guid="*" Win64="yes">
+                <RegistryValue Root="HKCU"
+                               Key="SOFTWARE\jmonkeyengine\jMonkeyBuilder"
+                               Name="Path" Type="string" Value="[APPLICATIONFOLDER]"
+                               KeyPath="yes"/>
+                <!-- We need to use APPLICATIONFOLDER variable here or RemoveFolderEx
+                     will not remove on "install". But only if WiX 3.6 is used. -->
+                <!--     
+                  <util:RemoveFolderEx On="uninstall" Property="APPLICATIONFOLDER" />
+                -->
+            </Component>
+        </DirectoryRef>
+        <?include bundle.wxi ?>
+        <UI/>
+        <Icon Id="DesktopIcon.exe" SourceFile="jMonkeyBuilder.ico"/>
+        <Icon Id="StartMenuIcon.exe" SourceFile="jMonkeyBuilder.ico"/>
+    </Product>
+</Wix>