diff options
| -rw-r--r-- | INSTALL.md | 4 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | RELEASE-CHECKLIST | 2 | ||||
| -rw-r--r-- | macos/distribution.xml.in (renamed from osx/distribution.xml.in) | 0 | ||||
| -rwxr-xr-x | macos/make_macos_package.sh (renamed from osx/make_osx_package.sh) | 26 | ||||
| -rw-r--r-- | macos/stack.yaml (renamed from osx/stack.yaml) | 0 | ||||
| -rwxr-xr-x | macos/uninstall-pandoc.pl (renamed from osx/uninstall-pandoc.pl) | 0 |
7 files changed, 18 insertions, 20 deletions
diff --git a/INSTALL.md b/INSTALL.md index 631641307..192ae841d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -19,7 +19,7 @@ copy /y "%TEMP%\pandoc\pandoc-citeproc.exe" C:\Utils\Console\ rmdir /s /q "%TEMP%\pandoc\" -## Mac OS X +## MacOS - There is a package installer at pandoc's [download page]. If you later want to uninstall the package, you can do so @@ -27,7 +27,7 @@ and running it with `perl uninstall-pandoc.pl`. - It is possible to extract the pandoc and pandoc-citeproc - executables from the osx pkg file, if you'd rather not run + executables from the MacOS pkg file, if you'd rather not run the installer. To do this (for the version 1.19.1 package): mkdir pandoc-extract @@ -27,8 +27,8 @@ dist: man/pandoc.1 debpkg: man/pandoc.1 make -C deb -osxpkg: man/pandoc.1 - ./osx/make_osx_package.sh +macospkg: man/pandoc.1 + ./macos/make_macos_package.sh winpkg: pandoc-$(version)-windows.msi @@ -52,4 +52,4 @@ download_stats: clean: stack clean -.PHONY: deps quick full install clean test bench changes_github osxpkg dist prof download_stats +.PHONY: deps quick full install clean test bench changes_github macospkg dist prof download_stats diff --git a/RELEASE-CHECKLIST b/RELEASE-CHECKLIST index ff9d56071..2882965e1 100644 --- a/RELEASE-CHECKLIST +++ b/RELEASE-CHECKLIST @@ -11,7 +11,7 @@ _ Tag templates _ Generate Windows package (make winpkg) -_ Generate Mac OSX package (make osxpkg) +_ Generate MacOS package (make macospkg) _ Generate Ubuntu/Debian deb package (make debpkg) diff --git a/osx/distribution.xml.in b/macos/distribution.xml.in index 145fc0f21..145fc0f21 100644 --- a/osx/distribution.xml.in +++ b/macos/distribution.xml.in diff --git a/osx/make_osx_package.sh b/macos/make_macos_package.sh index 200702a0a..d2c4d205b 100755 --- a/osx/make_osx_package.sh +++ b/macos/make_macos_package.sh @@ -1,13 +1,13 @@ #!/bin/bash -e LOCALBIN=$HOME/.local/bin -DIST=`pwd`/osx_package -OSX=`pwd`/osx +DIST=`pwd`/macos_package +MACOS=`pwd`/macos VERSION=$(grep -e '^Version' pandoc.cabal | awk '{print $2}') RESOURCES=$DIST/Resources ROOT=$DIST/pandoc DEST=$ROOT/usr/local -SCRIPTS=$OSX/osx-resources +SCRIPTS=$MACOS/macos-resources BASE=pandoc-$VERSION ME=$(whoami) PACKAGEMAKER=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker @@ -16,7 +16,7 @@ DEVELOPER_ID_INSTALLER=${DEVELOPER_ID_INSTALLER:-Developer ID Installer: John Ma # We need this for hsb2hs: PATH=$LOCALBIN:$PATH -export MACOSX_DEPLOYMENT_TARGET=10.7 +export MACMACOS_DEPLOYMENT_TARGET=10.7 # echo Removing old files... rm -rf $DIST @@ -27,7 +27,7 @@ which hsb2hs || stack install hsb2hs echo Building pandoc... stack clean -stack install --stack-yaml=$OSX/stack.yaml --local-bin-path . pandoc pandoc-citeproc +stack install --stack-yaml=$MACOS/stack.yaml --local-bin-path . pandoc pandoc-citeproc echo Getting man pages... make man/pandoc.1 @@ -41,7 +41,7 @@ PANDOC_CITEPROC_PATH=$DIST/pandoc-citeproc-${PANDOC_CITEPROC_VERSION} mkdir -p $DEST/bin mkdir -p $DEST/share/man/man1 for f in pandoc pandoc-citeproc; do - cp $OSX/$f $DEST/bin/; + cp $MACOS/$f $DEST/bin/; done cp $PANDOC_CITEPROC_PATH/man/man1/pandoc-citeproc.1 $DEST/share/man/man1/ cp man/pandoc.1 $DEST/share/man/man1/ @@ -49,7 +49,7 @@ cp man/pandoc.1 $DEST/share/man/man1/ chown -R $ME:staff $DIST echo Copying license... -$OSX/pandoc --data data -t html5 -s COPYING.md -o $RESOURCES/license.html +$MACOS/pandoc --data data -t html5 -s COPYING.md -o $RESOURCES/license.html # Removing executable signing because of a problem that arose in El Capitan # "source=obsolete resource envelope" @@ -60,17 +60,15 @@ $OSX/pandoc --data data -t html5 -s COPYING.md -o $RESOURCES/license.html # make sure it's valid... returns nonzero exit code if it isn't: #spctl --assess --type execute $DEST/bin/pandoc -echo Creating OSX package... -# remove old package first -rm -rf $BASE.pkg +echo Creating MacOS package... -sed -e "s/PANDOCVERSION/$VERSION/" $OSX/distribution.xml.in > $OSX/distribution.xml +sed -e "s/PANDOCVERSION/$VERSION/" $MACOS/distribution.xml.in > $MACOS/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 +productbuild --distribution $MACOS/distribution.xml --resources $DIST/Resources --package-path $DIST --version $VERSION --sign "${DEVELOPER_ID_INSTALLER}" $BASE-MacOS.pkg # verify signature -spctl --assess --type install $BASE-osx.pkg +spctl --assess --type install $BASE-MacOS.pkg # cleanup -rm -r $DIST $OSX/pandoc $OSX/pandoc-citeproc +rm -r $DIST $MACOS/pandoc $MACOS/pandoc-citeproc diff --git a/osx/stack.yaml b/macos/stack.yaml index c2062eff8..c2062eff8 100644 --- a/osx/stack.yaml +++ b/macos/stack.yaml diff --git a/osx/uninstall-pandoc.pl b/macos/uninstall-pandoc.pl index a5194d9bd..a5194d9bd 100755 --- a/osx/uninstall-pandoc.pl +++ b/macos/uninstall-pandoc.pl |