ChangeLogTag:Mon Feb 10 12:14:35 2003 Ossama Othman <ossama@uci.edu>

4 files changed, 53 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index d68d61246ab..96f8bfb908a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Mon Feb 10 12:14:35 2003  Ossama Othman  <ossama@uci.edu>
+
+	* bin/ace-install:
+
+	  Fixed problem where all TAO executables were not installed.
+
+	  Fixed installed file permission problem.  Files that should have
+	  global access didn't have it.
+
+	  Fixed problem where the script did not easily flatten the
+	  install directory, requires the ACE_ARCH subdirectory trees be
+	  built.
+
+	  Fixed problem where all binaries were not filtered out.
+
 Mon Feb 10 19:42:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/ATM_Acceptor.h:
@@ -32,8 +47,8 @@ Mon Feb 10 19:42:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
           every object file that references it. The linker then strips out
           all but a single copy of the code. When linking an exe that refers
           to a singleton template in a dll, the linker would choose one
-          of the template code instances in the exe's .obj files, and completely
-          ignore the instance that was exported by the dll.
+          of the template code instances in the exe's .obj files, and
+	  completely ignore the instance that was exported by the dll.
 
           The key to the solution is that it appears that the borland linker
           chooses the first instance of the template symbols that it sees. The
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index d68d61246ab..96f8bfb908a 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,18 @@
+Mon Feb 10 12:14:35 2003  Ossama Othman  <ossama@uci.edu>
+
+	* bin/ace-install:
+
+	  Fixed problem where all TAO executables were not installed.
+
+	  Fixed installed file permission problem.  Files that should have
+	  global access didn't have it.
+
+	  Fixed problem where the script did not easily flatten the
+	  install directory, requires the ACE_ARCH subdirectory trees be
+	  built.
+
+	  Fixed problem where all binaries were not filtered out.
+
 Mon Feb 10 19:42:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/ATM_Acceptor.h:
@@ -32,8 +47,8 @@ Mon Feb 10 19:42:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
           every object file that references it. The linker then strips out
           all but a single copy of the code. When linking an exe that refers
           to a singleton template in a dll, the linker would choose one
-          of the template code instances in the exe's .obj files, and completely
-          ignore the instance that was exported by the dll.
+          of the template code instances in the exe's .obj files, and
+	  completely ignore the instance that was exported by the dll.
 
           The key to the solution is that it appears that the borland linker
           chooses the first instance of the template symbols that it sees. The
diff --git a/THANKS b/THANKS
index 1812f0de4c5..bc2b32544f7 100644
--- a/THANKS
+++ b/THANKS
@@ -1662,6 +1662,8 @@ Matthias Blankenhaus <matthias@ingrian.com>
 Wolfgang Schroeder <cpp_kurs@arcor.de>
 Mario Hofmann <Mario.Hofmann@SystemaGmbH.de>
 Bruce MacDonald <brucemac@netcomuk.co.uk>
+Jeffrey Graham <jgraham@titan.com>
+
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/bin/ace-install b/bin/ace-install
index f54429497d8..e4816a54a89 100755
--- a/bin/ace-install
+++ b/bin/ace-install
@@ -2,6 +2,7 @@
 
 # $Id$
 
+
 #####################################################################
 # install_ace: distill the minimal stuff out of the ACE+TAO distribution
 # alias cpio 'xargs -i echo {}'; # just for testing the script
@@ -232,10 +233,8 @@ if [ -z "$ACE_ROOT" ]; then
 fi
 
 if [ $install -eq 1 -a -z "$ACE_ARCH" ]; then
-    echo "- Must set target architecture before proceeding..."
-    echo "  The architecture may be set with the ACE_ARCH environment"
-    echo "  variable or the --arch option (`basename $0` -h for help)"
-    die=1
+	# just set it to blank if we want to flatten this level of subdirectory
+	ACE_ARCH=""
 fi
 
 if [ $die -ne 0 ]; then
@@ -442,16 +441,17 @@ if [ $install -ne 0 ]; then
 
     # copy TAO libs
     echo "Copying libraries..."
-    for f in `find . -type f -name "lib?*" -print`; do
+    for f in `find . -type f -name "lib?*" -not -name "*\.dsw" -not -name "*Test*" -print`; do
         echo $f
         cp $f $TAO_DIR/$ACE_ARCH/lib
     done
 
     # copy TAO executables
     echo "Copying executables..."
-    ALL_PROGS=`find orbsvcs -type f -perm -5 -print | grep -v ".*lib.*" | grep -v ".\.pl" | grep -v "/tests/" | grep -v "/examples/"`
-    ALL_PROGS="`find utils  -type f -perm -5 -print` $ALL_PROGS"
-    PROGS=`echo $ALL_PROGS | tr " " "\n" | grep -v tests/ | grep -v default.bld`
+
+    ALL_PROGS=`find orbsvcs -type f -perm +a+x -print | grep -v ".*lib.*" | grep -v ".\.pl" | grep -v test | grep -v example`
+    ALL_PROGS="`find utils  -type f -perm +a+x -print` $ALL_PROGS"
+    PROGS=`echo $ALL_PROGS | tr " " "\n" | grep -v test | grep -v default.bld | grep -v README | grep -v Makefile`
 
     for f in TAO_IDL/tao_idl $PROGS; do
         echo $f
@@ -469,11 +469,12 @@ if [ $install -ne 0 ]; then
     find ace -type f -name "*.h" -print | grep -v "^config\.h" | cpio -p -d -V $ACE_DIR/include
     find ace -type f \( -name "*.i" -o -name "*.inl" \) -print | cpio -p -d -V $ACE_DIR/include
     find ace -type f -name "*.cpp" -print | cpio -p -d -V $ACE_DIR/include
-    cp ace/config.h $ACE_DIR/$ACE_ARCH/include/ace/config.h && rm $ACE_DIR/include/ace/config.h
+    cp ace/config.h $ACE_DIR/$ACE_ARCH/include/ace/config.h
+    chmod -R a+r $ACE_DIR/$ACE_ARCH/include
 
     # copy ACE libs
     echo "Copying libraries..."
-    for f in `find . -type f -name "lib?*" -print`; do
+    for f in `find . -type f -name "lib?*" -not -name "*\.dsw" -not -name "*Test*" -print`; do
         # only copy libs if they're not already in $TAO_DIR/$ACE_ARCH/lib
         maybe_tao_lib=$TAO_DIR/$ACE_ARCH/lib/`basename $f`
         if [ ! -f $maybe_tao_lib ]; then
@@ -496,6 +497,12 @@ if [ $install -ne 0 ]; then
     echo "Copying man pages..."
     find man -type f -print | cpio -p -d -V $ACE_DIR
 
+
+   # PERMISSIONS
+   chmod -R a+r $ACE_DEST
+   find $ACE_DEST -type d -exec chmod a+x {} \;
+   find $ACE_DEST -type f -perm +a+x -exec chmod a+x {} \;
+
 fi   # if [ $install -ne 0 ]