git.iko.soy/typeable/pandoc
on master help sign in
Changes related to osx packaging:
309a150fiddlosopher
Makefile+7−13
compare with master
unifiedsplit
@@ -164,14 +164,13 @@ uninstall-all: uninstall-exec uninstall-doc uninstall-lib-doc
164install: install-program
164install: install-program
165uninstall: uninstall-program
165uninstall: uninstall-program
166
166
167−.PHONY: osx-pkg osx-pkg-prep
168osx_dest:=osx-pkg-tmp
167osx_dest:=osx-pkg-tmp
169osx_src:=osx
168osx_src:=osx
170doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
169doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
171osx_pkg_name:=Pandoc_$(VERSION).pkg
170osx_pkg_name:=Pandoc_$(VERSION).pkg
172cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name)
171cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name)
173osx-pkg-prep: $(osx_dest)
172osx-pkg-prep: $(osx_dest)
174−$(osx_dest): $(doc_more) $(BINS)
173+$(osx_dest)/: $(doc_more) $(BINS)
175 -rm -rf $(osx_dest)
174 -rm -rf $(osx_dest)
176 $(INSTALL) -d $(osx_dest)
175 $(INSTALL) -d $(osx_dest)
177 DESTDIR=$(osx_dest)/Package_root $(MAKE) install-program
176 DESTDIR=$(osx_dest)/Package_root $(MAKE) install-program
@@ -179,8 +178,8 @@ $(osx_dest): $(doc_more) $(BINS)
179 find $(osx_dest) -type f -regex ".*bin/.*" | xargs chmod +x
178 find $(osx_dest) -type f -regex ".*bin/.*" | xargs chmod +x
180 find $(osx_dest) -type f -regex ".*bin/$(THIS)" | xargs $(STRIP)
179 find $(osx_dest) -type f -regex ".*bin/$(THIS)" | xargs $(STRIP)
181 $(INSTALL) -d $(osx_dest)/Resources
180 $(INSTALL) -d $(osx_dest)/Resources
182− mv README.rtf $(osx_dest)/Resources/ReadMe.rtf
181+ cp README.rtf $(osx_dest)/Resources/ReadMe.rtf
183− mv LICENSE.rtf $(osx_dest)/Resources/License.rtf
182+ cp LICENSE.rtf $(osx_dest)/Resources/License.rtf
184 sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome.rtf > $(osx_dest)/Resources/Welcome.rtf
183 sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome.rtf > $(osx_dest)/Resources/Welcome.rtf
185 sed -e 's/@VERSION@/$(VERSION)/g' $(osx_src)/Info.plist > $(osx_dest)/Info.plist
184 sed -e 's/@VERSION@/$(VERSION)/g' $(osx_src)/Info.plist > $(osx_dest)/Info.plist
186 cp $(osx_src)/Description.plist $(osx_dest)/
185 cp $(osx_src)/Description.plist $(osx_dest)/
@@ -189,19 +188,20 @@ osx-pkg: osx-pkg-prep
189 echo "Root permissions needed to create OSX package!"; \
188 echo "Root permissions needed to create OSX package!"; \
190 exit 1; \
189 exit 1; \
191 fi
190 fi
192− find $(osx_dest) -type f | xargs chown root:wheel
191+ find $(osx_dest) | xargs chown root:wheel
193 PackageMaker -build -p $(osx_pkg_name) \
192 PackageMaker -build -p $(osx_pkg_name) \
194 -f $(osx_dest)/Package_root \
193 -f $(osx_dest)/Package_root \
195 -r $(osx_dest)/Resources \
194 -r $(osx_dest)/Resources \
196 -i $(osx_dest)/Info.plist \
195 -i $(osx_dest)/Info.plist \
197 -d $(osx_dest)/Description.plist
196 -d $(osx_dest)/Description.plist
197+ chgrp admin $(osx_pkg_name)
198 -rm -rf $(osx_dest)
198 -rm -rf $(osx_dest)
199
199
200−.PHONY: osx-dmg osx-dmg-prep
200+.PHONY: osx-dmg
201osx_dmg_name:=Pandoc.dmg
201osx_dmg_name:=Pandoc.dmg
202osx_dmg_volume:="Pandoc $(VERSION)"
202osx_dmg_volume:="Pandoc $(VERSION)"
203cleanup_files+=$(osx_dmg_name)
203cleanup_files+=$(osx_dmg_name)
204−osx-dmg-prep: $(osx_pkg_name)
204+osx-dmg: $(osx_pkg_name)
205 -rm -f $(osx_dmg_name)
205 -rm -f $(osx_dmg_name)
206 hdiutil create $(osx_dmg_name) -size 05m -fs HFS+ -volname $(osx_dmg_volume)
206 hdiutil create $(osx_dmg_name) -size 05m -fs HFS+ -volname $(osx_dmg_volume)
207 dev_handle=`hdid $(osx_dmg_name) | grep Apple_HFS | \
207 dev_handle=`hdid $(osx_dmg_name) | grep Apple_HFS | \
@@ -211,12 +211,6 @@ osx-dmg-prep: $(osx_pkg_name)
211 hdiutil convert $(osx_dmg_name) -format UDZO -o Pandoc.udzo.dmg
211 hdiutil convert $(osx_dmg_name) -format UDZO -o Pandoc.udzo.dmg
212 -rm -f $(osx_dmg_name)
212 -rm -f $(osx_dmg_name)
213 mv Pandoc.udzo.dmg $(osx_dmg_name)
213 mv Pandoc.udzo.dmg $(osx_dmg_name)
214−osx-dmg: osx-dmg-prep
215− if [ "`id -u`" != 0 ]; then \
216− echo "Root permissions needed to create OSX disk image!"; \
217− exit 1; \
218− fi
219− chown root:wheel $(osx_dmg_name)
220
214
221.PHONY: test test-markdown
215.PHONY: test test-markdown
222test: $(BINS)
216test: $(BINS)
cabalize+1−1
@@ -30,7 +30,7 @@ BUILD_DEPENDS=$(echo $BUILD_DEPENDS | sed -e 's# #, #g')
30
30
31# Handle 'Hs-Source-Dir' option name which was deprecated in Cabal > 1.1.3.
31# Handle 'Hs-Source-Dir' option name which was deprecated in Cabal > 1.1.3.
32HS_SOURCE_DIRS='Hs-Source-Dirs'
32HS_SOURCE_DIRS='Hs-Source-Dirs'
33−cabal_version=$(ghc-pkg -l | sed -ne 's/.*\<[Cc]abal-\([^,]*\).*/\1/p')
33+cabal_version=$(ghc-pkg -l | sed -ne 's/.*[Cc]abal-\([^,]*\).*/\1/p')
34if printf "$cabal_version\n1.1.3" | sort | tail -n 1 | grep -q '1\.1\.3'; then
34if printf "$cabal_version\n1.1.3" | sort | tail -n 1 | grep -q '1\.1\.3'; then
35 HS_SOURCE_DIRS='Hs-Source-Dir'
35 HS_SOURCE_DIRS='Hs-Source-Dir'
36fi
36fi
osx/Welcome+2−2
@@ -4,8 +4,8 @@ to use `pandoc` and the associated wrapper scripts, you must have
4default path, add these lines to the end of `.profile` in your home
4default path, add these lines to the end of `.profile` in your home
5directory and open a new terminal window:
5directory and open a new terminal window:
6
6
7− export PATH=/usr/local/bin:$PATH
7+ export PATH=$PATH:/usr/local/bin
8− export MANPATH=/usr/local/man:$MANPATH
8+ export MANPATH=$MANPATH:/usr/local/share/man
9
9
10To uninstall Pandoc at any time, use the following command:
10To uninstall Pandoc at any time, use the following command:
11
11
osx/uninstall-pandoc+2−1
@@ -3,7 +3,8 @@
3# everything installed by the Pandoc Mac OS X installer.
3# everything installed by the Pandoc Mac OS X installer.
4
4
5if [ "`id -u`" != 0 ]; then \
5if [ "`id -u`" != 0 ]; then \
6− echo "This script must be run with sudo."; \
6+ echo "This script must be run with root privileges:"; \
7+ echo "sudo /usr/local/bin/uninstall-pandoc"; \
7 exit 1; \
8 exit 1; \
8fi
9fi
9
10