From 128409f387bad63de4496ac5f8f2f697edf0092f Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Sat, 19 Mar 2016 18:53:43 -0700
Subject: Don't hardcode pandoc version in osx/distribution.xml.

Instead, create it from a template, distribution.xml.in.
---
 make_osx_package.sh     |  2 ++
 osx/distribution.xml    | 30 ------------------------------
 osx/distribution.xml.in | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 30 deletions(-)
 delete mode 100644 osx/distribution.xml
 create mode 100644 osx/distribution.xml.in

diff --git a/make_osx_package.sh b/make_osx_package.sh
index 53687a6d7..4a9f03b95 100755
--- a/make_osx_package.sh
+++ b/make_osx_package.sh
@@ -61,6 +61,8 @@ echo Creating OSX package...
 # remove old package first
 rm -rf $BASE.pkg
 
+sed -e "s/PANDOCVERSION/$VERSION/" osx/distribution.xml.in > osx/distribution.xml
+
 pkgbuild --root $DIST/pandoc --identifier net.johnmacfarlane.pandoc --version 1.13 --ownership recommended $DIST/pandoc.pkg
 productbuild --distribution osx/distribution.xml --resources $DIST/Resources --package-path $DIST --version $VERSION --sign "${DEVELOPER_ID_INSTALLER}" $BASE-osx.pkg
 
diff --git a/osx/distribution.xml b/osx/distribution.xml
deleted file mode 100644
index a92f20ad0..000000000
--- a/osx/distribution.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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" enable_anywhere="true" />
-    <options customize="allow" require-scripts="false" rootVolumeOnly="false" />
-    <!-- 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.17"
-             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/distribution.xml.in b/osx/distribution.xml.in
new file mode 100644
index 000000000..145fc0f21
--- /dev/null
+++ b/osx/distribution.xml.in
@@ -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" enable_anywhere="true" />
+    <options customize="allow" require-scripts="false" rootVolumeOnly="false" />
+    <!-- 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="PANDOCVERSION"
+             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>
-- 
cgit v1.2.3