mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS native97 (1.2.2); FILE MERGED

Browse Source 
2007/07/10 16:07:13 is 1.2.2.1: #i78658# checking solaris architecture
This commit is contained in:
Ivo Hinkelmann
2007-07-12 10:18:27 +00:00
parent 1a77908732
commit 60b277f412
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: InstallData.java,v $ * $RCSfile: InstallData.java,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: rt $ $Date: 2007-07-03 11:48:43 $ * last change: $Author: ihi $ $Date: 2007-07-12 11:18:04 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -79,6 +79,7 @@ public class InstallData
static private String installRoot = null; /* Root directory for Solaris user installation */ static private String installRoot = null; /* Root directory for Solaris user installation */
static private String defaultDir = "/opt/OpenOffice.org"; static private String defaultDir = "/opt/OpenOffice.org";
static private String packageFormat = null; static private String packageFormat = null;
static private String architecture = null;
static private String packagePath = null; static private String packagePath = null;
static private String packageSubdir = "packages"; static private String packageSubdir = "packages";
static private String adminFileNameReloc = null; static private String adminFileNameReloc = null;
@@ -320,6 +321,14 @@ public class InstallData
packageFormat = format; packageFormat = format;
} }
public String getArchitecture() {
return architecture;
}
public void setArchitecture(String arch) {
architecture = arch;
}
public String getLocalTempPath() { public String getLocalTempPath() {
return localTempPath; return localTempPath;
} }

13
javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: ProductDescription.java,v $ * $RCSfile: ProductDescription.java,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: rt $ $Date: 2007-07-03 11:59:13 $ * last change: $Author: ihi $ $Date: 2007-07-12 11:18:27 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -205,6 +205,15 @@ public class ProductDescription {
} }
} }
/* check for the architecture of this installation set */
section = data.getElement("architecture");
if (section != null) {
String value = section.getValue();
if ((value != null) && (! value.equals(""))) {
installData.setArchitecture(value);
}
}
/* check for any macro definitions */ /* check for any macro definitions */
for (Enumeration e = data.elements(); e.hasMoreElements(); ) { for (Enumeration e = data.elements(); e.hasMoreElements(); ) {
XMLPackageDescription p = (XMLPackageDescription) e.nextElement(); XMLPackageDescription p = (XMLPackageDescription) e.nextElement();