Updates from upstream

brailleapps · Jun 29, 2017 · ad3658b · ad3658b
2 parents 23132ea + 5c30106
commit ad3658b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/ant-build/resources/template.wxs b/ant-build/resources/template.wxs
@@ -15,9 +15,10 @@
 			<Shortcut Id="shortcut_example_butterfly" 	Name="Embosser test - Butterfly" 	Target="[INSTALLDIR]examples\butterfly.pef"/>
 			<Shortcut Id="shortcut_example_6_dot" 		Name="Embosser test - 6 dot chart" 	Target="[INSTALLDIR]examples\6-dot-chart.pef"/>
 			<Shortcut Id="shortcut_example_8_dot" 		Name="Embosser test - 8 dot chart" 	Target="[INSTALLDIR]examples\8-dot-chart.pef"/>
-			<Shortcut Id="shortcut_releas_notes" 		Name="Release notes" 				Target="[INSTALLDIR]docs\Release notes.txt"/>
-			<Shortcut Id="shortcut_getting_started" 	Name="Getting started" 				Target="[INSTALLDIR]docs\Getting started.txt"/>
-			<Shortcut Id="shortcut_known_issues" 		Name="Known issues" 				Target="[INSTALLDIR]docs\Known issues.txt"/>
+			<Shortcut Id="shortcut_releas_notes" 		Name="Release notes" 				Target="[INSTALLDIR]docs\Changes.html"/>
+			<Shortcut Id="shortcut_getting_started" 	Name="Getting started" 				Target="[INSTALLDIR]docs\README.html"/>
+			<Shortcut Id="shortcut_known_issues" 		Name="Known issues" 				Target="[INSTALLDIR]docs\Issues.html"/>
+			<Shortcut Id="shortcut_user_guide" 			Name="User Guide" 				Target="[INSTALLDIR]docs\UserGuide.html"/>
 		</Component>
 	</DirectoryRef>
 	<DirectoryRef Id="FontsFolder">
@@ -38,10 +39,7 @@
 				<RegistryValue Type="string" Value="[INSTALLDIR]favicon.ico,0"/>
 			</RegistryKey>
 			<RegistryKey Root="HKCR" Key="dotify-studio.PortableEmbosserFormat\shell\open\command">
-				<RegistryValue Type="string" Value="&quot;[INSTALLDIR]dotify-studio.exe&quot; -view &quot;%1&quot;"/>
-			</RegistryKey>
-			<RegistryKey Root="HKCR" Key="dotify-studio.PortableEmbosserFormat\shell\print\command">
-				<RegistryValue Type="string" Value="&quot;[INSTALLDIR]dotify-studio.exe&quot; -emboss &quot;%1&quot;"/>
+				<RegistryValue Type="string" Value="&quot;[INSTALLDIR]dotify-studio.exe&quot; -open &quot;%1&quot;"/>
 			</RegistryKey>
 		</Component>
 	</DirectoryRef>

diff --git a/build.gradle b/build.gradle
@@ -18,6 +18,7 @@ configurations {
 repositories {
     mavenCentral()
     //mavenLocal()
+    maven { url "https://oss.sonatype.org/content/groups/staging" }
     //maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
 }
 
@@ -93,12 +94,13 @@ configure( [msi] ) {
     }
 }
 
-configure( [dmg, deb, rpm] ) {
+configure( [deb, rpm] ) {
     doFirst {
         setupBuilder {
 		    desktopStarter {
 		        executable = "bin/dotify-studio"
 		        location = "ApplicationMenu"
+				categories = "Office"
 		    }
         }
     }
@@ -122,8 +124,14 @@ msi {
 
 deb {
     maintainerEmail = '[email protected]'
+    postinst = 'chmod +x /usr/share/dotify-studio/bin/dotify-studio'
 }
 
+rpm {
+    postinst = 'chmod +x /usr/share/dotify-studio/bin/dotify-studio'
+}
+
+
 task wrapper(type: Wrapper, description: 'Refreshes the gradle wrapper') {
     gradleVersion = '3.0'
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 releaseName=Dotify Studio
-version=0.1.0
+version=0.2.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Jan 31 12:54:30 CET 2017
+#Wed Jun 28 19:30:48 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME