mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt uretest to -B removed from cppumaker/javamaker

Browse Source 
Change-Id: If256eeddf4b8efded6e5e010b0155e05f5a1de79
This commit is contained in:
Stephan Bergmann
2013-04-11 12:55:28 +02:00
parent c482ded5fd
commit b9d93c0030
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ure/source/uretest/Makefile
View File

@@ -139,12 +139,12 @@ out.sdk/cppserver.$(OBJ_EXT): cppserver.cc out.sdk/cpputypes.cppumaker.flag \
out.sdk/cpputypes.cppumaker.flag: | out.sdk
$(CPPUMAKER) -O./out.sdk/include/cpputypes \
-BUCR "$(URE_TYPES)"
"-Tcom.sun.star.lang.DisposedException;com.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;com.sun.star.util.theMacroExpander" \
"$(URE_TYPES)"
touch $@
out.sdk/types.cppumaker.flag: out.sdk/types.rdb | out.sdk
$(CPPUMAKER) -O./out.sdk/include/types -BUCR $< "-X$(URE_TYPES)"
$(CPPUMAKER) -O./out.sdk/include/types $< "-X$(URE_TYPES)"
touch $@
@@ -261,7 +261,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 -BUCR $< "-X$(URE_TYPES)"
$(JAVAMAKER) -O./out.sdk/class/types $< "-X$(URE_TYPES)"
touch $@

7
ure/source/uretest/Makefile.pln
View File

@@ -122,14 +122,13 @@ out.pln/cppserver.o: cppserver.cc out.pln/cpputypes.cppumaker.flag \
out.pln/cpputypes.cppumaker.flag: | out.pln
LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \
-O./out.pln/include/cpputypes \
-BUCR $(URE_HOME)/share/misc/types.rdb
'-Tcom.sun.star.lang.DisposedException;com.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;com.sun.star.util.theMacroExpander' \
$(URE_HOME)/share/misc/types.rdb
touch $@
out.pln/types.cppumaker.flag: out.pln/types.rdb | out.pln
LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/cppumaker \
-O./out.pln/include/types -BUCR $< \
-X$(URE_HOME)/share/misc/types.rdb
-O./out.pln/include/types $< -X$(URE_HOME)/share/misc/types.rdb
touch $@
@@ -246,7 +245,7 @@ out.pln/types.mf: types.mf.template | out.pln
out.pln/types.javamaker.flag: out.pln/types.rdb | out.pln out.pln/class
rm -rf out.pln/class/types
LD_LIBRARY_PATH=$(URE_HOME)/lib $(SDK_HOME)/bin/javamaker \
-O./out.pln/class/types -BUCR $< -X$(URE_HOME)/share/misc/types.rdb
-O./out.pln/class/types $< -X$(URE_HOME)/share/misc/types.rdb
touch $@