CWS-TOOLING: integrate CWS sb93

2 files changed, 6 insertions, 22 deletions

diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 7c20824f2219..4d0d2d93bc5d 100755
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: javaldx.cxx,v $
- * $Revision: 1.15 $
+ * $Revision: 1.15.26.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -49,16 +49,6 @@ static sal_Bool hasOption(char const * szOption, int argc, char** argv);
 static rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData);
 //static sal_Bool printPaths(const OUString& sPathFile);
 
-#ifdef MACOSX
-#define HELP_TEXT    \
-"\njavaldx is necessary to make Java work on some UNIX platforms." \
-"It prints a string to std out that consists of directories which " \
-"have to be included into the DYLD_LIBRARY_PATH variable.The setting of " \
-"the variable usually occurs in a shell script that runs javaldx.\n" \
-"The directories are from the chosen java installation. \n" \
-"Options are: \n"\
-"--help or -h\n"
-#else
 #define HELP_TEXT    \
 "\njavaldx is necessary to make Java work on some UNIX platforms." \
 "It prints a string to std out that consists of directories which " \
@@ -67,7 +57,6 @@ static rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData);
 "The directories are from the chosen java installation. \n" \
 "Options are: \n"\
 "--help or -h\n"
-#endif
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 {
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
index 08d4548a880e..34b322c194c1 100755
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.7 $
+# $Revision: 1.7.26.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -44,17 +44,10 @@ ENABLE_EXCEPTIONS=true
 
 .INCLUDE :  settings.mk
 
-.IF "$(OS)"=="MACOSX"
-STDLIBCUIMT+=-lstdc++
-.ENDIF
-
-.IF "$(SOLAR_JAVA)"==""
-nojava:
-    @echo "Not building jvmfwk/plugins/javaenvsetup/ because Java is disabled"
-.ENDIF
-
 # --- Files --------------------------------------------------------
 
+.IF "$(OS)" != "MACOSX" && "$(SOLAR_JAVA)" != ""
+
 OBJFILES=$(OBJ)$/javaldx.obj
 
 APP1TARGET=javaldx
@@ -62,6 +55,8 @@ APP1OBJS=$(OBJFILES)
 APP1STDLIBS=$(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) $(JVMFWKLIB)
 APP1RPATH=UREBIN
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk