git.iko.soy/typeable/pandoc
on master help sign in
Improved osx-dmg and osx-pkg targets in Makefile.
c8bac7efiddlosopher
Makefile+29−11
compare with master
unifiedsplit
@@ -166,10 +166,12 @@ uninstall: uninstall-program
166
166
167.PHONY: osx-pkg
167.PHONY: osx-pkg
168osx_dest:=osx-pkg
168osx_dest:=osx-pkg
169+osx_src:=osx
169−doc_more:=README.rtf LICENSE.rtf OSX-Welcome.rtf
170+doc_more:=README.rtf LICENSE.rtf $(osx_src)/Welcome.rtf
171+osx_pkg_name:=Pandoc_$(VERSION).pkg
170−cleanup_files+=$(osx_dest) $(doc_more)
172+cleanup_files+=$(osx_dest) $(doc_more) $(osx_pkg_name)
171osx-pkg: $(osx_dest)
173osx-pkg: $(osx_dest)
172−$(osx_dest): $(doc_more)
174+$(osx_dest): $(doc_more) $(BINS)
173 -rm -rf $(osx_dest)
175 -rm -rf $(osx_dest)
174 $(INSTALL) -d $(osx_dest)
176 $(INSTALL) -d $(osx_dest)
175 DESTDIR=$(osx_dest)/Package_root $(MAKE) install-program
177 DESTDIR=$(osx_dest)/Package_root $(MAKE) install-program
@@ -179,14 +181,30 @@ $(osx_dest): $(doc_more)
179 $(INSTALL) -d $(osx_dest)/Resources
181 $(INSTALL) -d $(osx_dest)/Resources
180 mv README.rtf $(osx_dest)/Resources/ReadMe.rtf
182 mv README.rtf $(osx_dest)/Resources/ReadMe.rtf
181 mv LICENSE.rtf $(osx_dest)/Resources/License.rtf
183 mv LICENSE.rtf $(osx_dest)/Resources/License.rtf
182− sed -e 's#@PREFIX@#$(PREFIX)#g' OSX-Welcome.rtf > $(osx_dest)/Resources/Welcome.rtf
184+ sed -e 's#@PREFIX@#$(PREFIX)#g' $(osx_src)/Welcome.rtf > $(osx_dest)/Resources/Welcome.rtf
183− sed -e 's/@VERSION@/$(VERSION)/g' Info.plist > $(osx_dest)/Info.plist
185+ sed -e 's/@VERSION@/$(VERSION)/g' $(osx_src)/Info.plist > $(osx_dest)/Info.plist
184− cp Description.plist $(osx_dest)/
186+ cp $(osx_src)/Description.plist $(osx_dest)/
185− PackageMaker -build -p Pandoc_$(VERSION).pkg \
187+ PackageMaker -build -p $(osx_pkg_name) \
186− -f $(osx_dest)/Package_root \
188+ -f $(osx_dest)/Package_root \
187− -r $(osx_dest)/Resources \
189+ -r $(osx_dest)/Resources \
188− -i $(osx_dest)/Info.plist \
190+ -i $(osx_dest)/Info.plist \
189− -d $(osx_dest)/Description.plist
191+ -d $(osx_dest)/Description.plist
192+
193+.PHONY: osx-dmg
194+osx_dmg_name:=Pandoc.dmg
195+osx_dmg_volume:="Pandoc $(VERSION)"
196+cleanup_files+=$(osx_dmg_name)
197+osx-dmg: osx-pkg
198+ -rm -f $(osx_dmg_name)
199+ hdiutil create $(osx_dmg_name) -size 05m -fs HFS+ -volname $(osx_dmg_volume)
200+ dev_handle=`hdid $(osx_dmg_name) | grep Apple_HFS | perl -e '\$$_=<>; /^\\/dev\\/(disk.)/; print \$$1'`;\
201+ ditto $(osx_pkg_name) /Volumes/$(osx_dmg_volume)/$(osx_pkg_name);\
202+ hdiutil detach $$dev_handle
203+ hdiutil convert $(osx_dmg_name) -format UDZO -o Pandoc.udzo.dmg
204+ rm -f $(osx_dmg_name)
205+ mv Pandoc.udzo.dmg $(osx_dmg_name)
206+ chown root $(osx_dmg_name)
207+ chgrp wheel $(osx_dmg_name)
190
208
191.PHONY: test test-markdown
209.PHONY: test test-markdown
192test: $(BINS)
210test: $(BINS)
TODO+3−5
@@ -8,6 +8,9 @@
8> * Revised RTF writer:
8> * Revised RTF writer:
9> + made default font Helvetica
9> + made default font Helvetica
10> + added \f0 to each \pard, so that font resizing works correctly
10> + added \f0 to each \pard, so that font resizing works correctly
11+> * Fixed handling of dashes in LaTeX writer
12+> * Added iconv to output in wrappers
13+> * Added osx-pkg and osx-dmg targets to Makefile
11>
14>
12> [ Recai Oktaş ]
15> [ Recai Oktaş ]
13> * Created proper debian package
16> * Created proper debian package
@@ -18,12 +21,7 @@
18>
21>
19> -- Recai Oktaş <roktas@debian.org> Tue, 24 Oct 2006 07:48:30 +0300
22> -- Recai Oktaş <roktas@debian.org> Tue, 24 Oct 2006 07:48:30 +0300
20
23
21−- make a proper man page for pandoc, with documentation of all options
22- uninstall script in Mac package; add information about it to Welcome?
24- uninstall script in Mac package; add information about it to Welcome?
23−- create a compressed disk image containing Mac pkg
24−- website target
25−- put web templates and osx stuff in separate directories
26- look into warnings on pdflatex concerning ucs packages
25- look into warnings on pdflatex concerning ucs packages
27- change all versions to 0.3
26- change all versions to 0.3
28−- iconv on both input and output in wrappers
29
27