#121392# Made STLport a public part of the URE; added URE_TYPES, URE_SERVICES to SDK std.mk.

2 files changed, 46 insertions, 39 deletions

diff --git a/ure/source/uretest/Makefile b/ure/source/uretest/Makefile
index ba151c11d4bf..4125801fa394 100644
--- a/ure/source/uretest/Makefile
+++ b/ure/source/uretest/Makefile
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: Makefile,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: sb $ $Date: 2005-06-03 07:55:36 $
+#   last change: $Author: sb $ $Date: 2005-06-10 13:49:59 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,14 +76,12 @@ qt = "
 cwd = $(subst \,/,$(shell cd))
 link_output_switch = -out:
 link_std_libs = kernel32.lib msvcrt.lib
-ure_misc = $(subst \,/,$(OO_SDK_URE_HOME)/misc)
 ure_java_url = $(subst $(subst .,., ),%%20,$(subst \,/,$(URLPREFIX)$(OO_SDK_URE_JAVA_DIR)))
 else
 qt = '
 cwd = $(PWD)
 link_output_switch = $(subst .,.,-o )
 link_std_libs =
-ure_misc = $(OO_SDK_URE_HOME)/share/misc
 ure_java_url = $(URLPREFIX)$(OO_SDK_URE_JAVA_DIR)
 endif
 
@@ -102,21 +100,23 @@ test-cpptest: out.sdk/cppmain.uno.$(SHAREDLIB_EXT) out.sdk/types.rdb \
             out.sdk/services.rdb
 	$(GCCS_COMPAT) uno \
             -c test.cpp.cppmain.Component -l $(URLPREFIX)$(cwd)/$< \
-            -ro "$(ure_misc)/types.rdb" -ro out.sdk/types.rdb \
-            -ro "$(ure_misc)/services.rdb" -ro out.sdk/services.rdb
+            -ro "$(subst \,/,$(URLPREFIX)$(URE_TYPES))" -ro out.sdk/types.rdb \
+            -ro "$(subst \,/,$(URLPREFIX)$(URE_SERVICES))" \
+            -ro out.sdk/services.rdb
 
 .PHONY: test-javatest
 test-javatest: out.sdk/javamain.uno.jar out.sdk/types.rdb out.sdk/services.rdb
 	$(GCCS_COMPAT) uno \
             -c test.java.javamain.Component -l $(URLPREFIX)$(cwd)/$< \
-            -ro "$(ure_misc)/types.rdb" -ro out.sdk/types.rdb \
-            -ro "$(ure_misc)/services.rdb" -ro out.sdk/services.rdb
+            -ro "$(subst \,/,$(URLPREFIX)$(URE_TYPES))" -ro out.sdk/types.rdb \
+            -ro "$(subst \,/,$(URLPREFIX)$(URE_SERVICES))" \
+            -ro out.sdk/services.rdb
 
 do_server = $(GCCS_COMPAT) uno -c test.cpp.cppserver.Component \
     -l $(URLPREFIX)$(cwd)/out.sdk/cppserver.uno.$(SHAREDLIB_EXT) \
-    -ro "$(ure_misc)/types.rdb" -ro out.sdk/types.rdb \
-    -ro "$(ure_misc)/services.rdb" -u "uno:pipe,name=ure_test;urp;server" \
-    --singleaccept
+    -ro "$(subst \,/,$(URLPREFIX)$(URE_TYPES))" -ro out.sdk/types.rdb \
+    -ro "$(subst \,/,$(URLPREFIX)$(URE_SERVICES))" -ro out.sdk/services.rdb \
+    -u "uno:pipe,name=ure_test;urp;server" --singleaccept
 do_client = $(SDK_JAVA) -jar out.sdk/runner.jar $(ure_java_url)/ \
     $(URLPREFIX)$(cwd)/out.sdk/javaclient.jar \
     "uno:pipe,name=ure_test;urp;server"
@@ -143,12 +143,12 @@ out.sdk/cppmain.uno.$(SHAREDLIB_EXT): out.sdk/cppmain.$(OBJ_EXT) version.map | \
             out.sdk
 	$(LINK) $(COMP_LINK_FLAGS) $(link_output_switch)$@ $< $(LINK_LIBS) \
             $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) \
-            $(link_std_libs)
+            $(STLPORTLIB) $(link_std_libs)
 
 out.sdk/cppmain.$(OBJ_EXT): cppmain.cc out.sdk/cpputypes.cppumaker.flag \
             out.sdk/types.cppumaker.flag | out.sdk
-	$(CC) $(CC_FLAGS) $(CC_OUTPUT_SWITCH)$@ $(CC_INCLUDES) \
-            -Iout.sdk/include/cpputypes -Iout.sdk/include/types \
+	$(CC) $(CC_FLAGS) $(CC_OUTPUT_SWITCH)$@ -I$(PRJ)/include/stl \
+            $(CC_INCLUDES) -Iout.sdk/include/cpputypes -Iout.sdk/include/types \
             $(CC_DEFINES) $<
 
 
