Added envinfo to report versions of ACE, OS and compiler

3 files changed, 98 insertions, 26 deletions

diff --git a/bin/Makefile b/bin/Makefile
index ccab1bfdfbd..b3bebc0db24 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,39 +1,80 @@
-#############################################################################
+#----------------------------------------------------------------------------
 #
-#  Makefile for assignment 1
+# $Id$
 #
-#############################################################################
+#	Makefile for all the ACE binaries
+#----------------------------------------------------------------------------
 
-include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
 
-# CXX		= gcc 
-CFILES		= clone.cpp 
-OFILES		= clone.o
-DFLAGS		= -b elf
-CCFLAGS		+= -I$(ACE_ROOT) 
+BIN = \
+	clone \
+	envinfo \
 
-#############################################################################
-# C++ directives
+LSRC   = $(addsuffix .cpp,$(BIN))
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-.SUFFIXES: .cpp
-.cpp.o:
-	$(CXX) $(CCFLAGS) -c $<
-#############################################################################
+BUILD = $(VBIN)
 
-clone: $(OFILES)
-	$(CXX) $(CCFLAGS) -o $@ $(OFILES)
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
 
-clean:
-	-/bin/rm -f *.o *.out *~ core
+include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include	$(ACE_ROOT)/include/makeinclude/macros.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
-realclean: clean 
-	-/bin/rm -fr clone
+# To build multiple executables in the same directory on AIX, it works
+# best to wipe out any previously-created tempinc directory.
+# The compiler/linker isn't too smart about instantiating templates...
+ifdef TEMPINCDIR
+COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
+endif
 
-depend:
-	g++dep -f Makefile $(CFILES)
+#----------------------------------------------------------------------------
+#	Local targets
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Dependencies
+#----------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-clone.o : clone.cpp
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+.obj/clone.o .obj/clone.so .shobj/clone.o .shobj/clone.so: clone.cpp \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/envinfo.o .obj/envinfo.so .shobj/envinfo.o .shobj/envinfo.so: envinfo.cpp \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i
 
+# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/bin/clone.cpp b/bin/clone.cpp
index 6de3139eb1e..62ab5e7b7bc 100644
--- a/bin/clone.cpp
+++ b/bin/clone.cpp
@@ -1,6 +1,8 @@
-#include "ace/OS.h"
 // $Id$
 
+#include "ace/OS.h"
+
+ACE_RCSID(bin, clone, "$Id$")
 
 #if 0
 #if defined (USG)
diff --git a/bin/envinfo.cpp b/bin/envinfo.cpp
new file mode 100644
index 00000000000..8d25afd91a7
--- /dev/null
+++ b/bin/envinfo.cpp
@@ -0,0 +1,29 @@
+// $Id$
+
+#include "ace/ACE.h"
+
+ACE_RCSID(bin, envinfo, "$Id$")
+
+int
+main (int, ASYS_TCHAR *[])
+{
+  cerr << "ACE: "
+       << ACE::major_version() << "."
+       << ACE::minor_version() << "."
+       << ACE::beta_version() << "\n";
+
+  struct utsname uname;
+  ACE_OS::uname(&uname);
+  cerr << "OS: "
+       << uname.sysname << " "
+       << uname.release << "\n";
+
+  cerr << "Compiler: "
+       << ACE::compiler_name() << " "
+       << ACE::compiler_major_version() << "."
+       << ACE::compiler_minor_version() << "."
+       << ACE::compiler_beta_version() << "\n";
+
+  return 0;
+}
+