summaryrefslogtreecommitdiff
path: root/osx
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-08-15 00:46:01 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-08-15 00:46:01 -0700
commit2b6e8f4c83e12d5534d7c21a0882a9f4c1e3cb1d (patch)
treeca661022fe804cbc7e73053d6e28efe2aeca311c /osx
parenta44650bf97dc4fc7f198abd6bc3028102570d834 (diff)
OSX installer improvements.
* Use new pkgbuild, productbuild instead of deprecated PackageMaker. * Removed scripts, which are no longer needed. * Added distribution.xml.
Diffstat (limited to 'osx')
-rw-r--r--osx/distribution.xml30
-rwxr-xr-xosx/osx-resources/InstallationCheck14
-rw-r--r--osx/osx-resources/InstallationCheck.strings3
3 files changed, 30 insertions, 17 deletions
diff --git a/osx/distribution.xml b/osx/distribution.xml
new file mode 100644
index 000000000..024a25bd1
--- /dev/null
+++ b/osx/distribution.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<installer-gui-script minSpecVersion="1">
+ <title>pandoc</title>
+ <organization>net.johnmacfarlane.pandoc</organization>
+ <domains enable_localSystem="true"/>
+ <options customize="never" require-scripts="true" rootVolumeOnly="true" />
+ <!-- Define documents displayed at various steps -->
+ <!-- <welcome file="welcome.html" mime-type="text/html" /> -->
+ <license file="license.html" mime-type="text/html" />
+ <!-- <conclusion file="conclusion.html" mime-type="text/html" /> -->
+ <options hostArchitectures="x86_64" />
+ <!-- List all component packages -->
+ <pkg-ref id="net.johnmacfarlane.pandoc"
+ version="1.13"
+ auth="root">pandoc.pkg</pkg-ref>
+ <!-- List them again here. They can now be organized
+ as a hierarchy if you want. -->
+ <choices-outline>
+ <line choice="net.johnmacfarlane.pandoc"/>
+ </choices-outline>
+ <!-- Define each choice above -->
+ <choice
+ id="net.johnmacfarlane.pandoc"
+ visible="false"
+ title="pandoc"
+ description="pandoc - universal text converter"
+ start_selected="true">
+ <pkg-ref id="net.johnmacfarlane.pandoc"/>
+ </choice>
+</installer-gui-script>
diff --git a/osx/osx-resources/InstallationCheck b/osx/osx-resources/InstallationCheck
deleted file mode 100755
index 2bd691f5c..000000000
--- a/osx/osx-resources/InstallationCheck
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-cputype=`/usr/sbin/sysctl -n hw.cputype`
-sixtyfourbit=`/usr/sbin/sysctl -n hw.cpu64bit_capable`
-
-if [ "x$cputype" != "x7" ] # x86
-then
- exit 112
-fi
-
-if [ "x$sixtyfourbit" != "x1" ] # 64 bit
-then
- exit 113
-fi
-
diff --git a/osx/osx-resources/InstallationCheck.strings b/osx/osx-resources/InstallationCheck.strings
deleted file mode 100644
index 6c8efe0d4..000000000
--- a/osx/osx-resources/InstallationCheck.strings
+++ /dev/null
@@ -1,3 +0,0 @@
-"16" = "This installer works only on Intel Macs.";
-"17" = "This installer requires a 64-bit processor.";
-