git.iko.soy/typeable/pandoc
on master help sign in
Name change OSX -> MacOS.

Add a -MacOS suffix to mac package rather than -OSX. CHanged local names from osx to macos.

commitc96b64e91b54481aa870566dbecae69df711223d authorJohn MacFarlane <jgm@berkeley.edu> dateTue 31 Jan 2017, 15:05 (10 years ago) parent99c2a31
7 files changed+18−20
compare with master
unifiedsplit
INSTALL.md+2−2 Makefile+3−3 RELEASE-CHECKLIST+1−1 osx/distribution.xml.in → macos/distribution.xml.in osx/make_osx_package.sh → macos/make_macos_package.sh+12−14 osx/stack.yaml → macos/stack.yaml osx/uninstall-pandoc.pl → macos/uninstall-pandoc.pl
INSTALL.md+2−2
@@ -19,7 +19,7 @@
1919 copy /y "%TEMP%\pandoc\pandoc-citeproc.exe" C:\Utils\Console\
2020 rmdir /s /q "%TEMP%\pandoc\"
2121
22−## Mac OS X
22+## MacOS
2323
2424 - There is a package installer at pandoc's [download page].
2525 If you later want to uninstall the package, you can do so
@@ -27,7 +27,7 @@
2727 and running it with `perl uninstall-pandoc.pl`.
2828
2929 - It is possible to extract the pandoc and pandoc-citeproc
30− executables from the osx pkg file, if you'd rather not run
30+ executables from the MacOS pkg file, if you'd rather not run
3131 the installer. To do this (for the version 1.19.1 package):
3232
3333 mkdir pandoc-extract
Makefile+3−3
@@ -27,8 +27,8 @@ dist: man/pandoc.1
2727debpkg: man/pandoc.1
2828 make -C deb
2929
30−osxpkg: man/pandoc.1
31− ./osx/make_osx_package.sh
30+macospkg: man/pandoc.1
31+ ./macos/make_macos_package.sh
3232
3333winpkg: pandoc-$(version)-windows.msi
3434
@@ -52,4 +52,4 @@ download_stats:
5252clean:
5353 stack clean
5454
55−.PHONY: deps quick full install clean test bench changes_github osxpkg dist prof download_stats
55+.PHONY: deps quick full install clean test bench changes_github macospkg dist prof download_stats
RELEASE-CHECKLIST+1−1
@@ -11,7 +11,7 @@ _ Tag templates
1111
1212_ Generate Windows package (make winpkg)
1313
14−_ Generate Mac OSX package (make osxpkg)
14+_ Generate MacOS package (make macospkg)
1515
1616_ Generate Ubuntu/Debian deb package (make debpkg)
1717
osx/distribution.xml.in → macos/distribution.xml.inrenamed

The content is the same.

osx/make_osx_package.sh → macos/make_macos_package.shrenamed+12−14
@@ -1,13 +1,13 @@
11#!/bin/bash -e
22
33LOCALBIN=$HOME/.local/bin
4−DIST=`pwd`/osx_package
5−OSX=`pwd`/osx
4+DIST=`pwd`/macos_package
5+MACOS=`pwd`/macos
66VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}')
77RESOURCES=$DIST/Resources
88ROOT=$DIST/pandoc
99DEST=$ROOT/usr/local
10−SCRIPTS=$OSX/osx-resources
10+SCRIPTS=$MACOS/macos-resources
1111BASE=pandoc-$VERSION
1212ME=$(whoami)
1313PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker
@@ -16,7 +16,7 @@ DEVELOPER_ID_INSTALLER=${DEVELOPER_ID_INSTALLER:-Developer ID Installer: John Ma
1616
1717# We need this for hsb2hs:
1818PATH=$LOCALBIN:$PATH
19−export MACOSX_DEPLOYMENT_TARGET=10.7
19+export MACMACOS_DEPLOYMENT_TARGET=10.7
2020
2121# echo Removing old files...
2222rm -rf $DIST
@@ -27,7 +27,7 @@ which hsb2hs || stack install hsb2hs
2727
2828echo Building pandoc...
2929stack clean
30−stack install --stack-yaml=$OSX/stack.yaml --local-bin-path . pandoc pandoc-citeproc
30+stack install --stack-yaml=$MACOS/stack.yaml --local-bin-path . pandoc pandoc-citeproc
3131
3232echo Getting man pages...
3333make man/pandoc.1
@@ -41,7 +41,7 @@ PANDOC_CITEPROC_PATH=$DIST/pandoc-citeproc-${PANDOC_CITEPROC_VERSION}
4141mkdir -p $DEST/bin
4242mkdir -p $DEST/share/man/man1
4343for f in pandoc pandoc-citeproc; do
44− cp $OSX/$f $DEST/bin/;
44+ cp $MACOS/$f $DEST/bin/;
4545done
4646cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/
4747cp man/pandoc.1 $DEST/share/man/man1/
@@ -49,7 +49,7 @@ cp man/pandoc.1 $DEST/share/man/man1/
4949chown -R $ME:staff $DIST
5050
5151echo Copying license...
52−$OSX/pandoc --data data -t html5 -s COPYING.md -o $RESOURCES/license.html
52+$MACOS/pandoc --data data -t html5 -s COPYING.md -o $RESOURCES/license.html
5353
5454# Removing executable signing because of a problem that arose in El Capitan
5555# "source=obsolete resource envelope"
@@ -60,17 +60,15 @@ $OSX/pandoc --data data -t html5 -s COPYING.md -o $RESOURCES/license.html
6060# make sure it's valid... returns nonzero exit code if it isn't:
6161#spctl --assess --type execute $DEST/bin/pandoc
6262
63−echo Creating OSX package...
64−# remove old package first
65−rm -rf $BASE.pkg
63+echo Creating MacOS package...
6664
67−sed -e "s/PANDOCVERSION/$VERSION/" $OSX/distribution.xml.in > $OSX/distribution.xml
65+sed -e "s/PANDOCVERSION/$VERSION/" $MACOS/distribution.xml.in > $MACOS/distribution.xml
6866
6967pkgbuild --root $DIST/pandoc --identifier net.johnmacfarlane.pandoc --version 1.13 --ownership recommended $DIST/pandoc.pkg
70−productbuild --distribution $OSX/distribution.xml --resources $DIST/Resources --package-path $DIST --version $VERSION --sign "${DEVELOPER_ID_INSTALLER}" $BASE-osx.pkg
68+productbuild --distribution $MACOS/distribution.xml --resources $DIST/Resources --package-path $DIST --version $VERSION --sign "${DEVELOPER_ID_INSTALLER}" $BASE-MacOS.pkg
7169
7270# verify signature
73−spctl --assess --type install $BASE-osx.pkg
71+spctl --assess --type install $BASE-MacOS.pkg
7472
7573# cleanup
76−rm -r $DIST $OSX/pandoc $OSX/pandoc-citeproc
74+rm -r $DIST $MACOS/pandoc $MACOS/pandoc-citeproc
osx/stack.yaml → macos/stack.yamlrenamed

The content is the same.

osx/uninstall-pandoc.pl → macos/uninstall-pandoc.plrenamed

The content is the same.