*** empty log message ***

1 files changed, 98 insertions, 18 deletions

diff --git a/bin/auto_compile_win32.pl b/bin/auto_compile_win32.pl
index 4fb2ef1b193..2a43f792897 100755
--- a/bin/auto_compile_win32.pl
+++ b/bin/auto_compile_win32.pl
@@ -13,14 +13,17 @@
 ##   * Selectively build some specific configs from command line.
 ##   * Control of build/rebuild all from command line.
 
-$Ignore_error = 0;
+@Win32_Lists= ("Win32 Debug",
+               "Win32 Release",
+               "Win32 Unicode Debug",
+               "Win32 Unicode Release");
 
-@Lists= ("Win32 Debug",
-         "Win32 Release",
-         "Win32 Unicode Debug",
-         "Win32 Unicode Release");
+@Alpha_Lists= ("Win32 Alpha Debug",
+               "Win32 Alpha Release",
+               "Win32 Alpha Unicode Debug",
+               "Win32 Alpha Unicode Release");
 
-%DLL_Collections = ( "$Lists[0]" => <<EOD ,
+%Win32_DLL_Collections = ( "$Win32_Lists[0]" => <<EOD , # Debug
 ace/ace.dsw, ACE dynamic library:
 apps/gperf/src/gperf.dsw, ALL:
 TAO/tao/TAO.dsw, TAO:
@@ -28,41 +31,77 @@ TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler:
 TAO/orbsvcs/orbsvcs/orbsvcs.dsw, orbsvcs:
 tests/tests.dsw, ALL:
 EOD
-                     "$Lists[1]" => <<EOD ,
+                     "$Win32_Lists[1]" => <<EOD , # Release
 ace/ace.dsw, ACE dynamic library:
 apps/gperf/src/gperf.dsw, ALL:
 TAO/tao/TAO.dsw, TAO:
 TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler:
 TAO/orbsvcs/orbsvcs/orbsvcs.dsw, orbsvcs:
 EOD
-                     "$Lists[2]" => <<EOD ,
+                     "$Win32_Lists[2]" => <<EOD , # Unicode Debug
 ace/ace.dsw, ACE dynamic library:
 EOD
-                     "$Lists[3]" => <<EOD
+                     "$Win32_Lists[3]" => <<EOD # Unicode Release
 ace/ace.dsw, ACE dynamic library:
 EOD
                   );
 
-%Lib_Collections = ( "$Lists[0]" => <<EOD ,
+%Alpha_DLL_Collections = ( "$Alpha_Lists[0]" => <<EOD , # Debug
+ace/ace.dsw, ACE dynamic library:
+apps/gperf/src/gperf.dsw, ALL:
+TAO/tao/TAO.dsw, TAO:
+TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler:
+TAO/orbsvcs/orbsvcs/orbsvcs.dsw, orbsvcs:
+tests/tests.dsw, ALL:
+EOD
+                     "$Alpha_Lists[1]" => <<EOD , # Release
+ace/ace.dsw, ACE dynamic library:
+apps/gperf/src/gperf.dsw, ALL:
+TAO/tao/TAO.dsw, TAO:
+TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler:
+TAO/orbsvcs/orbsvcs/orbsvcs.dsw, orbsvcs:
+EOD
+                     "$Alpha_Lists[2]" => <<EOD , # Unicode Debug
+ace/ace.dsw, ACE dynamic library:
+EOD
+                     "$Alpha_Lists[3]" => <<EOD # Unicode Release
+ace/ace.dsw, ACE dynamic library:
+EOD
+                  );
+
+%Win32_Lib_Collections = ( "$Win32_Lists[0]" => <<EOD , # Debug
 ace/ace.dsw, ACE static library:
 TAO/tao/TAO.dsw, TAO Static:
 TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler Static:
 TAO/orbsvcs/orbsvcs/orbsvcs.dsw, ORB Services Static:
 EOD
-                     "$Lists[1]" => <<EOD ,
+                     "$Win32_Lists[1]" => <<EOD , # Release
 ace/ace.dsw, ACE static library:
 TAO/tao/TAO.dsw, TAO Static:
 TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler Static:
 TAO/orbsvcs/orbsvcs/orbsvcs.dsw, ORB Services Static:
 EOD
-                     "$Lists[2]" => <<EOD ,
+                     "$Win32_Lists[2]" => <<EOD , # Unicode Debug
 ace/ace.dsw, ACE static library:
 EOD
-                     "$Lists[3]" => <<EOD
+                     "$Win32_Lists[3]" => <<EOD # Unicode Release
 ace/ace.dsw, ACE static library:
 EOD
                   );
 
+%Alpha_Lib_Collections = ( "$Alpha_Lists[0]" => <<EOD , # Debug
+ace/ace.dsw, ACE static library:
+EOD
+                     "$Alpha_Lists[1]" => <<EOD , # Release
+ace/ace.dsw, ACE static library:
+EOD
+                     "$Alpha_Lists[2]" => <<EOD , # Unicode Debug
+ace/ace.dsw, ACE static library:
+EOD
+                     "$Alpha_Lists[3]" => <<EOD # Unicode Release
+ace/ace.dsw, ACE static library:
+EOD
+                  );
 
 sub Build_Config
 {
@@ -103,12 +142,53 @@ sub Build_Collection
     }
 }
 
-$Ignore_error = 1;
 
-%Target = %DLL_Collections;
-Build_Collection;
+$Ignore_error = 0;              # By default, bail out if an error occurs.
+$Build_DLL = 1;
+$Build_LIB = 1;
+@Lists = @Win32_Lists;
+@DLL_Collections = @Win32_DLL_Collections;
+@Lib_Collections = @Win32_Lib_Collections;
 
-%Target = %Lib_Collections;
-Build_Collection;
+## Parse command line argument
+while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^-/ )
+{
+    if ( $ARGV[0] eq '-k' )     # Ignore error.  Compile the whole thing
+    {
+        $Ignore_error = 1;      # in the same configuration.
+    }
+    elsif ( $ARGV[0] eq '-a' )  # Use Alpha
+    {
+        @Lists = @Alpha_Lists;
+        @DLL_Collections = @Alpha_DLL_Collections;
+        @Lib_Collections = @Alpha_Lib_Collections;
+    }
+    elsif ( $ARGV[0] eq '-D' )  # Build DLL only
+    {
+        $Build_LIB = 0;
+    }
+    elsif ( $ARGV[0] eq '-L' )  # Build LIB only
+    {
+        $Build_DLL = 0;
+    }
+    else
+    {
+        warn "$0:  unknown option $ARGV[0]\n";
+        die $usage;
+    }
+    shift;
+}
+
+if ( $Build_DLL )
+{
+    %Target = %DLL_Collections;
+    Build_Collection;
+}
+
+if ( $Build_LIB )
+{
+    %Target = %Lib_Collections;
+    Build_Collection;
+}
 
 print "End\n";