summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbugzilla <bugzilla@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-12-19 17:05:22 +0000
committerbugzilla <bugzilla@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-12-19 17:05:22 +0000
commit7c7fba86efe48f6859b1f3f947b4c0db5c7aca31 (patch)
tree2d7ed635d5aca59e444d155768fbf56906610b17
parent0656177c228c1d44757033dfb5dcd48111546090 (diff)
downloadATCD-7c7fba86efe48f6859b1f3f947b4c0db5c7aca31.tar.gz
ChangeLogTag: Mon Dec 19 16:50:00 UTC 2005 Simon Massey <simon.massey@prismtech.com>
-rw-r--r--ChangeLog9
-rw-r--r--PROBLEM-REPORT-FORM3
-rw-r--r--VERSION3
-rw-r--r--ace/Version.h11
-rwxr-xr-xbin/make_release9
5 files changed, 19 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cb8ad9a157..0602179d8f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
+Mon Dec 19 16:50:00 UTC 2005 Simon Massey <simon.massey@prismtech.com>
+
+ * bin/make_release:
+ Removed the extra end of line inserted into the $Id$ comment
+ from all of the Version.h generators. (Around the same line
+ as before.)
+
Mon Dec 19 08:48:13 2005 Simon Massey <simon.massey@prismtech.com>
- * ACE version 5.4.8 released.
+ * ACE version 5.4.8 released. ABORTED
Mon Dec 19 14:40:00 UTC 2005 Simon Massey <simon.massey@prismtech.com>
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index 83cea7c2e41..4b7b56a4c9d 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -43,7 +43,7 @@
To: ace-bugs@cs.wustl.edu
Subject: [area]: [synopsis]
- ACE VERSION: 5.4.8
+ ACE VERSION: 5.4.7
HOST MACHINE and OPERATING SYSTEM:
If on Windows based OS's, which version of WINSOCK do you
@@ -88,3 +88,4 @@ transcript if at all possible. ]
SAMPLE FIX/WORKAROUND:
[If available ]
+
diff --git a/VERSION b/VERSION
index f645da345b2..d8dc4fed4ba 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.4.8, released Mon Dec 19 08:48:13 2005.
+This is ACE version 5.4.7, released Fri Aug 05 07:37:20 2005.
If you have any problems with or questions about ACE, please send
email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
@@ -9,3 +9,4 @@ please do one of the following:
contents "subscribe ace-users" to majordomo@cs.wustl.edu.
2) Or, monitor the comp.soft-sys.ace newsgroup for responses.
+
diff --git a/ace/Version.h b/ace/Version.h
index 5938b6cde7e..d55c0f57335 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -1,11 +1,8 @@
-// -*- C++ -*-
-//
-$Id$
-
-// This is file was automatically generated by /project/acetmp/sm/ACE_wrappers/bin/make_release.
+// $Id$
+// This is an automatically generated file.
#define ACE_MAJOR_VERSION 5
#define ACE_MINOR_VERSION 4
-#define ACE_BETA_VERSION 8
-#define ACE_VERSION "5.4.8"
+#define ACE_BETA_VERSION 7
+#define ACE_VERSION "5.4.7"
diff --git a/bin/make_release b/bin/make_release
index 7b496d9a670..1c75f68a2ec 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -579,8 +579,7 @@ sub update_version_files () {
print CIAO_VERSION_H
"// -*- C++ -*-\n" .
- "//\n".
- "\$Id\$\n\n" .
+ "// \$Id\$\n\n" .
"// This is file was automatically generated by $0.\n\n" .
"\#define CIAO_MAJOR_VERSION ${major_version}\n" .
"\#define CIAO_MINOR_VERSION ${minor_version}\n" .
@@ -608,8 +607,7 @@ sub update_version_files () {
print TAO_VERSION_H
"// -*- C++ -*-\n" .
- "//\n".
- "\$Id\$\n\n" .
+ "// \$Id\$\n\n" .
"// This is file was automatically generated by $0.\n\n" .
"\#define TAO_MAJOR_VERSION ${major_version}\n" .
"\#define TAO_MINOR_VERSION ${minor_version}\n" .
@@ -633,8 +631,7 @@ sub update_version_files () {
print ACE_VERSION_H
"// -*- C++ -*-\n" .
- "//\n".
- "\$Id\$\n\n" .
+ "// \$Id\$\n\n" .
"// This is file was automatically generated by $0.\n\n" .
"\#define ACE_MAJOR_VERSION ${major_version}\n" .
"\#define ACE_MINOR_VERSION ${minor_version}\n" .