MWS_SRX644: migrate branch mws_srx644 -> HEAD

5 files changed, 12 insertions, 18 deletions

diff --git a/cpputools/prj/build.lst b/cpputools/prj/build.lst
index 601b397126de..7e20b6e18b28 100644
--- a/cpputools/prj/build.lst
+++ b/cpputools/prj/build.lst
@@ -4,4 +4,3 @@ pt	cpputools\prj							get		-	all	pt_prj NULL
 pt	cpputools\source\registercomponent		nmake	-	all	pt_regcomp NULL
 pt	cpputools\source\regsingleton				nmake	-	all	pt_regsingleton NULL
 pt	cpputools\source\unoexe					nmake	-	all	pt_unoexe NULL
-pt	cpputools\source\javaenv				nmake	-	all	pt_javaenv NULL
diff --git a/cpputools/prj/d.lst b/cpputools/prj/d.lst
index a10ace770555..93a0082907fa 100644
--- a/cpputools/prj/d.lst
+++ b/cpputools/prj/d.lst
@@ -1,10 +1,3 @@
-mkdir: %_DEST%\inc%_EXT%\cpputools
-..\inc\cpputools\jenv.hxx %_DEST%\inc%_EXT%\cpputools\jenv.hxx
-..\inc\cpputools\javainfo.hxx %_DEST%\inc%_EXT%\cpputools\javainfo.hxx
-..\%__SRC%\lib\jenv.lib %_DEST%\lib%_EXT%\jenv.lib
-..\%__SRC%\lib\libjenv.so %_DEST%\lib%_EXT%\libjenv.so
-..\%__SRC%\lib\ijenv.lib %_DEST%\lib%_EXT%\ijenv.lib
-..\%__SRC%\bin\jenv.dll %_DEST%\bin%_EXT%\jenv.dll
 ..\%__SRC%\bin\regcomp.exe %_DEST%\bin%_EXT%\regcomp.exe
 ..\%__SRC%\bin\regcomp %_DEST%\bin%_EXT%\regcomp
 ..\%__SRC%\bin\uno.exe %_DEST%\bin%_EXT%\uno.exe
diff --git a/cpputools/source/registercomponent/makefile.mk b/cpputools/source/registercomponent/makefile.mk
index 323f29167c0a..42e1743f0446 100644
--- a/cpputools/source/registercomponent/makefile.mk
+++ b/cpputools/source/registercomponent/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: jbu $ $Date: 2002-10-02 12:00:25 $
+#   last change: $Author: hr $ $Date: 2003-03-19 17:31:37 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -105,6 +105,7 @@ APP1OBJS=   $(OBJ)$/registercomponent.obj
 
 APP1STDLIBS=\
             $(SALLIB) \
+            $(TOOLSLIB) \
             $(CPPULIB)	\
             $(CPPUHELPERLIB)
 
diff --git a/cpputools/source/registercomponent/registercomponent.cxx b/cpputools/source/registercomponent/registercomponent.cxx
index 1c913825892b..23207ddc208a 100644
--- a/cpputools/source/registercomponent/registercomponent.cxx
+++ b/cpputools/source/registercomponent/registercomponent.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: registercomponent.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: jbu $ $Date: 2002-10-02 13:16:34 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 17:31:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -328,8 +328,8 @@ sal_Bool parseOptions(int ac, char* av[], Options& rOptions, sal_Bool bCmdFile)
                             // the pointer
                             sal_Char * p = (sal_Char *) rtl_allocateMemory( 13+ strlen( av[i] ) );
                             p[0] = 0;
-                            strcat( p, "CLASSPATH=" );
-                            strcat( p, av[i] );
+                            strcat( p, "CLASSPATH=" ); // #100211# - checked
+                            strcat( p, av[i] );        // #100211# - checked
 
                             putenv( p );
                         }
@@ -461,7 +461,7 @@ sal_Bool parseOptions(int ac, char* av[], Options& rOptions, sal_Bool bCmdFile)
                             buf.append( "." );
                             throw IllegalArgument( buf.makeStringAndClear() );
                         }
-                        strcpy( rargv[rargc] , buffer );
+                        strcpy( rargv[rargc] , buffer ); // #100211# - checked
                         rargc++;
                     }
                     fclose(cmdFile);
diff --git a/cpputools/source/unoexe/makefile.mk b/cpputools/source/unoexe/makefile.mk
index f02917720926..254c042dad88 100644
--- a/cpputools/source/unoexe/makefile.mk
+++ b/cpputools/source/unoexe/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.7 $
+#   $Revision: 1.8 $
 #
-#   last change: $Author: hjs $ $Date: 2002-03-27 16:35:03 $
+#   last change: $Author: hr $ $Date: 2003-03-19 17:31:37 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -70,7 +70,9 @@ NO_BSYMBOLIC=TRUE
 
 # --- Settings -----------------------------------------------------
 
+.INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
+.INCLUDE :  sv.mk
 
 UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
 UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
@@ -109,7 +111,6 @@ CXXFILES= \
 
 APP1TARGET=$(TARGET)
 APP1OBJS=$(OBJ)$/unoexe.obj 
-DEPOBJFILES+=$(APP1OBJFILES)
 
 APP1STDLIBS= \
     $(SALLIB)		\