[Libreoffice-commits] .: 7 commits - configure.in instsetoo_native/inc_openoffice scp2/inc scp2/source set_soenv.in solenv/bin solenv/inc soltools/cpp
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Oct 13 12:32:14 PDT 2010
configure.in | 11
instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh | 10
instsetoo_native/inc_openoffice/unix/find-requires-x11.sh | 7
scp2/inc/macros.inc | 3
scp2/source/ooo/shortcut_ooo.scp | 16 +
scp2/source/ooo/ure.scp | 142 +++++++++++-
scp2/source/python/file_python.scp | 2
scp2/source/python/module_python_mailmerge.scp | 2
set_soenv.in | 14 -
solenv/bin/checkdll.sh | 5
solenv/bin/make_installer.pl | 12 -
solenv/bin/modules/installer/download.pm | 12 -
solenv/bin/modules/installer/epmfile.pm | 34 +-
solenv/bin/modules/installer/followme.pm | 8
solenv/bin/modules/installer/globals.pm | 4
solenv/bin/modules/installer/javainstaller.pm | 16 -
solenv/bin/modules/installer/languagepack.pm | 8
solenv/bin/modules/installer/parameter.pm | 21 +
solenv/bin/modules/installer/scriptitems.pm | 2
solenv/bin/modules/installer/worker.pm | 4
solenv/bin/modules/installer/xpdinstaller.pm | 6
solenv/inc/_tg_shl.mk | 100 ++++----
solenv/inc/productversion.mk | 32 ++
solenv/inc/tg_shl.mk | 10
solenv/inc/unitools.mk | 6
solenv/inc/unx.mk | 8
solenv/inc/unxaigppc.mk | 69 +++++
soltools/cpp/_unix.c | 4
soltools/cpp/makefile.mk | 2
29 files changed, 434 insertions(+), 136 deletions(-)
New commits:
commit 98d7d80686f78c49c5aa0ca5d6b78b2da69234e3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 15:36:37 2010 +0100
move this here to reuse it easier
diff --git a/solenv/inc/productversion.mk b/solenv/inc/productversion.mk
new file mode 100644
index 0000000..7be758f
--- /dev/null
+++ b/solenv/inc/productversion.mk
@@ -0,0 +1,32 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRODUCTLIST = libreoffice broffice.org
+
+# default values to minimize maintainance effort
+PRODUCTVERSION = 3.3
+PRODUCTVERSIONSHORT = 3
commit 0c4c9a1e3ce38ab9edf3977970a3739650f2ecc9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 15:31:15 2010 +0100
tweak for AIX
diff --git a/soltools/cpp/_unix.c b/soltools/cpp/_unix.c
index ce4ca40..8672be1 100644
--- a/soltools/cpp/_unix.c
+++ b/soltools/cpp/_unix.c
@@ -12,7 +12,7 @@
#include "cpp.h"
-#if defined MACOSX || !defined HAVE_GETOPT
+#if defined MACOSX || defined AIX || !defined HAVE_GETOPT
extern int stgetopt(int, char *const *, const char *);
extern char *optarg;
extern int optind;
@@ -42,7 +42,7 @@ void
Tokenrow tr;
setup_kwtab();
-#if defined MACOSX || !defined HAVE_GETOPT
+#if defined MACOSX || defined(AIX) || !defined HAVE_GETOPT
while ((c = stgetopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1)
#else
while ((c = getopt(argc, argv, "NOPV:I:D:U:F:A:X:u:l:+")) != -1)
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
index 533cf9a..71c581a 100644
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -55,7 +55,7 @@ OBJFILES= \
# nonstandard cpp options needed for Mac (-isysroot),
# needs the custom stgetopt defined here :/
-.IF "$(OS)" == "MACOSX" || "$(HAVE_GETOPT)" != "YES"
+.IF "$(OS)" == "MACOSX" || "$(OS)" == "AIX" || "$(HAVE_GETOPT)" != "YES"
OBJFILES += $(OBJ)$/_getopt.obj
.ENDIF
.IF "$(HAVE_GETOPT)" == "YES"
commit b495a5c330fdbc700c128a0b95118325e8d20941
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 15:19:49 2010 +0100
add AIX stuff
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index c836198..25b58b7 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -56,6 +56,11 @@ if [ -x $checkdll ]; then
*) DYLD_LIBRARY_PATH=$libpath;;
esac
export DYLD_LIBRARY_PATH;;
+ AIX) case "${LIBPATH:+X}" in
+ X) LIBPATH=$libpath:$LIBPATH;;
+ *) LIBPATH=$libpath;;
+ esac
+ export LIBPATH;;
*) case "${LD_LIBRARY_PATH:+X}" in
X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
*) LD_LIBRARY_PATH=$libpath;;
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 18ca35c..9c6c771 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -437,8 +437,8 @@ $filesinproductarrayref = installer::scriptitems::remove_delete_only_files_from_
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles2.log", $filesinproductarrayref); }
if (( ! $installer::globals::iswindowsbuild ) &&
- ( ! $installer::globals::islinuxrpmbuild ) &&
- ( ! $installer::globals::islinuxdebbuild ) &&
+ ( ! $installer::globals::isrpmbuild ) &&
+ ( ! $installer::globals::isdebbuild ) &&
( ! $installer::globals::issolarispkgbuild ) &&
( $installer::globals::packageformat ne "installed" ) &&
( $installer::globals::packageformat ne "dmg" ) &&
@@ -1486,7 +1486,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
#################################################################
# Linux Patch: The complete RPM has to be built, if one file in the RPM has the flag PATCH (also for DEBs)
- if (( $installer::globals::patch ) && (( $installer::globals::islinuxrpmbuild ) || ( $installer::globals::islinuxdebbuild )))
+ if (( $installer::globals::patch ) && (( $installer::globals::isrpmbuild ) || ( $installer::globals::isdebbuild )))
{
my $patchfiles = installer::worker::collect_all_items_with_special_flag($filesinpackage ,"PATCH");
if ( ! ( $#{$patchfiles} > -1 ))
@@ -1692,7 +1692,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# Solaris: Adding into the pkginfo file: BASEDIR=/opt
# Attention: Changing of the path can influence the shell scripts
- if (( $installer::globals::is_special_epm ) && ( ($installer::globals::islinuxrpmbuild) || ($installer::globals::issolarispkgbuild) )) # special handling only for Linux RPMs and Solaris Packages
+ if (( $installer::globals::is_special_epm ) && ( ($installer::globals::isrpmbuild) || ($installer::globals::issolarispkgbuild) )) # special handling only for Linux RPMs and Solaris Packages
{
if ( $installer::globals::call_epm ) # only do something, if epm is really executed
{
@@ -1734,7 +1734,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
if ( $installer::globals::call_epm ) { installer::epmfile::call_epm($epmexecutable, $completeepmfilename, $packagename, $includepatharrayref); }
- if (($installer::globals::islinuxrpmbuild) || ($installer::globals::issolarispkgbuild) || ($installer::globals::debian))
+ if (($installer::globals::isrpmbuild) || ($installer::globals::issolarispkgbuild) || ($installer::globals::debian))
{
$installer::globals::postprocess_standardepm = 1;
}
@@ -1802,7 +1802,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# Finalizing patch installation sets
if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild )) { installer::epmfile::finalize_patch($installer::globals::epmoutpath, $allvariableshashref); }
- if (( $installer::globals::patch ) && ( $installer::globals::islinuxrpmbuild )) { installer::epmfile::finalize_linux_patch($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref); }
+ if (( $installer::globals::patch ) && ( $installer::globals::isrpmbuild )) { installer::epmfile::finalize_linux_patch($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref); }
# Copying the xpd installer into the installation set
if (( $allvariableshashref->{'XPDINSTALLER'} ) && ( $installer::globals::isxpdplatform ) && ( $installer::globals::xpd_files_prepared ))
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 0bc616f..b7f01ff 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -657,12 +657,12 @@ sub get_install_type
{
$type = "langpack";
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
$type = $type . "-rpm";
}
- if ( $installer::globals::islinuxdebbuild )
+ if ( $installer::globals::isdebbuild )
{
$type = $type . "-deb";
}
@@ -676,12 +676,12 @@ sub get_install_type
{
$type = "install";
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
$type = $type . "-rpm";
}
- if ( $installer::globals::islinuxdebbuild )
+ if ( $installer::globals::isdebbuild )
{
$type = $type . "-deb";
}
@@ -709,7 +709,7 @@ sub get_downloadname_addon
{
my $addon = "";
- if ( $installer::globals::islinuxdebbuild ) { $addon = $addon . "_deb"; }
+ if ( $installer::globals::isdebbuild ) { $addon = $addon . "_deb"; }
if ( $installer::globals::product =~ /_wJRE\s*$/ ) { $addon = "_wJRE"; }
@@ -1914,7 +1914,7 @@ sub is_supported_platform
{
my $is_supported = 0;
- if (( $installer::globals::islinuxrpmbuild ) ||
+ if (( $installer::globals::isrpmbuild ) ||
( $installer::globals::issolarissparcbuild ) ||
( $installer::globals::issolarisx86build ) ||
( $installer::globals::iswindowsbuild ))
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index f1fd7b2..1aa66b1 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -366,7 +366,7 @@ sub create_epm_header
push(@epmheader, $line);
$line = "%release" . " " . $installer::globals::packagerevision . "\n";
- if ( $installer::globals::islinuxrpmbuild ) { $line = "%release" . " " . $installer::globals::buildid . "\n"; }
+ if ( $installer::globals::isrpmbuild ) { $line = "%release" . " " . $installer::globals::buildid . "\n"; }
push(@epmheader, $line);
# Description, Copyright and Vendor are multilingual and are defined in
@@ -585,8 +585,8 @@ sub create_epm_header
$provides = "freebsdprovides"; # the name in the packagelist
$requires = "freebsdrequires"; # the name in the packagelist
}
- elsif (( $installer::globals::islinuxrpmbuild ) &&
- ( $installer::globals::patch ) &&
+ elsif (( $installer::globals::isrpmbuild ) &&
+ ( $installer::globals::patch ) &&
( exists($onepackage->{'linuxpatchrequires'}) ))
{
$provides = "provides"; # the name in the packagelist
@@ -880,7 +880,7 @@ sub set_patch_state
push( @installer::globals::logfileinfo, $infoline);
}
- if ( ( $installer::globals::is_special_epm ) && (($installer::globals::islinuxrpmbuild) || ($installer::globals::issolarispkgbuild)) )
+ if ( ( $installer::globals::is_special_epm ) && (($installer::globals::isrpmbuild) || ($installer::globals::issolarispkgbuild)) )
{
# Special postprocess handling only for Linux RPM and Solaris packages
$installer::globals::postprocess_specialepm = 1;
@@ -994,7 +994,7 @@ sub add_one_line_into_file
push(@{$file}, $insertline); # simply adding at the end of pkginfo file
}
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
# Adding behind the line beginning with: Group:
@@ -1687,7 +1687,7 @@ sub set_tab_into_datafile
$newclassesstring = installer::converter::convert_array_to_space_separated_string(\@newclasses);
}
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
{
@@ -2011,7 +2011,7 @@ sub collect_patch_files
{
my $line = ${$file}[$i];
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
# %attr(0444,root,root) "/opt/openofficeorg20/program/about.bmp"
@@ -2101,7 +2101,7 @@ sub prepare_packages
$newline = "BASEDIR\=" . $localrelocatablepath . "\n";
}
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
# if ( $localrelocatablepath =~ /^\s*$/ ) { $localrelocatablepath = "/"; }; # at least the "/"
$filename = $packagename . ".spec";
@@ -2123,7 +2123,7 @@ sub prepare_packages
# adding new "topdir" and removing old "topdir" in specfile
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
set_topdir_in_specfile($changefile, $filename, $newepmdir);
set_autoprovreq_in_specfile($changefile, $onepackage->{'findrequires'}, "$installer::globals::unpackpath" . "/bin");
@@ -2554,7 +2554,7 @@ sub create_packages_without_epm
# Linux: rpm -bb so8m35.spec ( -> dependency check abklemmen? )
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
my $specfilename = $epmdir . $packagename . ".spec";
if (! -f $specfilename) { installer::exiter::exit_program("ERROR: Did not find file: $specfilename", "create_packages_without_epm"); }
@@ -2571,6 +2571,7 @@ sub create_packages_without_epm
my $target = "";
if ( $installer::globals::compiler =~ /unxlngi/) { $target = "i586"; }
+ if ( $installer::globals::compiler =~ /unxaigppc/) { $target = "ppc"; }
elsif ( $installer::globals::compiler =~ /unxlng/) {$target = (POSIX::uname())[4]; }
# rpm 4.6 ignores buildroot tag in spec file
@@ -2742,7 +2743,7 @@ sub remove_temporary_epm_files
# }
}
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
my $removefile = $epmdir . $packagename . ".spec";
my $destfile = $loggingdir . $packagename . ".spec.log";
@@ -2824,13 +2825,17 @@ sub create_new_directory_structure
my $newdir = $installer::globals::epmoutpath;
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
my $rpmdir;
my $machine = "";
if ( $installer::globals::compiler =~ /unxlngi/) {
$rpmdir = "$installer::globals::epmoutpath/RPMS/i586";
}
+ elsif ( $installer::globals::compiler =~ /unxaigppc/) {
+ $machine = ppc;
+ $rpmdir = "$installer::globals::epmoutpath/RPMS/$machine";
+ }
elsif ( $installer::globals::compiler =~ /unxlng/) {
$machine = (POSIX::uname())[4];
$rpmdir = "$installer::globals::epmoutpath/RPMS/$machine";
@@ -2861,6 +2866,7 @@ sub create_new_directory_structure
{
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/$machine");
}
+ installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/powerpc");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/x86_64");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i586");
installer::systemactions::remove_empty_directory("$installer::globals::epmoutpath/RPMS/i386");
@@ -3230,13 +3236,13 @@ sub analyze_rootpath
# For RPM version 3.x it is required, that Prefix is not "/" in spec file. In this case --relocate will not work,
# because RPM 3.x says, that the package is not relocatable. Therefore we have to use Prefix=/opt and for
# all usages of --relocate this path has to be on both sides of the "=": --relocate /opt=<myselectdir>/opt .
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
$$relocatablepathref = $rootpath . "\/"; # relocatable path must end with "/", will be "/opt/"
$$staticpathref = $installer::globals::officedirhostname; # to be used as replacement in shell scripts
}
- if ( $installer::globals::islinuxdebbuild )
+ if ( $installer::globals::isdebbuild )
{
$$relocatablepathref = "";
# $$staticpathref is already "/opt/openoffice.org3", no additional $rootpath required.
diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm
index fc7a2de..19a0d6e 100644
--- a/solenv/bin/modules/installer/followme.pm
+++ b/solenv/bin/modules/installer/followme.pm
@@ -70,11 +70,11 @@ sub save_followme_info
push(@filecontent, "globals:issolarisx86build: $installer::globals::issolarisx86build\n");
push(@filecontent, "globals:isfreebsdpkgbuild: $installer::globals::isfreebsdpkgbuild\n");
push(@filecontent, "globals:islinuxbuild: $installer::globals::islinuxbuild\n");
- push(@filecontent, "globals:islinuxrpmbuild: $installer::globals::islinuxrpmbuild\n");
+ push(@filecontent, "globals:isrpmbuild: $installer::globals::isrpmbuild\n");
push(@filecontent, "globals:islinuxintelrpmbuild: $installer::globals::islinuxintelrpmbuild\n");
push(@filecontent, "globals:islinuxppcrpmbuild: $installer::globals::islinuxppcrpmbuild\n");
push(@filecontent, "globals:islinuxx86_64rpmbuild: $installer::globals::islinuxx86_64rpmbuild\n");
- push(@filecontent, "globals:islinuxdebbuild: $installer::globals::islinuxdebbuild\n");
+ push(@filecontent, "globals:isdebbuild: $installer::globals::isdebbuild\n");
push(@filecontent, "globals:islinuxinteldebbuild: $installer::globals::islinuxinteldebbuild\n");
push(@filecontent, "globals:islinuxppcdebbuild: $installer::globals::islinuxppcdebbuild\n");
push(@filecontent, "globals:islinuxx86_64debbuild: $installer::globals::islinuxx86_64debbuild\n");
@@ -169,11 +169,11 @@ sub read_followme_info
if ( $name eq "issolarisx86build" ) { $installer::globals::issolarisx86build = $value; }
if ( $name eq "isfreebsdpkgbuild" ) { $installer::globals::isfreebsdpkgbuild = $value; }
if ( $name eq "islinuxbuild" ) { $installer::globals::islinuxbuild = $value; }
- if ( $name eq "islinuxrpmbuild" ) { $installer::globals::islinuxrpmbuild = $value; }
+ if ( $name eq "isrpmbuild" ) { $installer::globals::isrpmbuild = $value; }
if ( $name eq "islinuxintelrpmbuild" ) { $installer::globals::islinuxintelrpmbuild = $value; }
if ( $name eq "islinuxppcrpmbuild" ) { $installer::globals::islinuxppcrpmbuild = $value; }
if ( $name eq "islinuxx86_64rpmbuild" ) { $installer::globals::islinuxx86_64rpmbuild = $value; }
- if ( $name eq "islinuxdebbuild" ) { $installer::globals::islinuxdebbuild = $value; }
+ if ( $name eq "isdebbuild" ) { $installer::globals::isdebbuild = $value; }
if ( $name eq "islinuxinteldebbuild" ) { $installer::globals::islinuxinteldebbuild = $value; }
if ( $name eq "islinuxppcdebbuild" ) { $installer::globals::islinuxppcdebbuild = $value; }
if ( $name eq "islinuxx86_64debbuild" ) { $installer::globals::islinuxx86_64debbuild = $value; }
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 19f85bf..7d85f73 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -125,8 +125,8 @@ BEGIN
$ismacosx = 0;
$iswindowsbuild = 0;
$islinuxbuild = 0;
- $islinuxrpmbuild = 0;
- $islinuxdebbuild = 0;
+ $isrpmbuild = 0;
+ $isdebbuild = 0;
$islinuxintelrpmbuild = 0;
$islinuxppcrpmbuild = 0;
$islinuxinteldebbuild = 0;
diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm
index c873aab..57ed700 100644
--- a/solenv/bin/modules/installer/javainstaller.pm
+++ b/solenv/bin/modules/installer/javainstaller.pm
@@ -585,7 +585,7 @@ sub remove_package
$packagestring = "\<pkgunit";
$namestring = "pkgName";
}
- elsif ( $installer::globals::islinuxrpmbuild )
+ elsif ( $installer::globals::isrpmbuild )
{
$packagestring = "\<rpmunit";
$namestring = "rpmUniqueName";
@@ -752,7 +752,7 @@ sub remove_font_package_from_unit
$packagestring = "\<pkgunit";
$namestring = "pkgName";
}
- elsif ( $installer::globals::islinuxrpmbuild )
+ elsif ( $installer::globals::isrpmbuild )
{
$packagestring = "\<rpmunit";
$namestring = "rpmUniqueName";
@@ -1110,7 +1110,7 @@ sub create_empty_packages
# "-novalidate" does not work for Linux RPMs
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
for ( my $i = 0; $i <= $#{$xmlfile}; $i++ )
{
@@ -1353,7 +1353,7 @@ sub get_all_packages_in_installdir
my $directory = $installdir . $installer::globals::separator . $subdir;
$directory =~ s/\Q$installer::globals::separator\E\s*$//;
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
$allrpms = installer::systemactions::find_file_with_file_extension("rpm", $directory);
@@ -1798,7 +1798,7 @@ sub create_java_installer
{
$xmlfilename = "pkgUnit.xml";
}
- elsif ( $installer::globals::islinuxrpmbuild )
+ elsif ( $installer::globals::isrpmbuild )
{
$xmlfilename = "rpmUnit.xml";
}
@@ -1817,14 +1817,14 @@ sub create_java_installer
my $xmlfilename3 = $xmlfilename . ".test3";
installer::files::save_file($xmlfilename3, $xmlfile);
substitute_variables($xmlfile, $allvariableshashref);
- if (( $installer::globals::islinuxrpmbuild ) && ( $#installer::globals::linkrpms > -1 )) { prepare_linkrpm_in_xmlfile($xmlfile,\@installer::globals::linkrpms); }
+ if (( $installer::globals::isrpmbuild ) && ( $#installer::globals::linkrpms > -1 )) { prepare_linkrpm_in_xmlfile($xmlfile,\@installer::globals::linkrpms); }
if ( $installer::globals::issolarisx86build || $installer::globals::islinuxbuild ) { remove_w4w_from_xmlfile($xmlfile); }
remove_module_if_not_defined($xmlfile, $modulesarrayref, "gid_Module_Optional_Onlineupdate");
replace_component_names($xmlfile, $templatefilename, $modulesarrayref, $javatemplateorigfile, $ulffile);
my $xmlfilename4 = $xmlfilename . ".test4";
installer::files::save_file($xmlfilename4, $xmlfile);
- if ( $installer::globals::islinuxrpmbuild ) { put_rpmpath_into_xmlfile($xmlfile, $listofpackages); }
- if ( $installer::globals::islinuxrpmbuild ) { put_filesize_into_xmlfile($xmlfile, $listofpackages); }
+ if ( $installer::globals::isrpmbuild ) { put_rpmpath_into_xmlfile($xmlfile, $listofpackages); }
+ if ( $installer::globals::isrpmbuild ) { put_filesize_into_xmlfile($xmlfile, $listofpackages); }
installer::files::save_file($xmlfilename, $xmlfile);
$infoline = "Saving xml file: $xmlfilename\n";
push( @installer::globals::logfileinfo, $infoline);
diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm
index 2100467..e46dbc7 100644
--- a/solenv/bin/modules/installer/languagepack.pm
+++ b/solenv/bin/modules/installer/languagepack.pm
@@ -232,7 +232,7 @@ sub determine_packagename
my $packagename = "";
my $allnames = "";
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
# determining the rpm file in directory $installdir
@@ -295,13 +295,13 @@ sub put_packagename_into_script
if ( $installer::globals::issolarisbuild ) { $installline = " /usr/sbin/pkgadd -d \$outdir -a \$adminfile"; }
- if ( $installer::globals::islinuxrpmbuild ) { $installline = " rpm --prefix \$PRODUCTINSTALLLOCATION --replacepkgs -i"; }
+ if ( $installer::globals::isrpmbuild ) { $installline = " rpm --prefix \$PRODUCTINSTALLLOCATION --replacepkgs -i"; }
for ( my $i = 0; $i <= $#{$allnames}; $i++ )
{
if ( $installer::globals::issolarisbuild ) { $installline = $installline . " ${$allnames}[$i]"; }
- if ( $installer::globals::islinuxrpmbuild ) { $installline = $installline . " \$outdir/${$allnames}[$i]"; }
+ if ( $installer::globals::isrpmbuild ) { $installline = $installline . " \$outdir/${$allnames}[$i]"; }
}
for ( my $j = 0; $j <= $#{$scriptfile}; $j++ )
@@ -411,7 +411,7 @@ sub determine_scriptfile_name
my $scriptfilename = $packagename;
-# if ( $installer::globals::islinuxrpmbuild ) { $scriptfilename =~ s/\.rpm\s*$/\.sh/; }
+# if ( $installer::globals::isrpmbuild ) { $scriptfilename =~ s/\.rpm\s*$/\.sh/; }
# if ( $installer::globals::issolarisbuild ) { $scriptfilename =~ s/\.tar\.gz\s*$/\.sh/; }
$scriptfilename =~ s/\.tar\.gz\s*$/\.sh/;
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 204d2ca..6e0c05e 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -314,12 +314,23 @@ sub setglobalvariables
if ( $installer::globals::compiler =~ /unxso[lg]i/ ) { $installer::globals::issolarisx86build = 1; }
+ if ($ENV{OS} eq 'AIX')
+ {
+ if ( $installer::globals::packageformat eq "rpm" )
+ {
+ $installer::globals::isrpmbuild = 1;
+ $installer::globals::isxpdplatform = 1;
+ $installer::globals::epmoutpath = "RPMS";
+ }
+ if ( $installer::globals::rpm eq "" ) { installer::exiter::exit_program("ERROR: Environment variable \"\$RPM\" has to be defined!", "setglobalvariables"); }
+ }
+
if ($ENV{OS} eq 'LINUX')
{
$installer::globals::islinuxbuild = 1;
if ( $installer::globals::packageformat eq "rpm" )
{
- $installer::globals::islinuxrpmbuild = 1;
+ $installer::globals::isrpmbuild = 1;
$installer::globals::isxpdplatform = 1;
$installer::globals::epmoutpath = "RPMS";
if ( $installer::globals::compiler =~ /unxlngi/ )
@@ -346,8 +357,8 @@ sub setglobalvariables
my $message = "Creating Debian packages";
installer::logger::print_message( $message );
push(@installer::globals::globallogfileinfo, $message);
- $installer::globals::islinuxrpmbuild = 0;
- $installer::globals::islinuxdebbuild = 1;
+ $installer::globals::isrpmbuild = 0;
+ $installer::globals::isdebbuild = 1;
$installer::globals::epmoutpath = "DEBS";
if ( $installer::globals::compiler =~ /unxlngi/ )
{
@@ -411,7 +422,7 @@ sub setglobalvariables
# setting jds exclude file list
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
$installer::globals::jdsexcludefilename = "jds_excludefiles_linux.txt";
}
@@ -545,7 +556,7 @@ sub control_required_parameter
# for Solaris packages and Linux
#######################################
- if (( $installer::globals::patch ) && ( ! $installer::globals::issolarispkgbuild ) && ( ! $installer::globals::islinuxrpmbuild ) && ( ! $installer::globals::islinuxdebbuild ) && ( ! $installer::globals::iswindowsbuild ) && ( ! $installer::globals::ismacdmgbuild ))
+ if (( $installer::globals::patch ) && ( ! $installer::globals::issolarispkgbuild ) && ( ! $installer::globals::isrpmbuild ) && ( ! $installer::globals::isdebbuild ) && ( ! $installer::globals::iswindowsbuild ) && ( ! $installer::globals::ismacdmgbuild ))
{
installer::logger::print_error( "Sorry, Patch flag currently only available for Solaris pkg, Linux RPM and Windows builds!" );
usage();
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 5a4e691..ee5a8c6 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -2927,7 +2927,7 @@ sub filter_layerlinks_from_unixlinks
if ( $styles =~ /\bLAYERLINK\b/ )
{
# Platforms, that do not need the layer links
- if (( $installer::globals::islinuxrpmbuild ) || ( $installer::globals::issolarispkgbuild ))
+ if (( $installer::globals::isrpmbuild ) || ( $installer::globals::issolarispkgbuild ))
{
$isrequired = 0;
}
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 2c26290..1bd58b2 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -1860,7 +1860,7 @@ sub get_all_packages_in_installdir
my @allpackages = ();
my $allpackages = \@allpackages;
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
$allpackages = installer::systemactions::find_file_with_file_extension("rpm", $directory);
}
@@ -1930,7 +1930,7 @@ sub copy_all_packages
if ( ! is_matching($packagename, $allexcludepackages ) )
{
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
my $sourcepackage = $sourcedir . $installer::globals::separator . $packagename;
my $destfile = $destdir . $installer::globals::separator . $packagename;
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index 914259b..975ff0d 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -579,7 +579,7 @@ sub get_size_value
my $isrpmfile = 0;
if ( $packagename =~ /\.rpm\s*$/ ) { $isrpmfile = 1; }
- if (( $installer::globals::islinuxrpmbuild ) && ( $isrpmfile ))
+ if (( $installer::globals::isrpmbuild ) && ( $isrpmfile ))
{
# if ( ! $installer::globals::rpmquerycommand ) { installer::exiter::exit_program("ERROR: rpm not found for querying packages!", "get_size_value"); }
if ( ! $installer::globals::rpmquerycommand ) { $installer::globals::rpmquerycommand = "rpm"; }
@@ -658,7 +658,7 @@ sub get_md5_value
return $value;
}
- if ( $installer::globals::islinuxrpmbuild )
+ if ( $installer::globals::isrpmbuild )
{
my $md5file = "/usr/bin/md5sum";
@@ -712,7 +712,7 @@ sub get_fullpkgname_value
my $isrpmfile = 0;
if ( $packagename =~ /\.rpm\s*$/ ) { $isrpmfile = 1; }
- if (( $installer::globals::islinuxrpmbuild ) && ( $isrpmfile ))
+ if (( $installer::globals::isrpmbuild ) && ( $isrpmfile ))
{
if ( $xpdinfo->{'FullPackageName'} )
{
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 3d91783..3c4662e 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -2,10 +2,6 @@
.IF "$(SHL1TARGETN)"!=""
-.IF "$(OS)"=="AIX"
-SHL1STDLIBS=
-.ENDIF
-
.IF "$(SHLLINKARCONLY)" != ""
SHL1STDLIBS=
STDSHL=
@@ -100,7 +96,9 @@ $(USE_SHL1VERSIONMAP) .PHONY:
.ENDIF # "$(SHL1VERSIONMAP)"!=""
+.IF "$(OS)" != "AIX"
SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
+.ENDIF
$(USE_SHL1VERSIONMAP): \
$(SHL1OBJS)\
@@ -137,7 +135,9 @@ $(USE_SHL1VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL1VERSIONMAP)"!=""
USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
+.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL1VERSIONMAP): $(SHL1OBJS) $(SHL1LIBS)
@@ -185,7 +185,7 @@ $(USE_SHL1VERSIONMAP) .ERRREMOVE: $(SHL1VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -554,10 +554,6 @@ runtest_$(SHL1TARGET) : $(SHL1TARGETN)
.IF "$(SHL2TARGETN)"!=""
-.IF "$(OS)"=="AIX"
-SHL2STDLIBS=
-.ENDIF
-
.IF "$(SHLLINKARCONLY)" != ""
SHL2STDLIBS=
STDSHL=
@@ -652,7 +648,9 @@ $(USE_SHL2VERSIONMAP) .PHONY:
.ENDIF # "$(SHL2VERSIONMAP)"!=""
+.IF "$(OS)" != "AIX"
SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
+.ENDIF
$(USE_SHL2VERSIONMAP): \
$(SHL2OBJS)\
@@ -689,7 +687,9 @@ $(USE_SHL2VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL2VERSIONMAP)"!=""
USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
+.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL2VERSIONMAP): $(SHL2OBJS) $(SHL2LIBS)
@@ -737,7 +737,7 @@ $(USE_SHL2VERSIONMAP) .ERRREMOVE: $(SHL2VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -1106,10 +1106,6 @@ runtest_$(SHL2TARGET) : $(SHL2TARGETN)
.IF "$(SHL3TARGETN)"!=""
-.IF "$(OS)"=="AIX"
-SHL3STDLIBS=
-.ENDIF
-
.IF "$(SHLLINKARCONLY)" != ""
SHL3STDLIBS=
STDSHL=
@@ -1204,7 +1200,9 @@ $(USE_SHL3VERSIONMAP) .PHONY:
.ENDIF # "$(SHL3VERSIONMAP)"!=""
+.IF "$(OS)" != "AIX"
SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
+.ENDIF
$(USE_SHL3VERSIONMAP): \
$(SHL3OBJS)\
@@ -1241,7 +1239,9 @@ $(USE_SHL3VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL3VERSIONMAP)"!=""
USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
+.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL3VERSIONMAP): $(SHL3OBJS) $(SHL3LIBS)
@@ -1289,7 +1289,7 @@ $(USE_SHL3VERSIONMAP) .ERRREMOVE: $(SHL3VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -1658,10 +1658,6 @@ runtest_$(SHL3TARGET) : $(SHL3TARGETN)
.IF "$(SHL4TARGETN)"!=""
-.IF "$(OS)"=="AIX"
-SHL4STDLIBS=
-.ENDIF
-
.IF "$(SHLLINKARCONLY)" != ""
SHL4STDLIBS=
STDSHL=
@@ -1756,7 +1752,9 @@ $(USE_SHL4VERSIONMAP) .PHONY:
.ENDIF # "$(SHL4VERSIONMAP)"!=""
+.IF "$(OS)" != "AIX"
SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
+.ENDIF
$(USE_SHL4VERSIONMAP): \
$(SHL4OBJS)\
@@ -1793,7 +1791,9 @@ $(USE_SHL4VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL4VERSIONMAP)"!=""
USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
+.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL4VERSIONMAP): $(SHL4OBJS) $(SHL4LIBS)
@@ -1841,7 +1841,7 @@ $(USE_SHL4VERSIONMAP) .ERRREMOVE: $(SHL4VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -2210,10 +2210,6 @@ runtest_$(SHL4TARGET) : $(SHL4TARGETN)
.IF "$(SHL5TARGETN)"!=""
-.IF "$(OS)"=="AIX"
-SHL5STDLIBS=
-.ENDIF
-
.IF "$(SHLLINKARCONLY)" != ""
SHL5STDLIBS=
STDSHL=
@@ -2308,7 +2304,9 @@ $(USE_SHL5VERSIONMAP) .PHONY:
.ENDIF # "$(SHL5VERSIONMAP)"!=""
+.IF "$(OS)" != "AIX"
SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
+.ENDIF
$(USE_SHL5VERSIONMAP): \
$(SHL5OBJS)\
@@ -2345,7 +2343,9 @@ $(USE_SHL5VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL5VERSIONMAP)"!=""
USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
+.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL5VERSIONMAP): $(SHL5OBJS) $(SHL5LIBS)
@@ -2393,7 +2393,7 @@ $(USE_SHL5VERSIONMAP) .ERRREMOVE: $(SHL5VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -2762,10 +2762,6 @@ runtest_$(SHL5TARGET) : $(SHL5TARGETN)
.IF "$(SHL6TARGETN)"!=""
-.IF "$(OS)"=="AIX"
-SHL6STDLIBS=
-.ENDIF
-
.IF "$(SHLLINKARCONLY)" != ""
SHL6STDLIBS=
STDSHL=
@@ -2860,7 +2856,9 @@ $(USE_SHL6VERSIONMAP) .PHONY:
.ENDIF # "$(SHL6VERSIONMAP)"!=""
+.IF "$(OS)" != "AIX"
SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
+.ENDIF
$(USE_SHL6VERSIONMAP): \
$(SHL6OBJS)\
@@ -2897,7 +2895,9 @@ $(USE_SHL6VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL6VERSIONMAP)"!=""
USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
+.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL6VERSIONMAP): $(SHL6OBJS) $(SHL6LIBS)
@@ -2945,7 +2945,7 @@ $(USE_SHL6VERSIONMAP) .ERRREMOVE: $(SHL6VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -3314,10 +3314,6 @@ runtest_$(SHL6TARGET) : $(SHL6TARGETN)
.IF "$(SHL7TARGETN)"!=""
-.IF "$(OS)"=="AIX"
-SHL7STDLIBS=
-.ENDIF
-
.IF "$(SHLLINKARCONLY)" != ""
SHL7STDLIBS=
STDSHL=
@@ -3412,7 +3408,9 @@ $(USE_SHL7VERSIONMAP) .PHONY:
.ENDIF # "$(SHL7VERSIONMAP)"!=""
+.IF "$(OS)" != "AIX"
SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
+.ENDIF
$(USE_SHL7VERSIONMAP): \
$(SHL7OBJS)\
@@ -3449,7 +3447,9 @@ $(USE_SHL7VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL7VERSIONMAP)"!=""
USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
+.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL7VERSIONMAP): $(SHL7OBJS) $(SHL7LIBS)
@@ -3497,7 +3497,7 @@ $(USE_SHL7VERSIONMAP) .ERRREMOVE: $(SHL7VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -3866,10 +3866,6 @@ runtest_$(SHL7TARGET) : $(SHL7TARGETN)
.IF "$(SHL8TARGETN)"!=""
-.IF "$(OS)"=="AIX"
-SHL8STDLIBS=
-.ENDIF
-
.IF "$(SHLLINKARCONLY)" != ""
SHL8STDLIBS=
STDSHL=
@@ -3964,7 +3960,9 @@ $(USE_SHL8VERSIONMAP) .PHONY:
.ENDIF # "$(SHL8VERSIONMAP)"!=""
+.IF "$(OS)" != "AIX"
SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
+.ENDIF
$(USE_SHL8VERSIONMAP): \
$(SHL8OBJS)\
@@ -4001,7 +3999,9 @@ $(USE_SHL8VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL8VERSIONMAP)"!=""
USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
+.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL8VERSIONMAP): $(SHL8OBJS) $(SHL8LIBS)
@@ -4049,7 +4049,7 @@ $(USE_SHL8VERSIONMAP) .ERRREMOVE: $(SHL8VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -4418,10 +4418,6 @@ runtest_$(SHL8TARGET) : $(SHL8TARGETN)
.IF "$(SHL9TARGETN)"!=""
-.IF "$(OS)"=="AIX"
-SHL9STDLIBS=
-.ENDIF
-
.IF "$(SHLLINKARCONLY)" != ""
SHL9STDLIBS=
STDSHL=
@@ -4516,7 +4512,9 @@ $(USE_SHL9VERSIONMAP) .PHONY:
.ENDIF # "$(SHL9VERSIONMAP)"!=""
+.IF "$(OS)" != "AIX"
SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
+.ENDIF
$(USE_SHL9VERSIONMAP): \
$(SHL9OBJS)\
@@ -4553,7 +4551,9 @@ $(USE_SHL9VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL9VERSIONMAP)"!=""
USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
+.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL9VERSIONMAP): $(SHL9OBJS) $(SHL9LIBS)
@@ -4601,7 +4601,7 @@ $(USE_SHL9VERSIONMAP) .ERRREMOVE: $(SHL9VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
@@ -4970,10 +4970,6 @@ runtest_$(SHL9TARGET) : $(SHL9TARGETN)
.IF "$(SHL10TARGETN)"!=""
-.IF "$(OS)"=="AIX"
-SHL10STDLIBS=
-.ENDIF
-
.IF "$(SHLLINKARCONLY)" != ""
SHL10STDLIBS=
STDSHL=
@@ -5068,7 +5064,9 @@ $(USE_SHL10VERSIONMAP) .PHONY:
.ENDIF # "$(SHL10VERSIONMAP)"!=""
+.IF "$(OS)" != "AIX"
SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
+.ENDIF
$(USE_SHL10VERSIONMAP): \
$(SHL10OBJS)\
@@ -5105,7 +5103,9 @@ $(USE_SHL10VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL10VERSIONMAP)"!=""
USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
+.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL10VERSIONMAP): $(SHL10OBJS) $(SHL10LIBS)
@@ -5153,7 +5153,7 @@ $(USE_SHL10VERSIONMAP) .ERRREMOVE: $(SHL10VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 170947c..30e12fa 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -31,10 +31,6 @@
.IF "$(SHL$(TNR)TARGETN)"!=""
-.IF "$(OS)"=="AIX"
-SHL$(TNR)STDLIBS=
-.ENDIF
-
.IF "$(SHLLINKARCONLY)" != ""
SHL$(TNR)STDLIBS=
STDSHL=
@@ -129,7 +125,9 @@ $(USE_SHL$(TNR)VERSIONMAP) .PHONY:
.ENDIF # "$(SHL$(TNR)VERSIONMAP)"!=""
+.IF "$(OS)" != "AIX"
SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
+.ENDIF
$(USE_SHL$(TNR)VERSIONMAP): \
$(SHL$(TNR)OBJS)\
@@ -166,7 +164,9 @@ $(USE_SHL$(TNR)VERSIONMAP) :
#and now for the plain non-generic way...
.IF "$(SHL$(TNR)VERSIONMAP)"!=""
USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e)
+.IF "$(OS)" != "AIX"
SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
+.ENDIF
.IF "$(OS)"=="MACOSX"
$(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
@@ -214,7 +214,7 @@ $(USE_SHL$(TNR)VERSIONMAP) .ERRREMOVE: $(SHL$(TNR)VERSIONMAP)
.ENDIF # "$(GUI)" != "UNX"
.IF "$(UNIXVERSIONNAMES)"!=""
-.IF "$(OS)"!="MACOSX"
+.IF "$(OS)"!="MACOSX" && "$(OS)"!="AIX"
.IF "$(GUI)"=="UNX"
SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\"
.ENDIF # "$(GUI)"!="UNX"
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 7e12a9e..3d7da3e 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -118,6 +118,12 @@ GNUCOPY*=gnucp
GNUPATCH*=gnupatch
GNUTAR*=/usr/sfw/bin/gtar
DEREFERENCE=
+.ELIF "$(OS)"=="AIX"
+AWK*=/opt/freeware/bin/awk
+GNUCOPY*=cp
+GNUPATCH*=/opt/freeware/bin/patch
+GNUTAR*=gtar
+DEREFERENCE=-L
.ELSE # "$(OS)"=="SOLARIS"
AWK*=awk
GNUCOPY*=cp
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index a05b462..f7364ba 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -99,6 +99,10 @@
.INCLUDE : unxlngppc64.mk
.ENDIF
+.IF "$(COM)$(OS)$(CPU)" == "GCCAIXP"
+.INCLUDE : unxaigppc.mk
+.ENDIF
+
.IF "$(COM)$(OS)$(CPU)$(CPUNAME)" == "GCCLINUX3S390"
.INCLUDE : unxlngs390.mk
.ENDIF
@@ -127,10 +131,6 @@
.INCLUDE : unxbsda.mk
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "ICCAIXP"
-.INCLUDE : unxaixp.mk
-.ENDIF
-
.IF "$(COM)$(CVER)$(OS)$(CPU)" == "GCCC295NETBSDI"
.INCLUDE : unxbsdi.mk
.ENDIF
diff --git a/solenv/inc/unxaigppc.mk b/solenv/inc/unxaigppc.mk
new file mode 100644
index 0000000..0a93729
--- /dev/null
+++ b/solenv/inc/unxaigppc.mk
@@ -0,0 +1,69 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# mk file for Unix AIX PowerPC using GCC, please make generic modifications to unxlng.mk
+
+LIBSALCPPRT*=-Wl,-bnogc -lsalcpprt -Wl,-bgc
+
+.INCLUDE : unxlngppc.mk
+
+CDEFS+=-D_THREAD_SAFE
+
+.INCLUDE : productversion.mk
+
+COLON=":"
+URELIBDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/ure-link/lib))
+UREBINDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/ure-link/bin))
+BASISPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/program))
+BRANDPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/program))
+
+LINKFLAGSRUNPATH_URELIB:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_UREBIN:=-Wl,-blibpath:$(URELIBDIRS):$(UREBINDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BASISPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_SDK:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_BRAND:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(BASISPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_BOXT:=-Wl,-blibpath:$(BASISPROGRAMDIRS):/usr/lib:/lib
+LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath
+
+LINKFLAGSAPPGUI:=
+LINKFLAGSAPPCUI:=
+
+LINKVERSIONMAPFLAG:=
+
+SONAME_SWITCH:=
+
+STDLIBGUIMT:=-ldl -lpthread -lm
+STDLIBCUIMT:=-ldl -lpthread -lm
+STDSHLGUIMT:=-ldl -lpthread -lm
+STDSHLCUIMT:=-ldl -lpthread -lm
+X11LINK_DYNAMIC:=-lXext -lX11
+
+DLLPOSTFIX:=ap
+
+CFLAGSDEBUG:=
+
+OOO_LIBRARY_PATH_VAR=LIBPATH
commit 230294d85f302d93029c3a98018d8e117a3b88dc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 15:08:50 2010 +0100
AIX tweaks
diff --git a/set_soenv.in b/set_soenv.in
index b2d6b09..492ead6 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -778,16 +778,11 @@ elsif ( $platform =~ m/darwin/ )
}
elsif ( $platform =~ m/aix/ )
{
- if( $platform !~ m/^powerpc/ )
- {
- print "\nAIX has only been ported and tested on powerpc\n";
- AddWarning( "set_soenv", "Platform $platform has not been tested");
- }
print "Setting AIX PPC specific values... ";
$outfile = "aixPPCEnv.Set";
$CPU = "P";
$CPUNAME = "POWERPC";
- $OUTPATH = "unxlngppc";
+ $OUTPATH = "unxaigppc";
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
@@ -1380,7 +1375,7 @@ $SOLARINC = $I.$cur_dir.
$I.'$SOLARENV'.$INC.
$I.'$SRC_ROOT'.$ds."res";
-if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd/)
+if ($platform =~ m/solaris|linux|osf1|freebsd|netbsd|aix/)
{
$SOLARINC .= $STLPORT_stlport;
if ($platform =~ m/linux|freebsd|netbsd/)
@@ -1425,13 +1420,16 @@ if ($platform =~ m/linux/)
elsif ($platform =~ m/netbsd/)
{ $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
}
+ elsif ( $platform =~ m/aix/ )
+ { $SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."aix";
+ }
#java threads include path
$SOLARINC .=$I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include";
}
#The tail, if needed
- if ($platform =~ m/linux|freebsd|netbsd/)
+ if ($platform =~ m/linux|freebsd|netbsd|aix/)
{ $SOLARINC .= $I.$XINC;
}
elsif ($platform =~ m/osf1/)
commit a9860d216548ca3ba5e58430f0f20617b2707f67
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 15:07:36 2010 +0100
AIX tweaks
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 3ff244e..ee8071d 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -562,6 +562,7 @@ End
#define SCP2_URE_DL_BARE(n) n ".dll"
#define SCP2_URE_DL_VER(n, v) n v ".dll"
#define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
+#define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
#define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
@@ -577,6 +578,8 @@ End
#define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v
#define SCP2_URE_DL_COMID_VER(n, v) \
"lib" n STRING(COMID) STRING(UNXSUFFIX) "." v
+#define SCP2_URE_DL_COMID_NORMAL(n) \
+ "lib" n STRING(COMID) STRING(UNXSUFFIX)
#define SCP2_URE_DL_UNO_VER(n, v) "libuno_" n STRING(UNXSUFFIX) "." v
#define SCP2_URE_DL_UNO_NORMAL(n) "libuno_" n STRING(UNXSUFFIX)
#define SCP2_URE_DL_UNO_COMID_VER(n, v) \
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index fb43b04..482a29a 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -33,28 +33,44 @@
Shortcut gid_Shortcut_Lib_Icudata
FileID = gid_File_Lib_Icudata;
Dir = SCP2_OOO_BIN_DIR;
+#ifndef AIX
Name = STRING(CONCAT5(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
+#else
+ Name = "libicudata.so";
+#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icui18n
FileID = gid_File_Lib_Icui18n;
Dir = SCP2_OOO_BIN_DIR;
+#ifndef AIX
Name = STRING(CONCAT5(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
+#else
+ Name = "libicui18n.so";
+#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icule
FileID = gid_File_Lib_Icule;
Dir = SCP2_OOO_BIN_DIR;
+#ifndef AIX
Name = STRING(CONCAT5(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
+#else
+ Name = "libicule.so";
+#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icuuc
FileID = gid_File_Lib_Icuuc;
Dir = SCP2_OOO_BIN_DIR;
+#ifndef AIX
Name = STRING(CONCAT5(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
+#else
+ Name = "libicuuc.so";
+#endif
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 008df5d..131562c 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -246,6 +246,16 @@ File gid_File_Dl_Cppu
// CompID = "36C01AC6-BB0A-4181-A8B8-50B793ADEDB7";
End
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Cppu
+ BIN_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ Name = SCP2_URE_DL_UNO_NORMAL("cppu");
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Target = SCP2_URE_DL_UNO_VER("cppu", "3");
+End
+#endif
+
File gid_File_Dl_Cppuhelper
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -254,6 +264,16 @@ File gid_File_Dl_Cppuhelper
// CompID = "D2A191E6-2023-41F5-9032-B98C50C37964";
End
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Cppuhelper
+ BIN_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Target = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
+End
+#endif
+
File gid_File_Dl_PurpEnvHelper
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -262,6 +282,16 @@ File gid_File_Dl_PurpEnvHelper
// CompID = "C80146A8-A14C-44D1-AB9F-D9D8BF22277E";
End
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_PurpEnvHelper
+ BIN_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Target = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
+End
+#endif
+
File gid_File_Dl_Sal
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -270,6 +300,16 @@ File gid_File_Dl_Sal
// CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
End
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Sal
+ BIN_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ Name = SCP2_URE_DL_UNO_NORMAL("sal");
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Target = SCP2_URE_DL_UNO_VER("sal", "3");
+End
+#endif
+
File gid_File_Dl_Salhelper
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -278,6 +318,16 @@ File gid_File_Dl_Salhelper
// CompID = "879B80E0-F6E1-4931-8EE6-7CF867CB6AA5";
End
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Salhelper
+ BIN_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Target = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
+End
+#endif
+
// Private Dynamic Libraries:
File gid_File_Dl_Profile_Uno
@@ -296,6 +346,16 @@ File gid_File_Dl_Reg
// CompID = "D5313B1F-D09F-401F-B180-891F70D489ED";
End
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Reg
+ BIN_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ Name = SCP2_URE_DL_NORMAL("reg");
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Target = SCP2_URE_DL_VER("reg", "3");
+End
+#endif
+
File gid_File_Dl_Rmcxt
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -304,6 +364,17 @@ File gid_File_Dl_Rmcxt
// CompID = "E0C091E3-7C18-4C32-B9CF-4D95AC243801";
End
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Rmcxt
+ BIN_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ Name = SCP2_URE_DL_NORMAL("rmcxt");
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Target = SCP2_URE_DL_VER("rmcxt", "3");
+End
+#endif
+
+
File gid_File_Dl_Store
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -312,6 +383,16 @@ File gid_File_Dl_Store
// CompID = "A5477BD7-89A3-44AF-8B42-9E28D55C8066";
End
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Store
+ BIN_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ Name = SCP2_URE_DL_NORMAL("store");
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Target = SCP2_URE_DL_VER("store", "3");
+End
+#endif
+
File gid_File_Dl_Jvmaccess
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -320,6 +401,16 @@ File gid_File_Dl_Jvmaccess
// CompID = "F3D6F794-DA6F-4522-B3A7-C15593C1A577";
End
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Jvmaccess
+ BIN_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ Name = SCP2_URE_DL_COMID_NORMAL("jvmaccess");
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Target = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
+End
+#endif
+
File gid_File_Dl_Jvmfwk
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
@@ -328,6 +419,16 @@ File gid_File_Dl_Jvmfwk
// CompID = "4E128F82-FA30-4077-88DC-F745C3330093";
End
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Jvmfwk
+ BIN_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ Name = SCP2_URE_DL_NORMAL("jvmfwk");
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Target = SCP2_URE_DL_VER("jvmfwk", "3");
+End
+#endif
+
#if defined SOLAR_JAVA
File gid_File_Dl_Sunjavaplugin
TXT_FILE_BODY;
@@ -850,6 +951,16 @@ File gid_File_Dl_Libxml2
End
#endif
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Libxml2
+ BIN_FILE_BODY;
+ Dir = SCP2_URE_DL_DIR;
+ Name = SCP2_URE_DL_NORMAL("xml2");
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Target = SCP2_URE_DL_VER("xml2", "2");
+End
+#endif
+
#if !defined USE_SYSTEM_STL || \
(defined USE_SYSTEM_STL && defined _C52 && defined IS_LP64)
File gid_File_Dl_Stlport
@@ -896,7 +1007,11 @@ End
File gid_File_Dl_GccS
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
+#ifdef AIX
+ Name = "libgcc_s.a";
+#else
Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
+#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
End
@@ -907,7 +1022,11 @@ End
File gid_File_Dl_Stdcpp
Dir = SCP2_URE_DL_DIR;
TXT_FILE_BODY;
+#ifdef AIX
+ Name = "libstdc++.a";
+#else
Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
+#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
// CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
End
@@ -1132,16 +1251,26 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Lib_Policy_Cli_Cppuhelper_Assembly,
gid_File_Lib_Policy_Cli_Cppuhelper_Config,
gid_File_Dl_Cppu,
+ gid_Unixlink_File_Dl_Cppu,
gid_File_Dl_Cppuhelper,
+ gid_Unixlink_File_Dl_Cppuhelper,
gid_File_Dl_PurpEnvHelper,
+ gid_Unixlink_File_Dl_PurpEnvHelper,
gid_File_Dl_Sal,
+ gid_Unixlink_File_Dl_Sal,
gid_File_Dl_Salhelper,
+ gid_Unixlink_File_Dl_Salhelper,
gid_File_Dl_Profile_Uno,
gid_File_Dl_Reg,
+ gid_Unixlink_File_Dl_Reg
gid_File_Dl_Rmcxt,
+ gid_Unixlink_File_Dl_Rmcxt
gid_File_Dl_Store,
+ gid_Unixlink_File_Dl_Store
gid_File_Dl_Jvmaccess,
+ gid_Unixlink_File_Dl_Jvmaccess
gid_File_Dl_Jvmfwk,
+ gid_Unixlink_File_Dl_Jvmfwk
gid_File_Dl_Sunjavaplugin,
gid_File_Dl_JrepropertiesClass,
gid_File_Dl_Profile_Jvmfwk3rc,
@@ -1196,7 +1325,18 @@ Module gid_Module_Root_Ure_Hidden
gid_File_Misc_TypesRdb,
gid_File_Misc_JavavendorsXml,
gid_Starregistry_Services_Rdb_Ure);
- Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs);
+ Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs,
+ gid_Unixlink_File_Dl_Sal,
+ gid_Unixlink_File_Dl_Salhelper,
+ gid_Unixlink_File_Dl_Cppu,
+ gid_Unixlink_File_Dl_Cppuhelper,
+ gid_Unixlink_File_Dl_PurpEnvHelper
+ gid_Unixlink_File_Dl_Reg,
+ gid_Unixlink_File_Dl_Rmcxt,
+ gid_Unixlink_File_Dl_Store,
+ gid_Unixlink_File_Dl_Jvmaccess,
+ gid_Unixlink_File_Dl_Jvmfwk,
+ gid_Unixlink_File_Dl_Libxml2);
End
// Profile version.ini
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 5cd84d8..e586876 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -106,6 +106,7 @@ End
// Scripting Framework Python script proxy
+#ifndef AIX
File gid_File_Py_Pythonscript
TXT_FILE_BODY;
Dir = gid_Dir_Program;
@@ -113,6 +114,7 @@ File gid_File_Py_Pythonscript
RegistryID = gid_Starregistry_Services_Rdb;
Styles = (PACKED,UNO_COMPONENT);
End
+#endif
//Scripting Framework Python example scripts
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index 00a5c30..9ad34a2 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -27,6 +27,7 @@
#include "macros.inc"
+#ifndef AIX
File gid_File_Pymailmerge
TXT_FILE_BODY;
Dir = gid_Dir_Program;
@@ -34,3 +35,4 @@ File gid_File_Pymailmerge
RegistryID = gid_Starregistry_Services_Rdb;
Styles = (PACKED,UNO_COMPONENT);
End
+#endif
commit fc9301e7c2d18887b694102adb82b8e6820c9909
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 13:25:20 2010 +0100
AIX uses .a for shared libs
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
index fefea64..fbd0a69 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
@@ -2,6 +2,10 @@
cat > /dev/null
[[ "${OUTPATH}" == unxlngx* ]] && mark64="()(64bit)"
-echo "libgnomevfs-2.so.0${mark64}"
-echo "libgconf-2.so.4${mark64}"
-
+if [[ "${OUTPATH}" == unxaig* ]]; then
+ echo "libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})"
+ echo "libgconf-2.a(libgconf-2.so.4${mark64})"
+else
+ echo "libgnomevfs-2.so.0${mark64}"
+ echo "libgconf-2.so.4${mark64}"
+fi
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
index b056524..eab975a 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh
@@ -2,5 +2,8 @@
cat > /dev/null
[[ "${OUTPATH}" == unxlngx* ]] && mark64="()(64bit)"
-echo "libfreetype.so.6${mark64}"
-
+if [[ "${OUTPATH}" == unxaig* ]]; then
+ echo "libfreetype.a(libfreetype.so.6${mark64})"
+else
+ echo "libfreetype.so.6${mark64}"
+fi
commit 12a6a18cff50bee87319a489a5e185eaa748f34c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 13 12:59:37 2010 +0100
default AIX to rpms and some other tweaks
diff --git a/configure.in b/configure.in
index 10bd44c..e8532e7 100644
--- a/configure.in
+++ b/configure.in
@@ -1173,7 +1173,6 @@ case "$build_os" in
test_randr=no
test_freetype=yes
PTHREAD_LIBS=-pthread
- echo "AIX is an alpha port --- Use at own risk" >> warn
_os=AIX
;;
*)
@@ -1343,7 +1342,7 @@ AC_SUBST(ENABLE_FONTCONFIG)
dnl ===================================================================
dnl find external tarballs.
dnl ===================================================================
-if test -z $TARFILE_LOCATION; then
+if test -z "$TARFILE_LOCATION"; then
TARFILE_LOCATION="DEFAULT"
fi
AC_SUBST(TARFILE_LOCATION)
@@ -2648,7 +2647,7 @@ dnl ===================================================================
if test "$GCC" = "yes"; then
AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -fvisibility=hidden"
+ CFLAGS="$CFLAGS -Werror -fvisibility=hidden"
AC_TRY_LINK([], [ return 0; ], [ HAVE_GCC_VISIBILITY_FEATURE=TRUE ], [])
CFLAGS=$save_CFLAGS
if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then
@@ -3474,7 +3473,7 @@ if test "$enable_epm" = "yes"; then
fi
;;
AIX)
- PKGFORMAT=aix
+ PKGFORMAT=rpm
;;
*BSD)
PKGFORMAT=bsd
@@ -3537,7 +3536,7 @@ msi - Windows .msi
done
if test -z "$RPM" ; then
AC_MSG_ERROR([not found])
- elif "$RPM" --usage 2>&1 | $EGREP -- -bb >/dev/null; then
+ elif "$RPM" --help 2>&1 | $EGREP buildroot >/dev/null; then
RPM_PATH=`which $RPM`
AC_MSG_RESULT([$RPM_PATH])
else
@@ -7153,6 +7152,8 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then
AC_MSG_RESULT([no, libXinerama not found or wrong architecture.])
fi
else
+ USE_XINERAMA=NO
+ XINERAMA_LINK=none
AC_MSG_RESULT([no])
fi
AC_SUBST(USE_XINERAMA)
More information about the Libreoffice-commits
mailing list