summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-06-02 05:13:37 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-06-02 05:13:37 +0000
commit0e9d7c1ab11103c5cb54dad10c8d534263d98098 (patch)
tree7c070d1bf0a2b775255fc7fa9a437cf4905fa68d
parentbbaece0aeb8e3cb7c221d8aba8f328778880ec1b (diff)
downloadATCD-0e9d7c1ab11103c5cb54dad10c8d534263d98098.tar.gz
ChangeLogTag:Mon Jun 2 00:10:14 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--ChangeLog8
-rw-r--r--Makefile1
-rwxr-xr-xbin/make_release8
3 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cfc5c866b2..49f2da621b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Jun 2 00:10:14 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * bin/make_release:Fixed some apparent bugs. Left some debugging
+ statements for future refernces.
+
+ * Makefile: Removed acconfig.h since it is not required. Thanks to
+ Ossama for proving the information.
+
Sun Jun 01 20:02:52 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* bin/make_release: Fixed a typo and added comments.
diff --git a/Makefile b/Makefile
index afcff6e84d3..132f7713a14 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,6 @@ CONTROLLED_FILES = \
TODO \
VERSION \
ACEXML \
- acconfig.h \
ace \
ace-config.1.in \
ace-config.in \
diff --git a/bin/make_release b/bin/make_release
index d8cfe72686d..378ca94bec1 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -55,7 +55,7 @@ my $perl_path = '/usr/bin/perl';
my $hostname;
chomp ($hostname = $ENV{'HOSTNAME'} || `uname -n`);
unless ("$hostname" eq 'deuce.doc.wustl.edu') {
- #### For efficiency sake . . .
+#### For efficiency sake . . .
die "$0: must run on host deuce\n";
}
@@ -267,7 +267,7 @@ if ($update_versions && "$kit" ne 'ace+tao+ciao') {
if ("$ace_tag") {
&ex ("$cvs -q export -r$ace_tag -kv ACE_wrappers > /dev/null") &&
die "$0: failed cvs export of $ace_tag in $stage_dir\n";
- &ex ("cd ACE_wrappers && $make ACE-INSTALL") &&
+ &ex ("cd ACE_wrappers && $make ACE-INSTALL") &&
die "$0: failed make ACE-INSTALL in $stage_dir/ACE_wrappers\n";
}
@@ -843,9 +843,10 @@ sub create_kit () {
"ACE.zip ACE-lib.zip ACE.tar.bz2 ACE-lib.tar.bz2 ";
}
- if ($kit eq 'ace+tao') {
+ if ($kit eq 'ace+tao' || $kit eq 'ace+tao+ciao') {
my $tmp_rel_file = '';
chomp ($tmp_rel_file = `$make -f ACE_wrappers/TAO/Makefile show_release_files`);
+ $release_files .= ' ';
$release_files .= $tmp_rel_file;
print "RELEASE FILES are $release_files \n";
@@ -872,6 +873,7 @@ sub create_kit () {
if ($kit eq 'ace+tao+ciao') {
my $tmp_rel_file = '';
chomp ($tmp_rel_file = `$make -f ACE_wrappers/TAO/CIAO/Makefile show_release_files`);
+ $release_files .= ' ';
$release_files .= $tmp_rel_file;
print "RELEASE FILES from CIAO are $release_files \n";