diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-04-16 09:08:29 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-04-18 16:59:48 +0200 |
| commit | 35e1b53c7e6176315257cae9434ec4364262282c (patch) | |
| tree | 32c349e5d26d2e4475af8ae260bdc29ca4dd17f3 /jvmfwk | |
| parent | Kill Pos_XXX in favour of osl_Pos_XXX (diff) | |
| download | core-35e1b53c7e6176315257cae9434ec4364262282c.tar.gz core-35e1b53c7e6176315257cae9434ec4364262282c.zip | |
Remove OS/2 support.
Diffstat (limited to 'jvmfwk')
| -rwxr-xr-x | jvmfwk/distributions/OpenOfficeorg/makefile.mk | 2 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 6 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 4 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 2 | ||||
| -rw-r--r-- | jvmfwk/source/makefile.mk | 4 |
5 files changed, 5 insertions, 13 deletions
diff --git a/jvmfwk/distributions/OpenOfficeorg/makefile.mk b/jvmfwk/distributions/OpenOfficeorg/makefile.mk index 36e8e8d6cbf5..88afdb33f81c 100755 --- a/jvmfwk/distributions/OpenOfficeorg/makefile.mk +++ b/jvmfwk/distributions/OpenOfficeorg/makefile.mk @@ -50,8 +50,6 @@ $(BIN)$/javavendors.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_mac .ENDIF .ELIF "$(GUI)"=="WNT" -$(COPY) javavendors_wnt.xml $(BIN)$/javavendors.xml -.ELIF "$(GUI)"=="OS2" - -$(COPY) javavendors_os2.xml $(BIN)$/javavendors.xml .ELSE @echo Unsupported platform. .ENDIF diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 1fd28a18e603..63cec34316f8 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -48,7 +48,7 @@ Reference<VendorBase> OtherInfo::createInstance() char const* const* OtherInfo::getJavaExePaths(int * size) { static char const * ar[] = { -#if defined(WNT) || defined(OS2) +#if defined(WNT) "bin/java.exe", "jre/bin/java.exe" #elif UNX @@ -68,10 +68,6 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll", "/bin/jrockit/jvm.dll" -#elif defined(OS2) - "/bin/classic/jvm.dll", - "/bin/client/jvm.dll", - "/bin/hotspot/jvm.dll" #elif UNX #ifdef MACOSX "/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index 56cb5c7bd7e7..975a4c2522c4 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -51,7 +51,7 @@ Reference<VendorBase> SunInfo::createInstance() char const* const* SunInfo::getJavaExePaths(int * size) { static char const * ar[] = { -#if defined(WNT) || defined(OS2) +#if defined(WNT) "java.exe", "bin/java.exe", "jre/bin/java.exe" @@ -74,8 +74,6 @@ char const* const* SunInfo::getRuntimePaths(int * size) "/bin/classic/jvm.dll", // The 64-bit JRE has the jvm in bin/server "/bin/server/jvm.dll" -#elif defined(OS2) - "/bin/classic/jvm.dll", #elif UNX "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index 3e5cf8ad5be0..fa7210854aa4 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -76,7 +76,7 @@ VendorBase::VendorBase(): m_bAccessibility(false) char const* const * VendorBase::getJavaExePaths(int* size) { static char const * ar[] = { -#if defined(WNT) || defined(OS2) +#if defined(WNT) "java.exe", "bin/java.exe" #elif UNX diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk index d43a31bc642d..bc067a1202c6 100644 --- a/jvmfwk/source/makefile.mk +++ b/jvmfwk/source/makefile.mk @@ -31,7 +31,7 @@ FRAMEWORKLIB=jvmfwk TARGET = $(FRAMEWORKLIB) ENABLE_EXCEPTIONS = TRUE -.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2" +.IF "$(OS)" != "WNT" UNIXVERSIONNAMES = UDK .ENDIF # WNT @@ -73,7 +73,7 @@ DEF1NAME = $(SHL1TARGET) .IF "$(GUI)"=="UNX" RCFILE=$(BIN)$/jvmfwk3rc -.ELIF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" +.ELIF "$(GUI)"=="WNT" RCFILE=$(BIN)$/jvmfwk3.ini .END |