From cbd24059ea1e65d2ffc86db789b886d920527c37 Mon Sep 17 00:00:00 2001
From: levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Wed, 8 Apr 1998 15:01:51 +0000
Subject: added support for bin/make_release

---
 Makefile     | 51 +++++++++++++++++++++++++++++++++++++++++++++------
 TAO/Makefile | 26 +++++++++++++++++++++++---
 2 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 543959bff78..727065cc7bf 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,22 @@
 #       applications
 #----------------------------------------------------------------------------
 
+#### The "release" and "releaseall" targets can be used to create
+#### the ACE and ACE+TAO kits.  By default, each creates a new beta
+#### release.  To create a new minor or major release, add "REL=minor"
+#### or "REL=major", respectively, to the make invocation.
+####
+#### NOTE: the REL modifier applies to _both_ ACE and TAO in
+#### releaseall!
+####
+#### To create a new ACE minor release and a TAO beta release:
+####   % make release REL=minor
+####   % cd TAO
+####   % make release
+####
+#### To see what make release* would do without actually doing it, add
+#### "CHECK=-n" to the invocation.
+
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
@@ -82,9 +98,7 @@ RELEASE_FILES = $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \
                 ACE_wrappers/ACE-INSTALL \
                 ACE_wrappers/man
 
-ALL_RELEASE_FILES = $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \
-                    ACE_wrappers/ACE-INSTALL \
-                    ACE_wrappers/man \
+ALL_RELEASE_FILES = $(RELEASE_FILES) \
 		    ACE_wrappers/TAO
 
 RELEASE_LIB_FILES = \
@@ -164,13 +178,13 @@ endif
 FILTER = -name CVS -prune -o ! -name '.\#*' ! -name '\#*' ! -name '*~' \
          ! -name '*.MAK' -print
 
-cleanrelease: ACE-INSTALL
+cleanrelease-old: ACE-INSTALL
 	@$(TIMESTAMP) (make realclean; cd ..; \
          find $(RELEASE_FILES) $(FILTER) | \
            cpio -o -H tar | gzip -9 > ACE.tar.gz; \
          chmod a+r ACE.tar.gz; mv ACE.tar.gz ./ACE_wrappers/)
 
-release: ACE-INSTALL
+release-old: ACE-INSTALL
 	@$(TIMESTAMP) (cd ..; \
          find $(RELEASE_FILES) $(FILTER) | \
            cpio -o -H tar | gzip -9 > ACE.tar.gz; \
@@ -179,7 +193,7 @@ release: ACE-INSTALL
          chmod a+r ACE.tar.gz ACE-lib.tar.gz; \
          mv ACE.tar.gz ACE-lib.tar.gz ./ACE_wrappers/)
 
-releaseall: release
+releaseall-old: release
 	@cd TAO; make releaseall
 	@(cd ..; \
          find $(ALL_RELEASE_FILES) $(FILTER) | \
@@ -187,5 +201,30 @@ releaseall: release
          chmod a+r ACE+TAO.tar.gz; \
          mv ACE+TAO.tar.gz ./ACE_wrappers/)
 
+REL = beta
+CHECK =
+
+#### The release target creates the ACE (only) kit.
+release: ACE-INSTALL
+	@$(ACE_ROOT)/bin/make_release $(CHECK) -k ace -t $(REL) \
+	   -c "$(CONTROLLED_FILES)" -r "$(RELEASE_FILES)" \
+	   -l "$(RELEASE_LIB_FILES)"
+
+#### The following target is for use by the TAO Makefile.  It should not
+#### be called directly from the command line.  The releasetao target
+#### creates the combined ACE-TAO kit.
+releasetao:
+	@$(ACE_ROOT)/bin/make_release $(CHECK) -k ace+tao -t $(REL) \
+	   -c "$(CONTROLLED_FILES)" -r "$(ALL_RELEASE_FILES)"
+
+#### The releaseall target:
+####   1) Creates the ACE kit.
+####   2) Updates the TAO release (VERSION, ChangeLog, and tag) by
+####      recursively invoking make release in the TAO directory.
+####      The make then recursively invokes make releasetao in this
+####      directory to create the combined ACE-TAO kit.
+releaseall: release
+	@cd TAO && make release REL=$(REL)
+
 ACE-INSTALL: ACE-INSTALL.html
 	@lynx -dump $< > $@
diff --git a/TAO/Makefile b/TAO/Makefile
index c17da160e39..129c0bf17eb 100644
--- a/TAO/Makefile
+++ b/TAO/Makefile
@@ -4,6 +4,14 @@
 #	Top-level Makefile for the TAO
 #----------------------------------------------------------------------------
 
+#### The "release" targets can be used to create the ACE+TAO kit.  By
+#### default, it creates a new beta release.  To create a new minor or
+#### major release, add "REL=minor" or "REL=major", respectively, to
+#### the make invocation.
+####
+#### To see what make release would do without actually doing it, add
+#### "CHECK=-n" to the invocation.
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
@@ -92,15 +100,27 @@ INSTALL:	TAO-INSTALL.html
 
 FILTER = -name CVS -prune -o ! -name '.\#*' ! -name '\#*' ! -name '*~' -print
 
-cleanrelease:	INSTALL
+cleanrelease-old:	INSTALL
 	@$(TIMESTAMP) (make realclean; cd ..; \
 	 find $(RELEASE_FILES) $(FILTER) | cpio -o -H tar | gzip -9 > TAO.tar.gz; \
 	 chmod a+r TAO.tar.gz; )
 
-release:	INSTALL
+release-old:	INSTALL
 	@$(TIMESTAMP) (cd ..; \
 	 find $(RELEASE_FILES) $(FILTER) | cpio -o -H tar | gzip -9 > TAO.tar.gz; \
 	 chmod a+r TAO.tar.gz; )
 
-releaseall: INSTALL
+releaseall-old: INSTALL
 	@$(TIMESTAMP) true
+
+REL = beta
+CHECK =
+
+#### The call to make_release below doesn't actually create the kit.
+#### If creating a release in /project/adaptive/ACE_wrappers/TAO, it
+#### just updates the VERSION and ChangeLog files, and tags the release.
+#### Then, make releasetao is invoked to actually create the kit.
+release: INSTALL
+	@$(ACE_ROOT)/bin/make_release $(CHECK) -k tao -t $(REL) \
+	   -c "$(RELEASE_FILES)" -r "$(RELEASE_FILES)"  &&  \
+	 cd ..  &&  make releasetao
-- 
cgit v1.2.1