[AUCTeX-diffs] GNU AUCTeX branch, master, updated. daa8a253e36359017eaf213069754edfe7a3eb49

[Mosè Giordano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  daa8a253e36359017eaf213069754edfe7a3eb49 (commit)
      from  29724a5cf1bb7b59683c604c4c88942b13075c19 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit daa8a253e36359017eaf213069754edfe7a3eb49
Author: Mosè Giordano <address@hidden>
Date:   Sat Nov 15 18:14:41 2014 +0100

    Update windows-package Make rule to new Emacs 24.4 package.
    
    * Makefile.in (WEMACSPACKAGE, WEMACSEXTRACTDIR): New variables.
    (windows-package): Adapt rule to new Emacs 24.4 package for
    Windows.  Use `WEMACSPACKAGE' and `WEMACSEXTRACTDIR'.

diff --git a/ChangeLog b/ChangeLog
index dea4851..e36b51c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-15  Mosè Giordano  <address@hidden>
+
+       * Makefile.in (WEMACSPACKAGE, WEMACSEXTRACTDIR): New variables.
+       (windows-package): Adapt rule to new Emacs 24.4 package for
+       Windows.  Use `WEMACSPACKAGE' and `WEMACSEXTRACTDIR'.
+
 2014-11-15  Davide G. M. Salvetti  <address@hidden>
 
         * Makefile.in (STYLESRC): Add `ifluatex.el', `luatextra.el'.
diff --git a/Makefile.in b/Makefile.in
index 5eba457..4747d32 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -439,6 +439,18 @@ WPACKAGE=auctex-$(TAG)-e$(WEMACSVER)-msw.zip
 WPACKAGEFILES=site-lisp/auctex site-lisp/site-start.d site-lisp/site-start.el \
        site-lisp/tex-site.el var/auctex doc info/dir info/auctex.info* \
        info/preview-latex.info*
+# Starting from Emacs 24.4, the name of the Windows package has been changed.
+# The following variable set the name of the package depending on the selected
+# Emacs version.
+WEMACSPACKAGE=$(shell if echo "$(WEMACSVER)" | grep -q 
'\(2[2-3].[1-4]\|24.[1-3]\)' -; \
+       then echo "emacs-$(WEMACSVER)-bin-i386.zip"; \
+       else echo "emacs-$(WEMACSVER)-bin-i686-pc-mingw32.zip"; fi)
+# They also changed the tree structure of the package, there is no more a top
+# level directory.  The following variable set the directory to which extract
+# the files.
+WEMACSEXTRACTDIR=$(shell if echo "$(WEMACSVER)" | grep -q 
'\(2[2-3].[1-4]\|24.[1-3]\)' -; \
+       then echo ""; \
+       else echo "emacs-$(WEMACSVER)"; fi)
 windows-package: check-tag
        @if [ "X$(WEMACSVER)" = "X" ]; then \
          echo "*** Error: No Emacs version (WEMACSVER) ***"; \
@@ -446,9 +458,9 @@ windows-package: check-tag
        fi
 # Make sure the prerequisites are available
        test -d $(WBUILDDIR) || mkdir $(WBUILDDIR)
-       test -f $(WBUILDDIR)/emacs-$(WEMACSVER)-bin-i386.zip \
+       test -f $(WBUILDDIR)/$(WEMACSPACKAGE) \
        || { cd $(WBUILDDIR) \
-       && wget 
http://ftp.gnu.org/gnu/emacs/windows/emacs-$(WEMACSVER)-bin-i386.zip; }
+       && wget http://ftp.gnu.org/gnu/emacs/windows/$(WEMACSPACKAGE); }
        test -f $(WBUILDDIR)/auctex-$(TAG).zip \
        || { test -f $(FTPDIR)/auctex-$(TAG).zip \
          && $(CP) $(FTPDIR)/auctex-$(TAG).zip $(WBUILDDIR); } \
@@ -458,11 +470,14 @@ windows-package: check-tag
        cd $(WBUILDDIR) \
        && rm -rf emacs-$(WEMACSVER) \
        && rm -rf auctex-$(TAG) \
-       && unzip emacs-$(WEMACSVER)-bin-i386.zip \
+       && unzip -d "$(WEMACSEXTRACTDIR)" $(WEMACSPACKAGE) \
        && unzip auctex-$(TAG).zip
        rm -f $(WPACKAGE)
-# Create site-start.el and site-start.d
-       cd $(WBUILDDIR)/emacs-$(WEMACSVER)/site-lisp \
+# Create the site-lisp subdirectory if needed (starting from Emacs 24.4 it is 
no
+# more present in the Windows package) and then create site-start.el and
+# site-start.d
+       mkdir -p $(WBUILDDIR)/emacs-$(WEMACSVER)/site-lisp \
+       && cd $(WBUILDDIR)/emacs-$(WEMACSVER)/site-lisp \
        && echo -e ";; Load files in \`site-start.d' directory.\
 \n(dolist (file (directory-files\
 \n            (concat (file-name-directory load-file-name) \"site-start.d\")\

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |    6 ++++++
 Makefile.in |   25 ++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX