Menu
▾
▴
[MinGW-cvs] mingw-get ChangeLog, 1.78, 1.79 Makefile.in, 1.23, 1.24 README, 1.8, NONE
|
From: Keith M. <kei...@us...> - 2011-03-11 20:22:32
|
Update of /cvsroot/mingw/mingw-get
In directory vz-cvs-4.sog:/tmp/cvs-serv9527
Modified Files:
ChangeLog Makefile.in
Removed Files:
README
Log Message:
Refactor and update existing installation and usage instructions.
--- README DELETED ---
Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/mingw-get/Makefile.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Makefile.in 27 Feb 2011 16:21:36 -0000 1.23
--- Makefile.in 11 Mar 2011 20:22:30 -0000 1.24
***************
*** 153,160 ****
#
LICENCE_FILES = README COPYING
! SRCDIST_FILES = $(LICENCE_FILES) ChangeLog \
aclocal.m4 configure.ac configure Makefile.in version.c.in
! SRCDIST_SUBDIRS = build-aux m4 src src/pkginfo tinyxml xml
# The names of distributed pacakge archive files incorporate version
--- 153,160 ----
#
LICENCE_FILES = README COPYING
! SRCDIST_FILES = $(LICENCE_FILES) ChangeLog NEWS INSTALL \
aclocal.m4 configure.ac configure Makefile.in version.c.in
! SRCDIST_SUBDIRS = build-aux m4 src src/pkginfo srcdist-doc tinyxml xml
# The names of distributed pacakge archive files incorporate version
***************
*** 175,179 ****
PACKAGE_DISTNAME = $(PACKAGE_TARNAME)-$(PACKAGE_DISTVERSION)
! dist: srcdist bindist
bindist: all licdist
--- 175,179 ----
PACKAGE_DISTNAME = $(PACKAGE_TARNAME)-$(PACKAGE_DISTVERSION)
! dist: srcdist bindist readme.txt
bindist: all licdist
***************
*** 191,202 ****
$(mkinstalldirs) ./share/doc/${PACKAGE_TARNAME}
cd ./share/doc/${PACKAGE_TARNAME}; for file in $(LICENCE_FILES); \
! do $(LN_S) ${abs_top_srcdir}/$$file .; done
tar chf - share | gzip -c > $(PACKAGE_DISTNAME)-lic.tar.gz
rm -rf share
! srcdist: pkginfo.c
rm -rf ${PACKAGE_DISTROOT} && mkdir ${PACKAGE_DISTROOT}
cd ${PACKAGE_DISTROOT}; for file in $(SRCDIST_FILES); do \
! $(LN_S) ${abs_top_srcdir}/$$file .; done
for dir in $(SRCDIST_SUBDIRS); do \
mkdir ${PACKAGE_DISTROOT}/$$dir && cd ${PACKAGE_DISTROOT}/$$dir; \
--- 191,208 ----
$(mkinstalldirs) ./share/doc/${PACKAGE_TARNAME}
cd ./share/doc/${PACKAGE_TARNAME}; for file in $(LICENCE_FILES); \
! do test -f ${abs_top_srcdir}/$$file \
! && $(LN_S) ${abs_top_srcdir}/$$file . \
! || $(LN_S) ../$$file .; \
! done
tar chf - share | gzip -c > $(PACKAGE_DISTNAME)-lic.tar.gz
rm -rf share
! srcdist: pkginfo.c srcdist-doc
rm -rf ${PACKAGE_DISTROOT} && mkdir ${PACKAGE_DISTROOT}
cd ${PACKAGE_DISTROOT}; for file in $(SRCDIST_FILES); do \
! test -f ${abs_top_srcdir}/$$file \
! && $(LN_S) ${abs_top_srcdir}/$$file . \
! || $(LN_S) ../$$file .; \
! done
for dir in $(SRCDIST_SUBDIRS); do \
mkdir ${PACKAGE_DISTROOT}/$$dir && cd ${PACKAGE_DISTROOT}/$$dir; \
***************
*** 211,214 ****
--- 217,253 ----
rm -rf ${PACKAGE_DISTROOT}
+ # README, INSTALL and NEWS files to be included in the source distribution
+ # are generated on demand, as indirect side effects of a set of phoney goals
+ # so that they are always regenerated for each distribution, from templates
+ # in srcdist-doc so that we can make them version specific.
+ #
+ vpath %.in ${srcdir}/srcdist-doc
+ srcdist-doc: README.dist NEWS.dist INSTALL.dist
+
+ %.dist: %.in gendoc.simple.sed
+ sed -f gendoc.simple.sed $< | nroff > $*
+
+ %.simple.sed: %.sed.in
+ sed -e s,'$${PACKAGE_DIRNAME}',"${PACKAGE_DISTROOT}", \
+ -e s,'$${PACKAGE_DISTNAME}',"${PACKAGE_DISTNAME}", $< > $@
+
+ %.combined.sed: %.sed.in
+ sed -e s,'$${PACKAGE_DIRNAME}',"${PACKAGE_DISTROOT}", \
+ -e s,'$${PACKAGE_DISTNAME}',"${PACKAGE_DISTNAME}", \
+ -e s,'^# *cut:',, $< > $@
+
+ # The following rule provides a mechanism for generating a composite from
+ # README, INSTALL and NEWS, for use as an on-line package description.
+ #
+ readme.txt: README.in NEWS.in INSTALL.in gendoc.combined.sed
+ rm -f $@
+ for input in $^; do \
+ case $$input in *.in) \
+ sed -f gendoc.combined.sed $$input | nroff >> $@ ;; \
+ esac; \
+ done
+ echo '$$Document: $@ $$: end of file' >> $@
+ rm -f gendoc.combined.sed
+
# Workspace clean-up...
#
***************
*** 217,225 ****
distclean: clean
! rm -f config.* version.c Makefile
maintainer-clean: distclean
! rm -f pkginfo.c *-$(PACKAGE_DISTVERSION)-*.tar.gz
! rm -rf ${PACKAGE_DISTROOT} staged
# $RCSfile$: end of file
--- 256,265 ----
distclean: clean
! rm -f config.* version.c
maintainer-clean: distclean
! rm -f README NEWS INSTALL readme.txt Makefile pkginfo.c
! rm -f *-$(PACKAGE_DISTVERSION)-*.tar.gz *-$(PACKAGE_DISTVERSION)-*.zip
! rm -rf ${PACKAGE_DISTROOT} staged ${srcdir}/autom4te.cache
# $RCSfile$: end of file
Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/mingw-get/ChangeLog,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** ChangeLog 27 Feb 2011 16:21:36 -0000 1.78
--- ChangeLog 11 Mar 2011 20:22:30 -0000 1.79
***************
*** 1,2 ****
--- 1,28 ----
+ 2011-03-11 Keith Marshall <kei...@us...>
+
+ Refactor and update existing installation and usage instructions.
+
+ * src/clistub.c (help_text): Updated.
+
+ * srcdist-doc: New directory.
+
+ * README: Deleted; its content refactored into...
+ * srcdist-doc/README.in srcdist-doc/INSTALL.in srcdist-doc/NEWS.in:
+ ...these new template files, updated for current development state.
+
+ * srcdist-doc/gendoc.sed.in: New sed script; it directs formatting of
+ generated text files derived from the srcdist-doc templates.
+
+ * Makefile.in (SRCDIST_SUBDIRS): Add srcdist-doc.
+ (SRCDIST_FILES): Add NEWS and INSTALL.
+ (srcdist-doc): New build rule to generate README, NEWS and INSTALL.
+ (srcdist, licdist): Adjust path to locate them.
+ (readme.txt): New build rule to generate on-line package description.
+ (dist): Require it.
+ (distclean): Don't remove Makefile...
+ (maintainer-clean): ...but do it here instead. Also remove generated
+ README, NEWS and INSTALL, the autom4te cache, and all distributable
+ zip files, in addition to tarballs, for the current version.
+
2011-02-27 Keith Marshall <kei...@us...>
|