From f932ac390182dbb1b50e3a0b4abf2314fd43bd32 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Tue, 12 Jun 2018 03:33:10 +0700
Subject: [PATCH] Build self-contained APP bundle (non-MAS)

---
 app.properties                        |   6 ++++++
 build.xml                             |  11 +++++++----
 installer/{app => icons}/filebot.icns | Bin
 installer/msi/filebot.wix             |   4 ++--
 4 files changed, 15 insertions(+), 6 deletions(-)
 rename installer/{app => icons}/filebot.icns (100%)

diff --git a/app.properties b/app.properties
index 8c95e1c5..d669e516 100644
--- a/app.properties
+++ b/app.properties
@@ -54,6 +54,12 @@ package.description: FileBot is the ultimate tool for organizing and renaming yo
 package.tags: Mass Renamer, Rename TV shows, Rename movies, Organize media files, Fetch Subtitles, Check SFV files, Plex Media Server, Kodi Media Center, TheTVDB, TheMovieDB, OpenSubtitles
 package.homepage: https://www.filebot.net/
 
+# File Types
+license.description: FileBot License File
+license.extension: psm
+license.mimetype: application/x-filebot-license
+
+
 # Distribution-specific Package Information
 microsoft.application.name: PointPlanck.FileBot
 microsoft.application.publisher: CN=761A0D2B-9B86-4FE4-B664-18E4E0AFC3F1
diff --git a/build.xml b/build.xml
index 4e6a4195..ce746f00 100644
--- a/build.xml
+++ b/build.xml
@@ -581,6 +581,9 @@
 			<bundledocument role="viewer" handlerRank="none" contentTypes="public.audio" name="Audio file" />
 			<bundledocument role="viewer" handlerRank="none" contentTypes="public.folder" name="Media folder" />
 
+			<bundledocument extensions="${license.extension}" icon="${dir.installer}/icons/filebot.icns" name="${license.description}" role="viewer" handlerRank="owner" contentTypes="net.filebot.license" />
+			<typedeclaration extensions="${license.extension}" icon="${dir.installer}/icons/filebot.icns" description="${license.description}" conformsTo="public.plain-text" identifier="net.filebot.license" mimeTypes="${license.mimetype}" />
+
 			<option value="-Dapple.laf.useScreenMenuBar=true" />
 			<option value="-Dapple.awt.application.name=${application.name}" />
 
@@ -626,11 +629,11 @@
 		<tar destfile="${dir.dist}/${release}.app.tar.xz" compression="none" longfile="posix" encoding="utf-8">
 			<tarfileset dir="${dir.staging}">
 				<include name="*.app/**" />
-				<exclude name="**/filebot" />
-				<exclude name="**/bin/*" />
-				<exclude name="**/lib/jspawnhelper" />
+				<exclude name="*.app/**/MacOS/filebot.*" />
+				<exclude name="*.app/**/MacOS/fpcalc" />
+				<exclude name="*.app/**/lib/jspawnhelper" />
+				<exclude name="*.app/**/bin/*" />
 			</tarfileset>
-
 			<tarfileset dir="${dir.staging}" filemode="755">
 				<include name="*.app/**/MacOS/filebot.*" />
 				<include name="*.app/**/MacOS/fpcalc" />
diff --git a/installer/app/filebot.icns b/installer/icons/filebot.icns
similarity index 100%
rename from installer/app/filebot.icns
rename to installer/icons/filebot.icns
diff --git a/installer/msi/filebot.wix b/installer/msi/filebot.wix
index b00d45f4..1f780644 100644
--- a/installer/msi/filebot.wix
+++ b/installer/msi/filebot.wix
@@ -43,8 +43,8 @@
 
 						<Environment Id="PATH" Name="PATH" Value="[INSTALLDIR]" Action="set" Part="last" Permanent="no" System="yes" />
 
-						<ProgId Id="ActivateLicense" Description="FileBot License File" Advertise="no" >
-							<Extension Id="psm" ContentType="application/filebot-license" Advertise="no" >
+						<ProgId Id="ActivateLicense" Description="@{license.description}" Advertise="no">
+							<Extension Id="@{license.extension}" ContentType="@{license.mimetype}" Advertise="no">
 								<Verb Id="Open" Command="Activate License" TargetFile="filebot.launcher.exe" Argument='--license "%1"' />
 							</Extension>
 						</ProgId>