Use the variables everywhere, and set the version in the name. Also register oszl files in macOS

This commit is contained in:
Raoul Snyman 2019-05-04 14:43:52 -07:00
parent ad1eb56234
commit 52b016075d
2 changed files with 27 additions and 7 deletions

View File

@ -21,7 +21,27 @@
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<string>org.openlp.osz</string>
<string>org.openlp.service</string>
</array>
</dict>
<dict>
<key>CFBundleTypeExtension</key>
<array>
<string>oszl</string>
</array>
<key>CFBundleTypeIconFiles</key>
<array>
<string>OpenLP.icns</string>
</array>
<key>CFBundleTypeName</key>
<string>OpenLP Service</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>LSHandlerRank</key>
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<string>org.openlp.servicelite</string>
</array>
</dict>
<dict>
@ -41,7 +61,7 @@
<string>Owner</string>
<key>LSItemContentTypes</key>
<array>
<string>org.openlp.otz</string>
<string>org.openlp.theme</string>
</array>
</dict>
</array>

View File

@ -9,8 +9,8 @@
<?define Comments="OpenLP is open source under the GNU General Public License"?>
<?define UpgradeCode="8C5881AC-8F1E-4937-BB99-B823FABF18F0"?>
<?define Platform="%(platform)s"?>
<Product Name="$(var.ProductName)" Manufacturer="$(var.Manufacturer)" Id="$(var.ProductCode)"
UpgradeCode="$(var.UpgradeCode)" Language="1033" Codepage="1252" Version="2.5.0">
<Product Name="$(var.ProductName) $(var.Version)" Manufacturer="$(var.Manufacturer)" Id="$(var.ProductCode)"
UpgradeCode="$(var.UpgradeCode)" Language="1033" Codepage="1252" Version="$(var.ProductVersion)">
<Package Id="*" Keywords="Installer" Description="$(var.Description)" Comments="$(var.Comments)"
Manufacturer="$(var.Manufacturer)" InstallerVersion="251" Languages="1033" Compressed="yes"
SummaryCodepage="1252" Platform="$(var.Platform)"/>
@ -84,7 +84,7 @@
Icon="OpenLP.ico"
WorkingDirectory="RootDirectory"/>
<Shortcut Id="HelpStartMenuShortcut"
Name="OpenLP Help"
Name="$(var.ProductName) Help"
Description="Help file for $(var.ProductName)"
Target="[#file_436f15ee9b174c85745878fe09b6d47e]"
WorkingDirectory="RootDirectory"/>
@ -105,9 +105,9 @@
<Directory Id="DesktopFolder" Name="Desktop" />
</Directory>
<DirectoryRef Id="INSTALLDIR">
<Directory Id="RootDirectory" Name="OpenLP" />
<Directory Id="RootDirectory" Name="$(var.ProductName)" />
</DirectoryRef>
<Feature Id="Complete" Title="Complete" Description="The OpenLP program files" Level="1"
<Feature Id="Complete" Title="Complete" Description="The $(var.ProductName) program files" Level="0"
ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="disallow">
<ComponentGroupRef Id="Files"/>
<ComponentRef Id="ProgramMenuDir"/>