git.iko.soy/typeable/pandoc
on master help sign in
Improvements to Mac OS X package build:
2d128f7fiddlosopher
Info.plist+1−1
@@ -5,7 +5,7 @@
5 <key>CFBundleGetInfoString</key>
5 <key>CFBundleGetInfoString</key>
6 <string>@VERSION@, (c) 2006 John MacFarlane (released under GPL)</string>
6 <string>@VERSION@, (c) 2006 John MacFarlane (released under GPL)</string>
7 <key>CFBundleIdentifier</key>
7 <key>CFBundleIdentifier</key>
8− <string></string>
8+ <string>pandoc</string>
9 <key>CFBundleShortVersionString</key>
9 <key>CFBundleShortVersionString</key>
10 <string>@VERSION@</string>
10 <string>@VERSION@</string>
11 <key>IFPkgFlagAllowBackRev</key>
11 <key>IFPkgFlagAllowBackRev</key>
Makefile+2−1
@@ -166,7 +166,7 @@ uninstall: uninstall-program
166
166
167.PHONY: osx-pkg
167.PHONY: osx-pkg
168osx_dest:=osx-pkg
168osx_dest:=osx-pkg
169−doc_more:=README.rtf LICENSE.rtf
169+doc_more:=README.rtf LICENSE.rtf OSX-Welcome.rtf
170cleanup_files+=$(osx_dest) $(doc_more)
170cleanup_files+=$(osx_dest) $(doc_more)
171osx-pkg: $(osx_dest)
171osx-pkg: $(osx_dest)
172$(osx_dest): $(doc_more)
172$(osx_dest): $(doc_more)
@@ -180,6 +180,7 @@ $(osx_dest): $(doc_more)
180 $(INSTALL) -d $(osx_dest)/Resources
180 $(INSTALL) -d $(osx_dest)/Resources
181 mv README.rtf $(osx_dest)/Resources/ReadMe.rtf
181 mv README.rtf $(osx_dest)/Resources/ReadMe.rtf
182 mv LICENSE.rtf $(osx_dest)/Resources/License.rtf
182 mv LICENSE.rtf $(osx_dest)/Resources/License.rtf
183+ sed -e 's#@PREFIX@#$(PREFIX)#g' OSX-Welcome.rtf > $(osx_dest)/Resources/Welcome.rtf
183 sed -e 's/@VERSION@/$(VERSION)/g' Info.plist > $(osx_dest)/Info.plist
184 sed -e 's/@VERSION@/$(VERSION)/g' Info.plist > $(osx_dest)/Info.plist
184 cp Description.plist $(osx_dest)/
185 cp Description.plist $(osx_dest)/
185 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
186 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
OSX-Welcomenew file+9
@@ -0,0 +1,9 @@
1+Pandoc will be installed into your `@PREFIX@` directory. In order
2+to use `pandoc` and the associated wrapper scripts, you must have
3+`/usr/local/bin` in your `PATH.` To add `/usr/local/bin` to your
4+default path, add these lines to the end of `.profile` in your home
5+directory and open a new terminal window:
6+
7+ export PATH=/usr/local/bin:$PATH
8+ export MANPATH=/usr/local/man:$MANPATH
9+
make_osx_pkg_dirsdeleted−43
@@ -1,43 +0,0 @@
1−#!/bin/sh -e
2−# make directories for a Mac OSX package
3−
4−# WARNING: This isn't finished. Don't use it yet!
5−# Need to fix permissions & ownerships. See
6−# http://s.sudre.free.fr/Stuff/PackageMaker_Howto.html
7−# Also, think about where to put these files. I'm not sure /usr/local/bin
8−# is in the path by default in OSX.
9−
10−PANDOC="pandoc"
11−EXECUTABLES="pandoc markdown2html html2markdown markdown2latex latex2markdown markdown2pdf"
12−DOCS="README README.html BUGS TODO"
13−MAN_PAGES=$(echo "$EXECUTABLES" | sed -e 's#\([^ ]*\)#man/man1/\1\.1#g')
14−
15−make # make sure the executables have been built
16−make README.html
17−make test
18−
19−rm -rf osx-pkg # remove old package directories
20−mkdir osx-pkg
21−mkdir osx-pkg/Resources
22−mkdir osx-pkg/Package_Root
23−mkdir osx-pkg/Package_Root/usr
24−mkdir osx-pkg/Package_Root/usr/local
25−mkdir osx-pkg/Package_Root/usr/local/bin
26−mkdir osx-pkg/Package_Root/usr/local/share
27−mkdir osx-pkg/Package_Root/usr/local/share/doc
28−mkdir osx-pkg/Package_Root/usr/local/share/doc/pandoc
29−mkdir osx-pkg/Package_Root/usr/local/man
30−mkdir osx-pkg/Package_Root/usr/local/man/man1
31−$PANDOC -s -w rtf README > osx-pkg/Resources/ReadMe.rtf
32−$PANDOC -s -w rtf LICENSE > osx-pkg/Resources/License.rtf
33−chmod +x $EXECUTABLES
34−cp $EXECUTABLES osx-pkg/Package_Root/usr/local/bin/
35−cp $DOCS osx-pkg/Package_Root/usr/local/share/doc/pandoc/
36−cp $MAN_PAGES osx-pkg/Package_Root/usr/local/man/man1/
37−
38−echo
39−echo "You may now run PackageMaker.app. For Root, specify"
40−echo "osx-pkg/Package_Root. The ReadMe.rtf and License.rtf files"
41−echo "can be found in osx-pkg/Resources."
42−echo
43−