[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-diffs] Changes to auctex/Makefile.in,v
From: |
Ralf Angeli |
Subject: |
[AUCTeX-diffs] Changes to auctex/Makefile.in,v |
Date: |
Sat, 06 Mar 2010 14:07:16 +0000 |
CVSROOT: /cvsroot/auctex
Module name: auctex
Changes by: Ralf Angeli <angeli> 10/03/06 14:07:16
Index: Makefile.in
===================================================================
RCS file: /cvsroot/auctex/auctex/Makefile.in,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -b -r1.167 -r1.168
--- Makefile.in 28 Dec 2009 22:06:19 -0000 1.167
+++ Makefile.in 6 Mar 2010 14:07:16 -0000 1.168
@@ -2,8 +2,8 @@
# Maintainer: address@hidden
-# Copyright (C) 2003, 2004, 2005, 2006, 2007,
-# 2008 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2010 Free Software
+# Foundation, Inc.
# This file is part of AUCTeX.
@@ -67,13 +67,12 @@
CP = cp -p
CP_A = $(CP) -R
-DIST_PREFIX = /home/tmp/auctex-
-FTPDIR = $(DIST_PREFIX)ftp
-WWWDIR = $(DIST_PREFIX)www
+DIST_PREFIX=$(PWD)/auctex-dist
+FTPDIR = $(DIST_PREFIX)/ftp
+WWWDIR = $(DIST_PREFIX)/www
XEMACS_BUILD_DIR = xemacs-build
PREVIEW_BUILD_DIR = preview-build
-COMMITTER_NAME="David Kastrup"
address@hidden
+COMMITTER="David Kastrup <address@hidden>"
RPMROOT = /usr/src/redhat
RPM_SIGN = --sign
@@ -133,12 +132,12 @@
all: lisp docs
$(DESCEND)
-.PHONY: all lisp info dvi some install install-el install-lisp \
- docs install-docs install-auto \
- install-metadata install-startup install-man \
- clean distclean snapshot check-dist release-commit \
- dist patch tar-ball rpm-packages full-release tar-ball-clean \
- wc xemacs-package preview-ball windows-package
+.PHONY: all lisp info dvi some install install-el install-lisp docs \
+ install-docs install-auto install-metadata install-startup \
+ install-man clean distclean maintainer-clean extraclean \
+ tar-ball-clean check-tag release-commit dist snapshot patch \
+ tar-ball rpm-packages wc xemacs-package windows-package \
+ release-sign release-upload preview-ball
lisp: tex-site.el $(AUCSRC) $(STYLESRC) $(MULESRC)
$(ELCC) -f batch-byte-compile $(AUCSRC) $(STYLESRC) $(MULESRC)
@@ -304,32 +303,55 @@
extraclean: maintainer-clean
rm -f *~ \#*\#
-tar-ball-clean:
- @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
+tar-ball-clean: check-tag
rm -rf auctex-$(TAG)/
rm -rf $(XEMACS_BUILD_DIR)/
wc:
wc $(AUCSRC) $(STYLESRC)
-# The targets below are intened to be used only by the maintainers.
-
-snapshot: check-dist tar-ball
-
-dist: check-dist release-commit tar-ball
-
-check-dist:
- @if [ "X$(TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
- if [ "X$(OLD)" = "X" ]; then echo "No patch"; exit 1; fi
-
-release-commit:
- @echo "**********************************************************"
- @echo "** Making distribution of auctex for release $(TAG)"
- @echo "**********************************************************"
- sleep 3
+# ----------------------------------------------------------------------
+# The targets below are concerned with the release process and
+# intended to be used only by the maintainers.
+
+# Steps for making a release:
+#
+# 1) release-commit TAG=<tag> COMMITTER=<committer>
+# Tag the release.
+#
+# 2) dist TAG=<tag>
+# Create the tar ball.
+#
+# 3) xemacs-package TAG=<tag>
+# Create the precompiled XEmacs package.
+#
+# 4) windows-package WEMACSVER=<emacs-version> TAG=<tag>
+# Create the precompiled AUCTeX package for Windows.
+#
+# 5) release-sign
+# Sign the tar ball and create directive files for upload.
+#
+# 6) release-upload
+# Upload files to GNU FTP server.
+#
+# 7) www-doc TAG=<tag> GENDOCSPATCH=<patch-file>
+# Create documentation for AUCTeX home page.
+#
+# 8) preview-ball TAG=<tag>
+# Create preview package. (Not for GNU FTP server but for CTAN.)
+
+dist: check-tag tar-ball
+
+snapshot: dist
+
+check-tag:
+ @if [ "X$(TAG)" = "X" ]; then echo "*** Error: No TAG ***"; exit 1; fi
+
+release-commit: check-tag
+ @echo "Tagging release $(TAG) in CVS ..."
+ sleep 5
mv ChangeLog ChangeLog.old
- echo `date "+%Y-%m-%d "` \
- " "${COMMITTER_NAME}" <"${COMMITTER_EMAIL}">" > ChangeLog
+ echo `date "+%Y-%m-%d "`" "${COMMITTER} > ChangeLog
echo >> ChangeLog
echo " * Version" $(TAG) released. >> ChangeLog
echo >> ChangeLog
@@ -365,92 +387,48 @@
rpmbuild -ta $(RPM_SIGN) $(FTPDIR)/auctex-$(TAG).tar.gz
$(CP)
$(RPMROOT)/{RPMS/noarch/{auctex-emacs,preview-tetex},SRPMS/auctex}-$(TAG)[.-]*
$(FTPDIR)
@echo "If you need to prepare RPM on some other system, you need to add"
- @echo "them in $(FTPDIR) before 'make full-release'."
+ @echo "them in $(FTPDIR) before 'make release-sign'."
sleep 2
-preview-ball:
- test ! -d $(PREVIEW_BUILD_DIR) || rm -r $(PREVIEW_BUILD_DIR)
- mkdir $(PREVIEW_BUILD_DIR)
-# Use TAG_EXPORT if set (for snapshots)
- cvs export -d $(PREVIEW_BUILD_DIR) \
- `echo $${TAG_EXPORT:=$(TAG)} | \
- sed -e '/^\([-0-9]*[0-9]\)[-a-z]*$$/s//-D \1/' \
- -e '/[.]/{s/^/-r release_/;s/[.]/_/g}'` auctex/preview/latex
- cd $(PREVIEW_BUILD_DIR) && make -f ../preview/latex/Makefile
preview.ins preview.pdf
- chmod -R go-w+rX $(PREVIEW_BUILD_DIR)
- test -d $(FTPDIR) || mkdir -p $(FTPDIR)
- cd $(PREVIEW_BUILD_DIR) && \
- tar -cf - --owner=root --group=root README preview.dtx preview.ins
preview.pdf | gzip --best > $(FTPDIR)/preview-$(TAG).tar.gz
-
-full-release:
- rm -f $(FTPDIR)/*.{directive,asc,sig}
- if [ "x$$GPG_AGENT_INFO" = "x" ]; then \
- read -sp "Enter pass phrase: " phrase ; \
- gpg_opt="--passphrase-fd 0"; \
- else \
- gpg_opt=""; phrase=""; \
- fi; \
- for i in $(FTPDIR)/*; do \
- echo "$$phrase" | gpg --detach-sign $$gpg_opt $$i ; \
- case $$i in *-$(TAG)*) echo "directory: auctex" >$$i.directive;; \
- *) echo "directory: auctex/$(TAG)-extra" >$$i.directive ;; \
- esac ; \
- echo "$$phrase" | gpg $$gpg_opt --clearsign $$i.directive ; \
- done
- rm $(FTPDIR)/*.directive
-
patch:
diff -u auctex-$(OLD) auctex-$(TAG) | gzip --best \
>$(FTPDIR)/auctex-$(OLD)-to-$(TAG).patch.gz
-xemacs-package:
+xemacs-package: check-tag
rm -rf $(XEMACS_BUILD_DIR)
$(CP_A) auctex-$(TAG) $(XEMACS_BUILD_DIR)
cd $(XEMACS_BUILD_DIR) \
&& ./configure INSTALL_INFO=: TEXHASH=: --with-xemacs
--with-packagedir=`pwd`/xemacs-package --without-texmf-dir
--with-auto-dir=etc/auctex/auto \
&& make all install-man install && cd xemacs-package && tar -cf -
--owner=root --group=root . | gzip --best > $(FTPDIR)/auctex-$(TAG)-pkg.tar.gz
-www-doc:
- rm -rf $(WWWDIR)
- mkdir -p $(WWWDIR)/manual
- $(CP) auctex-$(TAG)/doc/*.texi $(WWWDIR)/manual
- cd $(WWWDIR)/manual \
- && wget -O gendocs.sh
'http://cvs.savannah.gnu.org/viewvc/%2acheckout%2a/texinfo/texinfo/util/gendocs.sh'
\
- && patch <$(GENDOCSPATCH) \
- && chmod u+x gendocs.sh \
- && wget -O gendocs_template
'http://cvs.savannah.gnu.org/viewvc/%2acheckout%2a/texinfo/texinfo/util/gendocs_template'
\
- && sed -i -e 's/html_node\/index\.html/%%PACKAGE%%\/index.html/'
gendocs_template \
- && mkdir .texinfo \
- && echo -e "emacs split
http://www.gnu.org/software/emacs/manual/html_node/\nemacs mono
http://www.gnu.org/software/emacs/manual/emacs.html\nreftex split
http://www.gnu.org/software/auctex/manual/reftex/\nreftex mono
http://www.gnu.org/software/auctex/manual/reftex.html\n" >
.texinfo/htmlxref.cnf \
- && ./gendocs.sh --texi2html auctex "AUCTeX Manual" \
- && ./gendocs.sh --texi2html preview-latex "preview-latex Manual"
-
# Pre-compiled AUCTeX package for Emacs on Windows
-
WBUILDDIR=$(PWD)/windows-package
-WEMACSVER=22.1
WEMACS=/usr/src/emacs-$(WEMACSVER)/src/emacs
-WAUCVER=11.85
-WPACKAGE=$(WBUILDDIR)/auctex-$(WAUCVER)-e$(WEMACSVER)-msw.zip
+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
-
-windows-package:
+ site-lisp/tex-site.el var/auctex doc info/dir info/auctex.info* \
+ info/preview-latex.info*
+windows-package: check-tag
+ @if [ "X$(WEMACSVER)" = "X" ]; then \
+ echo "*** Error: No Emacs version (WEMACSVER) ***"; \
+ exit 1; \
+ fi
# Make sure the prerequisites are available
test -d $(WBUILDDIR) || mkdir $(WBUILDDIR)
test -f $(WBUILDDIR)/emacs-$(WEMACSVER)-bin-i386.zip \
|| { cd $(WBUILDDIR) \
&& wget
http://ftp.gnu.org/gnu/emacs/windows/emacs-$(WEMACSVER)-bin-i386.zip; }
- test -f $(WBUILDDIR)/auctex-$(WAUCVER).zip \
+ test -f $(WBUILDDIR)/auctex-$(TAG).zip \
+ || { test -f $(FTPDIR)/auctex-$(TAG).zip \
+ && $(CP) $(FTPDIR)/auctex-$(TAG).zip $(WBUILDDIR); } \
|| { cd $(WBUILDDIR) \
- && wget http://ftp.gnu.org/gnu/auctex/auctex-$(WAUCVER).zip; }
+ && wget http://ftp.gnu.org/gnu/auctex/auctex-$(TAG).zip; }
# Reset to clean state
cd $(WBUILDDIR) \
&& rm -rf emacs-$(WEMACSVER) \
- && rm -rf auctex-$(WAUCVER) \
+ && rm -rf auctex-$(TAG) \
&& unzip emacs-$(WEMACSVER)-bin-i386.zip \
- && unzip auctex-$(WAUCVER).zip
+ && unzip auctex-$(TAG).zip
rm -f $(WPACKAGE)
# Create site-start.el and site-start.d
cd $(WBUILDDIR)/emacs-$(WEMACSVER)/site-lisp \
@@ -461,7 +439,7 @@
\n (load file nil t t))" > site-start.el \
&& mkdir site-start.d
# Build and install AUCTeX
- cd $(WBUILDDIR)/auctex-$(WAUCVER) \
+ cd $(WBUILDDIR)/auctex-$(TAG) \
&& ./configure --prefix=$(WBUILDDIR)/emacs-$(WEMACSVER) \
--without-texmf-dir --with-emacs=$(WEMACS) \
--with-lispdir=$(WBUILDDIR)/emacs-$(WEMACSVER)/site-lisp \
@@ -470,5 +448,62 @@
&& sed -i -e 's/"\/[^\n]\+/(expand-file-name "..\/var\/auctex"
(file-name-directory load-file-name))/' tex-site.el \
&& make install
# Create the package
+ test -d $(FTPDIR) || mkdir -p $(FTPDIR)
cd $(WBUILDDIR)/emacs-$(WEMACSVER) \
- && zip -r $(WPACKAGE) $(WPACKAGEFILES)
+ && zip -r $(FTPDIR)/$(WPACKAGE) $(WPACKAGEFILES)
+
+release-sign:
+ rm -f $(FTPDIR)/*.{directive,asc,sig}
+ if [ "x$$GPG_AGENT_INFO" = "x" ]; then \
+ read -sp "Enter pass phrase: " phrase ; \
+ gpg_opt="--passphrase-fd 0"; \
+ else \
+ gpg_opt=""; phrase=""; \
+ fi; \
+ for i in $(FTPDIR)/*; do \
+ echo "$$phrase" | gpg --detach-sign $$gpg_opt $$i ; \
+ echo "version: 1.1" >$$i.directive; \
+ case $$i in *-$(TAG)*) echo "directory: auctex" >>$$i.directive;; \
+ *) echo "directory: auctex/$(TAG)-extra" >>$$i.directive ;; \
+ esac ; \
+ echo "filename: "`basename $$i` >>$$i.directive ; \
+ echo "$$phrase" | gpg $$gpg_opt --clearsign $$i.directive ; \
+ done
+ rm $(FTPDIR)/*.directive
+
+release-upload:
+ @echo "Uploading everything in FTPDIR to GNU FTP server ..."
+ @sleep 5
+ ncftpput ftp-upload.gnu.org /incoming/ftp $(FTPDIR)/*
+
+# AUCTeX and preview-latex manuals for the home page
+www-doc: check-tag
+ rm -rf $(WWWDIR)
+ mkdir -p $(WWWDIR)/manual
+ $(CP) auctex-$(TAG)/doc/*.texi $(WWWDIR)/manual
+ cd $(WWWDIR)/manual \
+ && wget -O gendocs.sh
'http://cvs.savannah.gnu.org/viewvc/%2acheckout%2a/texinfo/texinfo/util/gendocs.sh'
\
+ && patch <$(GENDOCSPATCH) \
+ && chmod u+x gendocs.sh \
+ && wget -O gendocs_template
'http://cvs.savannah.gnu.org/viewvc/%2acheckout%2a/texinfo/texinfo/util/gendocs_template'
\
+ && sed -i -e 's/html_node\/index\.html/%%PACKAGE%%\/index.html/'
gendocs_template \
+ && mkdir .texinfo \
+ && echo -e "emacs split
http://www.gnu.org/software/emacs/manual/html_node/emacs/\nemacs mono
http://www.gnu.org/software/emacs/manual/html_mono/emacs.html\nreftex split
http://www.gnu.org/software/auctex/manual/reftex/\nreftex mono
http://www.gnu.org/software/auctex/manual/reftex.html\n" >
.texinfo/htmlxref.cnf \
+ && ./gendocs.sh --email address@hidden --texi2html \
+ --html --use-nodes auctex "AUCTeX Manual" \
+ && ./gendocs.sh --email address@hidden --texi2html \
+ --html --use-nodes preview-latex "preview-latex Manual"
+
+preview-ball: check-tag
+ test ! -d $(PREVIEW_BUILD_DIR) || rm -r $(PREVIEW_BUILD_DIR)
+ mkdir $(PREVIEW_BUILD_DIR)
+# Use TAG_EXPORT if set (for snapshots)
+ cvs export -d $(PREVIEW_BUILD_DIR) \
+ `echo $${TAG_EXPORT:=$(TAG)} | \
+ sed -e '/^\([-0-9]*[0-9]\)[-a-z]*$$/s//-D \1/' \
+ -e '/[.]/{s/^/-r release_/;s/[.]/_/g}'` auctex/preview/latex
+ cd $(PREVIEW_BUILD_DIR) && make -f ../preview/latex/Makefile
preview.ins preview.pdf
+ chmod -R go-w+rX $(PREVIEW_BUILD_DIR)
+ test -d $(FTPDIR) || mkdir -p $(FTPDIR)
+ cd $(PREVIEW_BUILD_DIR) && \
+ tar -cf - --owner=root --group=root README preview.dtx preview.ins
preview.pdf | gzip --best > $(FTPDIR)/preview-$(TAG).tar.gz
- [AUCTeX-diffs] Changes to auctex/Makefile.in,v,
Ralf Angeli <=