@@ -159,8 +159,8 @@ out.sdk/cpptest.uno.$(SHAREDLIB_EXT): out.sdk/cpptest.$(OBJ_EXT) version.map | \
 
 out.sdk/cpptest.$(OBJ_EXT): cpptest.cc out.sdk/cpputypes.cppumaker.flag \
             out.sdk/types.cppumaker.flag | out.sdk
-	$(CC) $(CC_FLAGS) $(CC_OUTPUT_SWITCH)$@ $(CC_INCLUDES) \
-            -Iout.sdk/include/cpputypes -Iout.sdk/include/types \
+	$(CC) $(CC_FLAGS) $(CC_OUTPUT_SWITCH)$@ -I$(PRJ)/include/stl \
+            $(CC_INCLUDES) -Iout.sdk/include/cpputypes -Iout.sdk/include/types \
             $(CC_DEFINES) $<
 
 
@@ -171,20 +171,19 @@ out.sdk/cppserver.uno.$(SHAREDLIB_EXT): out.sdk/cppserver.$(OBJ_EXT) \
 
 out.sdk/cppserver.$(OBJ_EXT): cppserver.cc out.sdk/cpputypes.cppumaker.flag \
             out.sdk/types.cppumaker.flag | out.sdk
-	$(CC) $(CC_FLAGS) $(CC_OUTPUT_SWITCH)$@ $(CC_INCLUDES) \
-            -Iout.sdk/include/cpputypes -Iout.sdk/include/types \
+	$(CC) $(CC_FLAGS) $(CC_OUTPUT_SWITCH)$@ -I$(PRJ)/include/stl \
+            $(CC_INCLUDES) -Iout.sdk/include/cpputypes -Iout.sdk/include/types \
             $(CC_DEFINES) $<
 
 
 out.sdk/cpputypes.cppumaker.flag: | out.sdk
 	$(CPPUMAKER) -O./out.sdk/include/cpputypes \
-            "-Tcom.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak" \
-            -B/UCR "$(ure_misc)/types.rdb"
+            "-Tcom.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak" \
+            -B/UCR "$(URE_TYPES)"
 	touch $@
 
 out.sdk/types.cppumaker.flag: out.sdk/types.rdb | out.sdk
-	$(CPPUMAKER) -O./out.sdk/include/types -B/UCR $< \
-            "-X$(ure_misc)/types.rdb"
+	$(CPPUMAKER) -O./out.sdk/include/types -B/UCR $< "-X$(URE_TYPES)"
 	touch $@
 
 
@@ -266,7 +265,7 @@ out.sdk/types.mf: types.mf.template | out.sdk
 
 out.sdk/types.javamaker.flag: out.sdk/types.rdb | out.sdk out.sdk/class
 	- $(DELRECURSIVE) $(subst /,$(PS),out.sdk/class/types)
-	$(JAVAMAKER) -O./out.sdk/class/types -B/UCR $< "-X$(ure_misc)/types.rdb"
+	$(JAVAMAKER) -O./out.sdk/class/types -B/UCR $< "-X$(URE_TYPES)"
 	touch $@
 
 
@@ -282,8 +281,7 @@ out.sdk/services.rdb: out.sdk/cpptest.uno.$(SHAREDLIB_EXT) \
 	$(DEL) $(subst /,$(PS),$@)
 	$(REGCOMP) -register -r $@ \
             -c $(URLPREFIX)$(cwd)/out.sdk/cpptest.uno.$(SHAREDLIB_EXT)
-	$(REGCOMP) -register -br "$(ure_misc)/types.rdb" \
-            -br "$(ure_misc)/services.rdb" -r $@ \
+	$(REGCOMP) -register -br "$(URE_TYPES)" -br "$(URE_SERVICES)" -r $@ \
             -c $(URLPREFIX)$(cwd)/out.sdk/javatest.uno.jar
 
 
diff --git a/ure/source/uretest/Makefile.pln b/ure/source/uretest/Makefile.pln
index 83891c5855a3..76d9b0cf96aa 100644
--- a/ure/source/uretest/Makefile.pln
+++ b/ure/source/uretest/Makefile.pln
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: Makefile.pln,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: sb $ $Date: 2005-06-02 08:27:53 $
+#   last change: $Author: sb $ $Date: 2005-06-10 13:49:59 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -64,10 +64,12 @@
 
 # The following variables can be set, if necessary (see README):
 #URE_HOME := /opt/openoffice.org/ure
+#GXX_INCLUDE_PATH := /usr/include/g++
 #GCCS_COMPAT := LD_PRELOAD=/lib/libgcc_s.so.1
 
 
 URE_HOME ?= /opt/openoffice.org/ure
+GXX_INCLUDE_PATH ?= /usr/include/g++
 
 .DELETE_ON_ERROR:
 
@@ -114,16 +116,18 @@ clean:
 
 out.pln/cppmain.uno.so: out.pln/cppmain.o version.map | out.pln \
             out.pln/lib/libuno_cppu.so out.pln/lib/libuno_cppuhelpergcc3.so \
