diff options
| -rwxr-xr-x | jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml | 8 | ||||
| -rw-r--r-- | jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml | 8 | ||||
| -rwxr-xr-x | jvmfwk/distributions/OpenOfficeorg/makefile.mk | 8 | ||||
| -rw-r--r-- | jvmfwk/prj/build.lst | 4 |
4 files changed, 6 insertions, 22 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml index 2772868df813..b10d915f25b4 100755 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml @@ -1,13 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Document : javavendors.xml - Created on : 18. März 2004, 10:43 - Author : jl97489 - Description: - Purpose of the document follows. ---> - <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml index 387752797b05..56751f4da5ce 100644 --- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml +++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml @@ -1,13 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Document : javavendors.xml - Created on : 18. März 2004, 10:43 - Author : jl97489 - Description: - Purpose of the document follows. ---> - <javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk index e496c6994bf0..d062d73fa38b 100755 --- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk +++ b/jvmfwk/distributions/OpenOfficeorg/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: jl $ $Date: 2004-05-04 10:00:57 $ +# last change: $Author: jl $ $Date: 2004-05-21 09:03:25 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -61,7 +61,7 @@ PRJ = ..$/.. PRJNAME = jvmfwk -TARGET = +TARGET = vendors_ooo .INCLUDE: settings.mk @@ -71,7 +71,7 @@ nojava: .ENDIF .IF "$(SOLAR_JAVA)"!="" -$(BIN)$/javavendors_so.xml: javavendors_unx.xml javavendors_wnt.xml +$(BIN)$/javavendors_ooo.xml: javavendors_unx.xml javavendors_wnt.xml .IF "$(GUI)"=="UNX" +-$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml .ELIF "$(GUI)"=="WNT" diff --git a/jvmfwk/prj/build.lst b/jvmfwk/prj/build.lst index 1856e3ec335d..14fa71d8d5e8 100644 --- a/jvmfwk/prj/build.lst +++ b/jvmfwk/prj/build.lst @@ -2,5 +2,5 @@ jv jvmfwk : cppu sal libxml2 NULL jv jvmfwk\source nmake - all jf_framework NULL jv jvmfwk\plugins\sunmajor\pluginlib nmake - all jf_sunmajorlib NULL jv jvmfwk\plugins\sunmajor\javaenvsetup nmake - u jf_sunjavaldx jf_framework NULL -jv jvmfwk\distributions\StarOffice nmake - all jf_staroffice NULL -jv jvmfwk\distributions\OpenOfficeorg nmake - all jf_openoffice NULL +jv jvmfwk\distributions\StarOffice nmake - all jf_staroffice jf_framework NULL +jv jvmfwk\distributions\OpenOfficeorg nmake - all jf_openoffice jf_framework NULL |