Kaydet (Commit) 02bfc554 authored tarafından Oliver Bolte's avatar Oliver Bolte

INTEGRATION: CWS ause069 (1.4.28); FILE MERGED

2006/11/28 10:06:49 hjs 1.4.28.1: #i70359# remove forced shell calls
üst 73453225
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.4 $ # $Revision: 1.5 $
# #
# last change: $Author: obo $ $Date: 2006-03-22 10:43:02 $ # last change: $Author: obo $ $Date: 2007-01-25 13:24:08 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
...@@ -101,13 +101,13 @@ ALL : \ ...@@ -101,13 +101,13 @@ ALL : \
.INCLUDE : target.mk .INCLUDE : target.mk
$(DLLDEST)$/%.py: %.py $(DLLDEST)$/%.py: %.py
+cp $? $@ cp $? $@
$(DLLDEST)$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST) $(DLLDEST)$/python$(EXECPOST) : $(SOLARBINDIR)$/python$(EXECPOST)
+cp $? $@ cp $? $@
$(DLLDEST)$/regcomp$(EXECPOST) : $(SOLARBINDIR)$/regcomp$(EXECPOST) $(DLLDEST)$/regcomp$(EXECPOST) : $(SOLARBINDIR)$/regcomp$(EXECPOST)
+cp $? $@ cp $? $@
$(DLLDEST)$/pyuno_regcomp.rdb: $(DLLDEST)$/uno_types.rdb $(SOLARBINDIR)$/pyuno_services.rdb $(DLLDEST)$/pyuno_regcomp.rdb: $(DLLDEST)$/uno_types.rdb $(SOLARBINDIR)$/pyuno_services.rdb
-rm -f $@ -rm -f $@
...@@ -117,9 +117,9 @@ doc .PHONY: ...@@ -117,9 +117,9 @@ doc .PHONY:
@echo start test with dmake runtest @echo start test with dmake runtest
runtest : ALL runtest : ALL
+cd $(DLLDEST) && $(TEST_ENV) && python main.py cd $(DLLDEST) && $(TEST_ENV) && python main.py
+cd $(DLLDEST) && $(TEST_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy.rdb \ cd $(DLLDEST) && $(TEST_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy.rdb \
-l com.sun.star.loader.Python $(foreach,i,$(PYCOMPONENTS) -c vnd.openoffice.pymodule:$(i)) -l com.sun.star.loader.Python $(foreach,i,$(PYCOMPONENTS) -c vnd.openoffice.pymodule:$(i))
+cd $(DLLDEST) && $(TEST_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \ cd $(DLLDEST) && $(TEST_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \
-l com.sun.star.loader.Python -c vnd.sun.star.expand:$(DOLLAR_SIGN)FOO/samplecomponent.py -l com.sun.star.loader.Python -c vnd.sun.star.expand:$(DOLLAR_SIGN)FOO/samplecomponent.py
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment