ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' of orgmode.org:org-mode into maint

This commit is contained in:
Bastien Guerry 2012-09-27 23:50:02 +02:00
parent b0c5030c85 418ec0f5e7
commit 92c8cd487d
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mk/server.mk
View File

@ -65,17 +65,19 @@ elpa-dirty:
@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpa version autoloads @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpa version autoloads
-@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP) -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
ln -s . $(ORGDIR) ln -s . $(ORGDIR)
echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \ echo "(define-package \"org\"" > org-pkg.el
> org-pkg.el echo " \"$(PKG_TAG)\" \"$(PKG_DOC)\" ($(PKG_REQ)))" >> org-pkg.el
tar --exclude=Makefile --exclude="org-colview-xemacs.el" --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ echo ";; no-byte-compile: t" >> org-pkg.el
tar --exclude=Makefile --exclude="org-colview-xemacs.el" \
--transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
$(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist)) $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
-@$(RM) $(ORGDIR) org-pkg.el -@$(RM) $(ORGDIR) org-pkg.el
elpa-up: info card elpa-dirty archive-contents elpa-up: info card elpa-dirty archive-contents
$(CP) archive-contents $(ORGDIR).tar $(SERVROOT)/pkg/daily/ $(CP) archive-contents $(ORGDIR).tar $(SERVROOT)/pkg/daily/
archive-contents: archive-contents:
echo "(1 (org . [($(PKG_TAG)) nil \"$(PKG_DOC)\"])\n" > $@ \ echo "(1 (org . [($(PKG_TAG)) ($(PKG_REQ)) \"$(PKG_DOC)\" tar])" > $@
" (org-plus-contrib . [($(PKG_TAG)) nil \"$(PKG_DOC)\"]))" >> $@ echo " (org-plus-contrib . [($(PKG_TAG)) ($(PKG_REQ)) \"$(PKG_DOC)\" tar]))" >> $@
elpaplus: cleanall info card elpaplus-dirty elpaplus: cleanall info card elpaplus-dirty
elpaplus-dirty elpaplus-up: ORG_ADD_CONTRIB=org-* elpaplus-dirty elpaplus-up: ORG_ADD_CONTRIB=org-*
@ -84,9 +86,11 @@ elpaplus-dirty:
@$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpaplus version autoloads @$(MAKE) GITVERSION=$(GITVERSION:release_%=%)-elpaplus version autoloads
-@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP) -@$(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
ln -s . $(ORGDIR) ln -s . $(ORGDIR)
echo "(define-package \"org-plus-contrib\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" $(PKG_REQ))" \ echo "(define-package \"org-plus-contrib\"" > org-plus-contrib-pkg.el
> org-plus-contrib-pkg.el echo " \"$(PKG_TAG)\" \"$(PKG_DOC)\" ($(PKG_REQ)))" >> org-plus-contrib-pkg.el
tar --exclude=Makefile --exclude="org-colview-xemacs.el" --transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \ echo ";; no-byte-compile: t" >> org-plus-contrib-pkg.el
tar --exclude=Makefile --exclude="org-colview-xemacs.el" \
--transform='s:\(lisp\|doc\)/::' -cf $(ORGDIR).tar \
$(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist)) $(foreach dist, $(ORGELPAPLUS), $(ORGDIR)/$(dist))
-@$(RM) $(ORGDIR) org-plus-contrib-pkg.el -@$(RM) $(ORGDIR) org-plus-contrib-pkg.el
@$(MAKE) cleanlisp @$(MAKE) cleanlisp