From 80ea55e213886dc3a616b9242614aef37e2351e3 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu, 12 Jul 2007 10:16:47 +0000
Subject: [PATCH] INTEGRATION: CWS native97 (1.3.20); FILE MERGED 2007/07/10
 16:08:55 is 1.3.20.1: #i78658# checking solaris architecture

---
 solenv/bin/modules/installer/xpdinstaller.pm | 24 ++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index 7971f5da1c59..1ea9a694c480 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: xpdinstaller.pm,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: rt $ $Date: 2007-07-03 11:46:38 $
+#   last change: $Author: ihi $ $Date: 2007-07-12 11:16:47 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -754,6 +754,23 @@ sub set_packagetype_tag
     return $tag;
 }
 
+###################################################
+# Setting the architecture of installation set
+###################################################
+
+sub set_architecture_tag
+{
+    my ($indent) = @_;
+
+    my $architecture = "";
+    if ( $installer::globals::issolarissparcbuild ) { $architecture = "sparc"; }
+    if ( $installer::globals::issolarisx86build ) { $architecture = "i386"; }
+
+    my $tag = $indent . "<architecture>" . $architecture . "</architecture>" . "\n";
+
+    return $tag;
+}
+
 ###################################################
 # Collecting content for product xpd file
 ###################################################
@@ -804,6 +821,9 @@ sub get_setup_file_content
     $tag = set_packagetype_tag($singleindent);
     push(@xpdfile, $tag);
 
+    $tag = set_architecture_tag($singleindent);
+    push(@xpdfile, $tag);
+
     $tag = get_end_tag("product", $noindent);
     push(@xpdfile, $tag);