Re: [O] ELPA/server.mk

[Jambunathan K]

I added the diff below to Makefile and did a 
  $ make elpa

Quick comments: It is far from OK.  
1. The bundle is a tar file not tar.gz file.
2. The lisp files should be right in the root not in lisp/ subdir.

Best way to test the ELPA tar is to do a
    M-x package-install-file RET org-*.tar.

and point in to the tar.

May be you should just reproduce my recipe from the mainline Makefile or
better still org-jambu.git.

diff --git a/Makefile b/Makefile
index a1902a1..6a33ece 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@
  include default.mk    # defaults, customizable via "local.mk"
 -include local.mk      # optional local customization, use default.mk as 
template
 
+include UTILITIES/server.mk
+
 # default target is "all" unless overridden in local.mk
 all::
 






> Jambunathan K writes:
>> If I am not mistaken, you are talking about release tar and not the ELPA
>> tar.  They are not the same.
>
> I know.
>
>> Run rgrep like so.
>>     (rgrep "pkg" "*.mk" "~/src/org-mode/" nil)
>>
>> and I see no references to 'org-pkg.el'.  (Note the `-pkg.el')
>
> It's not pushed to the orgmode repository yet.  Please have a look at
> the ELPA tar produced with the following patch (after including
> UTILITIES/server.mk from your local.mk):
>
>
> From 0bf94de6edfa99a1f47dedbb9ccbbde44417c259 Mon Sep 17 00:00:00 2001
> From: Achim Gratz <address@hidden>
> Date: Sun, 19 Aug 2012 12:04:58 +0200
> Subject: [PATCH] server.mk: implement ELPA
>
> * UTILITIES/server.mk: Add ELPA archive generation.
> ---
>  UTILITIES/server.mk | 47 ++++++++++++++++++++++++++++++++---------------
>  1 file changed, 32 insertions(+), 15 deletions(-)
>
> diff --git a/UTILITIES/server.mk b/UTILITIES/server.mk
> index 67f5155..a9ae010 100644
> --- a/UTILITIES/server.mk
> +++ b/UTILITIES/server.mk
> @@ -1,38 +1,55 @@
>  #----------------------------------------------------------------------
>  # This file is used for maintenance of org on the server.
>  #----------------------------------------------------------------------
> -.PHONY:      helpserver reltest rel-dirty warn
> +.PHONY:      helpserver release rel-dirty tagwarn
>  
>  help helpall helpserver::
>       $(info )
>       $(info Maintenance)
>       $(info ===========)
> -     $(info reltest               - clean up and create TAR/ZIP release 
> archives)
> +     $(info release               - clean up and create TAR/ZIP release 
> archives)
> +     $(info elpa                  - clean up and create ELPA TAR archive)
>  helpserver::
>       @echo ""
>  
>  #----------------------------------------------------------------------
>  
> -ORGDIR = org-$(GITVERSION)
> -ORGTAR = $(ORGDIR).tar.gz
> -ORGZIP = $(ORGDIR).zip
> -ORGDIST = README Makefile default.mk targets.mk request-assign-future.txt \
> -       lisp/ etc/ doc/ contrib/
> +ORGCOMM = README request-assign-future.txt lisp/ doc/
> +ORGFULL = $(ORGCOMM) Makefile default.mk targets.mk etc/ contrib/
> +ORGELPA = $(ORGCOMM) etc/styles/ org-pkg.el
>  
> -ORG_MAKE_DOC = info pdf card # do not make HTML documentation for release
> -
> -reltest:     cleanall doc autoloads rel-dirty
> +release:     ORG_MAKE_DOC=info pdf card # do not make HTML documentation
> +release:     cleanall doc autoloads rel-dirty
> +rel-dirty:   ORGRDIR=org-$(GITVERSION)
>  rel-dirty:
> +     address@hidden(RM) $(ORGRDIR) $(ORGRTAR) $(ORGRZIP)
> +     ln -s . $(ORGRDIR)
> +     tar -zcf $(ORGDIR).tar.gz $(foreach dist, $(ORGFULL), 
> $(ORGRDIR)/$(dist))
> +     zip -r9  $(ORGDIR).zip    $(foreach dist, $(ORGFULL), 
> $(ORGRDIR)/$(dist))
> +     address@hidden(RM) $(ORGRDIR)
> +     $(if $(filter-out $(ORGVERSION), $(GITVERSION)), \
> +         @$(MAKE) tagwarn)
> +     @echo ORGVERSION=$(ORGVERSION) GITVERSION=$(GITVERSION)
> +
> +PKG_TAG = $(shell date +%Y%m%d)
> +PKG_DOC = "Outline-based notes management and organizer"
> +PKG_REQ = "nil"
> +
> +elpa:                ORG_MAKE_DOC=info pdf card # do not make HTML 
> documentation
> +elpa:                cleanall doc autoloads elpa-dirty
> +elpa-dirty:  ORGDIR=org-$(PKG_TAG)
> +elpa-dirty:
>       address@hidden(RM) $(ORGDIR) $(ORGTAR) $(ORGZIP)
>       ln -s . $(ORGDIR)
> -     tar -zcf $(ORGTAR) $(foreach dist, $(ORGDIST), $(ORGDIR)/$(dist))
> -     zip -r9 $(ORGZIP) $(foreach dist, $(ORGDIST), $(ORGDIR)/$(dist))
> -     address@hidden(RM) $(ORGDIR)
> +     echo "(define-package \"org\" \"$(PKG_TAG)\" \"$(PKG_DOC)\" 
> $(PKG_REQ))" >org-pkg.el
> +     tar --exclude=Makefile  -zcf $(ORGDIR).tar.gz \
> +       $(foreach dist, $(ORGELPA), $(ORGDIR)/$(dist))
> +     address@hidden(RM) $(ORGDIR) org-pkg.el
>       $(if $(filter-out $(ORGVERSION), $(GITVERSION)), \
> -         @$(MAKE) warn)
> +         @$(MAKE) tagwarn)
>       @echo ORGVERSION=$(ORGVERSION) GITVERSION=$(GITVERSION)
>  
> -warn:
> +tagwarn:
>       $(info  ======================================================)
>       $(info  =                                                    =)
>       $(info  = A release should only be made from a revision that =)
> -- 
> 1.7.11.5
>
>
>
>
> Regards,
> Achim.

--