diff options
author | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-02-29 04:17:03 +0000 |
---|---|---|
committer | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-02-29 04:17:03 +0000 |
commit | 69f25ccc359fd7366e5532a4201a3de4879c5a7a (patch) | |
tree | e4a7e28680c39b90974147dd9bd53f459fdbe410 | |
parent | 64852889448800ceea68fdb2d85e1fbed986336a (diff) | |
download | ATCD-69f25ccc359fd7366e5532a4201a3de4879c5a7a.tar.gz |
Merged revisions 80740,80750,80757,80764,80771 via svnmerge from
https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/ACE
........
r80740 | johnnyw | 2008-02-26 09:52:25 -0600 (Tue, 26 Feb 2008) | 1 line
Tue Feb 26 15:52:37 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
........
r80750 | johnnyw | 2008-02-27 01:56:07 -0600 (Wed, 27 Feb 2008) | 1 line
........
r80757 | wotte | 2008-02-27 13:29:04 -0600 (Wed, 27 Feb 2008) | 1 line
Wed Feb 27 19:28:18 UTC 2008 William Otte <wotte@william-ottes-macbook-pro.local>
........
r80764 | johnnyw | 2008-02-28 02:33:00 -0600 (Thu, 28 Feb 2008) | 1 line
Thu Feb 28 08:32:18 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
........
r80771 | johnnyw | 2008-02-28 10:08:49 -0600 (Thu, 28 Feb 2008) | 1 line
Thu Feb 28 16:08:18 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
........
-rw-r--r-- | ACE/ChangeLog | 21 | ||||
-rw-r--r-- | ACE/bin/MakeProjectCreator/config/global.features | 2 | ||||
-rwxr-xr-x | ACE/bin/generate_compile_stats.sh | 32 | ||||
-rw-r--r-- | ACE/docs/ACE-bug-process.html | 2 | ||||
-rw-r--r-- | ACE/include/makeinclude/platform_openvms.GNU | 7 |
5 files changed, 50 insertions, 14 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 26cf0d0ac6e..74b50f14a61 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,24 @@ +Thu Feb 28 16:08:18 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/generate_compile_stats.sh: + Added --compiler as option so that we can specify a different + compiler then gcc + +Thu Feb 28 08:32:18 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/ACE-bug-process.html: + Removed cvs + +Wed Feb 27 19:28:18 UTC 2008 William Otte <wotte@william-ottes-macbook-pro.local> + + * bin/MakeProjectCreator/config/global.features: + disable mcpp by default. + +Tue Feb 26 15:52:37 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * include/makeinclude/platform_openvms.GNU: + Added support for buildbits=64 + Tue Feb 26 09:18:37 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_openvms.GNU: diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features index 141b6864f57..84c5245e0a8 100644 --- a/ACE/bin/MakeProjectCreator/config/global.features +++ b/ACE/bin/MakeProjectCreator/config/global.features @@ -48,6 +48,8 @@ versioned_namespace = 0 vcl = 0 stl = 0 xsc = 0 +mcpp = 0 + // Features for various GUI libraries // Some of features are switched on because they are also controlled diff --git a/ACE/bin/generate_compile_stats.sh b/ACE/bin/generate_compile_stats.sh index 7b1a4399eff..4df9a0ffb85 100755 --- a/ACE/bin/generate_compile_stats.sh +++ b/ACE/bin/generate_compile_stats.sh @@ -28,14 +28,16 @@ ############################################################################### usage () { - echo "Usage: `basename $0` [--base=<dir>] [--name=<name>] <input_file>" - echo " <destination_directory> [target_file] [Footprint|Compilation]" - echo " [<date>] [<fudge_factor>]" + echo "Usage: `basename $0` [--base=<dir>] [--name=<name>] [--compiler=compiler]" + ech " <input_file> <destination_directory> [target_file]" + echo " [Footprint|Compilation] [<date>] [<fudge_factor>]" echo "" echo "--base This option can be used to set the base root directory to" echo " something other than the default \$ACE_ROOT." echo "--name This option can be used to set the software title to something" echo " other than the default ACE+TAO+CIAO." + echo "--compiler This option can be used to set the compiler to something" + echo " other than the default gcc." echo "input_file This is the compilation log file." echo "destination_directory This designates the location of the generated html." echo "target_file This is similar to input_file, but should contain no errors." @@ -156,6 +158,9 @@ parse () elif [ -n "`echo $1 | grep '^--name=.*'`" ]; then BASE_TITLE=`echo $1 | sed 's/^--name=//'` shift + elif [ -n "`echo $1 | grep '^--compiler.*'`" ]; then + COMPILER=`echo $1 | sed 's/^--compiler=//'` + shift else break fi @@ -767,10 +772,10 @@ create_index_page () cat /etc/redhat-release fi - echo '), and we use GCC ' + echo "), and we use " $COMPILER " version " - gcc -dumpversion > .metrics/gccversion.txt 2>&1 - cat .metrics/gccversion.txt + $COMPILER -dumpversion > .metrics/compilerversion.txt 2>&1 + cat .metrics/compilerversion.txt echo ' to compile '$BASE_TITLE'. </P>' @@ -811,16 +816,18 @@ create_index_page () /bin/uname -a - echo '</PRE></TD></TR><TR><TD>Compiler Version</TD><TD>gcc -v</TD></TR>' + echo '</PRE></TD></TR><TR><TD>Compiler Version</TD><TD>'$COMPILER' -v</TD></TR>' echo '<TR><TD colspan="2">' - gcc -v > .metrics/gcc.txt 2>&1 - cat .metrics/gcc.txt + $COMPILER -v > .metrics/compiler.txt 2>&1 + cat .metrics/compiler.txt - echo '</TD></TR><TR><TD>Library Version</TD><TD>/lib/libc.so.6</TD></TR>' - echo '<TR><TD colspan="2"><PRE>' + if [ -e "/lib/libc.so.6" ]; then + echo '</TD></TR><TR><TD>Library Version</TD><TD>/lib/libc.so.6</TD></TR>' + echo '<TR><TD colspan="2"><PRE>' - /lib/libc.so.6 | sed -e 's/</\</g' -e 's/>/\>/g' + /lib/libc.so.6 | sed -e 's/</\</g' -e 's/>/\>/g' + fi echo '</PRE></TD></TR></TBODY></TABLE>' echo '</body></html>' @@ -1025,6 +1032,7 @@ FUDGE_FACTOR=0 BASE_ROOT=$ACE_ROOT DEFAULT_TITLE=ACE+TAO+CIAO BASE_TITLE=$DEFAULT_TITLE +COMPILER="gcc" parse $@ create_dirs ".metrics/" diff --git a/ACE/docs/ACE-bug-process.html b/ACE/docs/ACE-bug-process.html index 5ae7e0d2b39..e4677356275 100644 --- a/ACE/docs/ACE-bug-process.html +++ b/ACE/docs/ACE-bug-process.html @@ -149,7 +149,7 @@ and newsgroup. If you have a patch that fixes a problem you've found with our software here's the process for submitting it: <OL> -<LI> Use the latest contents of subversion CVS repository, i.e., +<LI> Use the latest contents of subversion repository, i.e., what's available from <P> <A HREF="https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/">https://svn.dre.vanderbilt.edu/</A> <P> diff --git a/ACE/include/makeinclude/platform_openvms.GNU b/ACE/include/makeinclude/platform_openvms.GNU index 4778017cc43..7b1f491fd87 100644 --- a/ACE/include/makeinclude/platform_openvms.GNU +++ b/ACE/include/makeinclude/platform_openvms.GNU @@ -11,6 +11,7 @@ threads ?= 1 pthread ?= 1 ssl ?= 0 rwho ?= 0 +buildbits ?= 32 ifeq ($(static_libs),1) override shared_libs = @@ -30,7 +31,7 @@ VSHDIR = shobj/ LN_S = cp -p DEFFLAGS += -CCFLAGS += -D__USE_STD_IOSTREAM -ieee -names_as_is_short -Wc/STAND=STRICT +CCFLAGS += -D__USE_STD_IOSTREAM -ieee -names_as_is_short ifeq ($(HOSTTYPE),ia64) CCFLAGS += -msg_disable intoverflow -msg_disable reftemporary -msg_disable intsignchange else @@ -38,6 +39,10 @@ else endif CCFLAGS += -Wc/template=auto +ifeq ($(buildbits),64) + CCFLAGS += -Wc/MODEL=ANSI +endif + ifeq ($(HOSTTYPE),ia64) SYMVEC_OPT_FILE ?= $(LIB_NAME)_symvec.opt ifeq ($(PRJ_TYPE),library) |