diff options
Diffstat (limited to 'jvmfwk/distributions/OpenOfficeorg')
8 files changed, 17 insertions, 101 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml index 2dd5fe35f555..4cb6c8b7e991 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml @@ -18,8 +18,8 @@ </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml index 489511f5aff6..e5d99145a0d9 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml @@ -27,11 +27,11 @@ </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> - <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> + <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml index 215d26c0ea2a..48b6246f72c5 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml @@ -14,7 +14,7 @@ </vendor> </vendorInfos> <plugins> - <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> - <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library> + <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library> + <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dylib</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml deleted file mode 100644 index 2de585472b86..000000000000 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - - <updated>2004-01-30</updated> - - <vendorInfos> - <vendor name="Sun Microsystems Inc."> - <minVersion>1.4.2</minVersion> - </vendor> - <vendor name="IBM Corporation"> - <minVersion>1.4.2</minVersion> - </vendor> - </vendorInfos> - - <plugins> - <library vendor="Sun Microsystems Inc.">sunjavap.dll</library> - <library vendor="IBM Corporation">sunjavap.dll</library> - </plugins> -</javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml index d18dc66585a5..508c93ec0cf1 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml @@ -29,7 +29,7 @@ look like. </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">sunjavaplugin.dll</library> + <library vendor="Sun Microsystems Inc.">libsunjavaplugin.dll</library> <library vendor="VendorX">./pluginDir/vendorx.dll</library> </plugins> -</javaSelection>
\ No newline at end of file +</javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml index 3b1f53fc4fce..261c77d102a8 100755 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml @@ -12,6 +12,6 @@ </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index 5c92b7ae61b4..a7d4d8958124 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -18,8 +18,8 @@ </vendorInfos> <plugins> - <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> - <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> - <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll</library> + <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dll</library> + <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dll</library> + <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.dll</library> </plugins> </javaSelection> diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk deleted file mode 100755 index 88afdb33f81c..000000000000 --- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# 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. -# -#************************************************************************* - -PRJ = ..$/.. -PRJNAME = jvmfwk -TARGET = vendors_ooo - -.INCLUDE: settings.mk - -.IF "$(SOLAR_JAVA)"=="" -nojava: - @echo "Not building jvmfwk because Java is disabled" -.ENDIF - -.IF "$(SOLAR_JAVA)"!="" -$(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml -.IF "$(GUI)"=="UNX" -.IF "$(OS)"=="FREEBSD" - -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors.xml -.ELIF "$(OS)"=="MACOSX" - -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors.xml -.ELIF "$(OS)"=="LINUX" || "$(OS)"=="AIX" - -$(COPY) javavendors_linux.xml $(BIN)$/javavendors.xml -.ELSE - -$(COPY) javavendors_unx.xml $(BIN)$/javavendors.xml -.ENDIF -.ELIF "$(GUI)"=="WNT" - -$(COPY) javavendors_wnt.xml $(BIN)$/javavendors.xml -.ELSE - @echo Unsupported platform. -.ENDIF - -.ENDIF # "$(SOLAR_JAVA)"!="" - - - - -.INCLUDE: target.mk - |