-            out.pln/lib/libuno_sal.so out.pln/lib/libuno_salhelpergcc3.so
+            out.pln/lib/libuno_sal.so out.pln/lib/libuno_salhelpergcc3.so \
+            out.pln/lib/libstlport_gcc.so
 	g++ -shared -o $@ -Wl,-z,defs -Wl,--fatal-warnings \
             -Wl,--version-script=version.map $< -Lout.pln/lib -luno_cppu \
-            -luno_cppuhelpergcc3 -luno_sal -luno_salhelpergcc3
+            -luno_cppuhelpergcc3 -luno_sal -luno_salhelpergcc3 -lstlport_gcc
 
 out.pln/cppmain.o: cppmain.cc out.pln/cpputypes.cppumaker.flag \
             out.pln/types.cppumaker.flag | out.pln
-	g++ -c -o $@ -fpic -Wall -Wno-ctor-dtor-privacy -I $(SDK_HOME)/include \
-            -I out.pln/include/cpputypes -I out.pln/include/types \
-            -DCPPU_ENV=gcc3 -DLINUX -DUNX $<
+	g++ -c -o $@ -fpic -Wall -Wno-ctor-dtor-privacy -I $(SDK_HOME)/include/stl \
+            -I $(SDK_HOME)/include -I out.pln/include/cpputypes \
+            -I out.pln/include/types -DCPPU_ENV=gcc3 \
+            -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX -DUNX $<
 
 
 out.pln/cpptest.uno.so: out.pln/cpptest.o version.map | out.pln \
@@ -135,9 +139,10 @@ out.pln/cpptest.uno.so: out.pln/cpptest.o version.map | out.pln \
 
 out.pln/cpptest.o: cpptest.cc out.pln/cpputypes.cppumaker.flag \
             out.pln/types.cppumaker.flag | out.pln
-	g++ -c -o $@ -fpic -Wall -Wno-ctor-dtor-privacy -I $(SDK_HOME)/include \
-            -I out.pln/include/cpputypes -I out.pln/include/types \
-            -DCPPU_ENV=gcc3 -DLINUX -DUNX $<
+	g++ -c -o $@ -fpic -Wall -Wno-ctor-dtor-privacy -I $(SDK_HOME)/include/stl \
+            -I $(SDK_HOME)/include -I out.pln/include/cpputypes \
+            -I out.pln/include/types -DCPPU_ENV=gcc3 \
+            -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX -DUNX $<
 
 
 out.pln/cppserver.uno.so: out.pln/cppserver.o version.map | out.pln \
@@ -149,15 +154,16 @@ out.pln/cppserver.uno.so: out.pln/cppserver.o version.map | out.pln \
 
 out.pln/cppserver.o: cppserver.cc out.pln/cpputypes.cppumaker.flag \
             out.pln/types.cppumaker.flag | out.pln
-	g++ -c -o $@ -fpic -Wall -Wno-ctor-dtor-privacy -I $(SDK_HOME)/include \
-            -I out.pln/include/cpputypes -I out.pln/include/types \
-            -DCPPU_ENV=gcc3 -DLINUX -DUNX $<
+	g++ -c -o $@ -fpic -Wall -Wno-ctor-dtor-privacy -I $(SDK_HOME)/include/stl \
+            -I $(SDK_HOME)/include -I out.pln/include/cpputypes \
+            -I out.pln/include/types -DCPPU_ENV=gcc3 \
+            -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) -DLINUX -DUNX $<
 
 
 out.pln/cpputypes.cppumaker.flag: | out.pln
 	LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/linux/bin/cppumaker \
             -O./out.pln/include/cpputypes \
-            '-Tcom.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak' \
+            '-Tcom.sun.star.lang.EventObject;com.sun.star.lang.XMain;com.sun.star.lang.XMultiComponentFactory;com.sun.star.lang.XMultiServiceFactory;com.sun.star.lang.XSingleComponentFactory;com.sun.star.lang.XSingleServiceFactory;com.sun.star.lang.XTypeProvider;com.sun.star.registry.XRegistryKey;com.sun.star.uno.DeploymentException;com.sun.star.uno.Exception;com.sun.star.uno.RuntimeException;com.sun.star.uno.XAggregation;com.sun.star.uno.XComponentContext;com.sun.star.uno.XCurrentContext;com.sun.star.uno.XInterface;com.sun.star.uno.XWeak' \
             -B/UCR $(URE_HOME)/share/misc/types.rdb
 	touch $@
 
@@ -281,6 +287,9 @@ out.pln/lib/libuno_sal.so: | out.pln/lib
 out.pln/lib/libuno_salhelpergcc3.so: | out.pln/lib
 	ln -fs $(URE_HOME)/lib/libuno_salhelpergcc3.so.3 $@
 
+out.pln/lib/libstlport_gcc.so: | out.pln/lib
+	ln -fs $(URE_HOME)/lib/libstlport_gcc.so $@
+
 
 out.pln:
 	mkdir $@