mirror of
https://github.com/jgm/pandoc.git
synced 2026-08-25 01:36:45 +00:00
Improvements to Mac OS X package build:
+ Add "pandoc" as bundle identifier to get rid of warning. + Remove old make_osx_pkg_dirs script, no longer needed because of make target. + Add OSX-Welcome, with information about adding /usr/local/bin to PATH. + Modify Makefile accordingly. git-svn-id: https://pandoc.googlecode.com/svn/trunk@51 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
+1
-1
@@ -5,7 +5,7 @@
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>@VERSION@, (c) 2006 John MacFarlane (released under GPL)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string></string>
|
||||
<string>pandoc</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>@VERSION@</string>
|
||||
<key>IFPkgFlagAllowBackRev</key>
|
||||
|
||||
@@ -166,7 +166,7 @@ uninstall: uninstall-program
|
||||
|
||||
.PHONY: osx-pkg
|
||||
osx_dest:=osx-pkg
|
||||
doc_more:=README.rtf LICENSE.rtf
|
||||
doc_more:=README.rtf LICENSE.rtf OSX-Welcome.rtf
|
||||
cleanup_files+=$(osx_dest) $(doc_more)
|
||||
osx-pkg: $(osx_dest)
|
||||
$(osx_dest): $(doc_more)
|
||||
@@ -180,6 +180,7 @@ $(osx_dest): $(doc_more)
|
||||
$(INSTALL) -d $(osx_dest)/Resources
|
||||
mv README.rtf $(osx_dest)/Resources/ReadMe.rtf
|
||||
mv LICENSE.rtf $(osx_dest)/Resources/License.rtf
|
||||
sed -e 's#@PREFIX@#$(PREFIX)#g' OSX-Welcome.rtf > $(osx_dest)/Resources/Welcome.rtf
|
||||
sed -e 's/@VERSION@/$(VERSION)/g' Info.plist > $(osx_dest)/Info.plist
|
||||
cp Description.plist $(osx_dest)/
|
||||
PackageMaker -build -p Pandoc_$(VERSION).pkg -f $(osx_dest)/Package_root -r $(osx_dest)/Resources -i $(osx_dest)/Info.plist -d $(osx_dest)/Description.plist
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
Pandoc will be installed into your `@PREFIX@` directory. In order
|
||||
to use `pandoc` and the associated wrapper scripts, you must have
|
||||
`/usr/local/bin` in your `PATH.` To add `/usr/local/bin` to your
|
||||
default path, add these lines to the end of `.profile` in your home
|
||||
directory and open a new terminal window:
|
||||
|
||||
export PATH=/usr/local/bin:$PATH
|
||||
export MANPATH=/usr/local/man:$MANPATH
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
#!/bin/sh -e
|
||||
# make directories for a Mac OSX package
|
||||
|
||||
# WARNING: This isn't finished. Don't use it yet!
|
||||
# Need to fix permissions & ownerships. See
|
||||
# http://s.sudre.free.fr/Stuff/PackageMaker_Howto.html
|
||||
# Also, think about where to put these files. I'm not sure /usr/local/bin
|
||||
# is in the path by default in OSX.
|
||||
|
||||
PANDOC="pandoc"
|
||||
EXECUTABLES="pandoc markdown2html html2markdown markdown2latex latex2markdown markdown2pdf"
|
||||
DOCS="README README.html BUGS TODO"
|
||||
MAN_PAGES=$(echo "$EXECUTABLES" | sed -e 's#\([^ ]*\)#man/man1/\1\.1#g')
|
||||
|
||||
make # make sure the executables have been built
|
||||
make README.html
|
||||
make test
|
||||
|
||||
rm -rf osx-pkg # remove old package directories
|
||||
mkdir osx-pkg
|
||||
mkdir osx-pkg/Resources
|
||||
mkdir osx-pkg/Package_Root
|
||||
mkdir osx-pkg/Package_Root/usr
|
||||
mkdir osx-pkg/Package_Root/usr/local
|
||||
mkdir osx-pkg/Package_Root/usr/local/bin
|
||||
mkdir osx-pkg/Package_Root/usr/local/share
|
||||
mkdir osx-pkg/Package_Root/usr/local/share/doc
|
||||
mkdir osx-pkg/Package_Root/usr/local/share/doc/pandoc
|
||||
mkdir osx-pkg/Package_Root/usr/local/man
|
||||
mkdir osx-pkg/Package_Root/usr/local/man/man1
|
||||
$PANDOC -s -w rtf README > osx-pkg/Resources/ReadMe.rtf
|
||||
$PANDOC -s -w rtf LICENSE > osx-pkg/Resources/License.rtf
|
||||
chmod +x $EXECUTABLES
|
||||
cp $EXECUTABLES osx-pkg/Package_Root/usr/local/bin/
|
||||
cp $DOCS osx-pkg/Package_Root/usr/local/share/doc/pandoc/
|
||||
cp $MAN_PAGES osx-pkg/Package_Root/usr/local/man/man1/
|
||||
|
||||
echo
|
||||
echo "You may now run PackageMaker.app. For Root, specify"
|
||||
echo "osx-pkg/Package_Root. The ReadMe.rtf and License.rtf files"
|
||||
echo "can be found in osx-pkg/Resources."
|
||||
echo
|
||||
|
||||
Reference in New Issue
Block a user