|
Lines 74-98
Link Here
|
| 74 |
.INCLUDE : sv.mk |
74 |
.INCLUDE : sv.mk |
| 75 |
# --- Files -------------------------------------------------------- |
75 |
# --- Files -------------------------------------------------------- |
| 76 |
|
76 |
|
| 77 |
.IF "$(GUI)" == "UNX" |
|
|
| 78 |
DOLLAR_SIGN=\$$ |
77 |
DOLLAR_SIGN=\$$ |
|
|
78 |
.IF "$(GUI)" == "UNX" |
| 79 |
INI_EXT=rc |
79 |
INI_EXT=rc |
| 80 |
.ELSE |
80 |
.ELSE |
| 81 |
INI_EXT=.ini |
81 |
INI_EXT=.ini |
| 82 |
PYEXC=$(DLLDEST)$/python.exe |
82 |
PYEXC=$(DLLDEST)$/python.exe |
| 83 |
REGEXC=$(DLLDEST)$/regcomp.exe |
83 |
REGEXC=$(DLLDEST)$/regcomp.exe |
|
|
84 |
.ENDIF |
| 85 |
.IF "$(USE_SHELL)" != "tcsh" |
| 84 |
DOLLAR_SIGN=$$ |
86 |
DOLLAR_SIGN=$$ |
| 85 |
.ENDIF |
87 |
.ENDIF |
| 86 |
|
88 |
|
|
|
89 |
#these are temporary |
| 90 |
REGCOMP=$(WRAPCMD) regcomp |
| 91 |
PYTHON=$(WRAPCMD) python |
| 92 |
|
| 87 |
.IF "$(GUI)"!="WNT" |
93 |
.IF "$(GUI)"!="WNT" |
| 88 |
REGCOMP_ENV=\ |
94 |
REGCOMP_ENV=\ |
| 89 |
setenv FOO file://$(shell pwd)$/$(DLLDEST) |
95 |
setenv FOO file://$(shell pwd)$/$(DLLDEST) |
| 90 |
.ELSE # "$(GUI)" != "WNT" |
96 |
.ELSE # "$(GUI)" != "WNT" |
| 91 |
# aaaaaa, how to get the current working directory on windows ??? |
97 |
# aaaaaa, how to get the current working directory on windows ??? |
| 92 |
CWD_TMP=$(shell echo import os;print os.getcwd() | python ) |
98 |
.IF "$(USE_SHELL)" == "tcsh" |
|
|
99 |
|
| 100 |
# these are temporary (should go into the global env script) |
| 101 |
##PYTHON=guw.pl -env $(SOLARVER)/$(UPD)/$(INPATH)/bin/python.exe |
| 102 |
##REGCOMP=guw.pl -env `which regcomp.exe` |
| 103 |
|
| 104 |
CWD_TMP=$(strip $(shell $(WRAPCMD) echo `pwd`)) |
| 105 |
REGCOMP_ENV=setenv FOO file:///$(strip $(subst,\,/ $(CWD_TMP)/$(DLLDEST))) |
| 106 |
.ELSE |
| 107 |
CWD_TMP=$(strip $(shell echo import os;print os.getcwd() | $(PYTHON))) |
| 93 |
REGCOMP_ENV=set FOO=file:///$(strip $(subst,\,/ $(CWD_TMP)$/$(DLLDEST))) |
108 |
REGCOMP_ENV=set FOO=file:///$(strip $(subst,\,/ $(CWD_TMP)$/$(DLLDEST))) |
|
|
109 |
.ENDIF "$(USE_SHELL)" == "tcsh" |
| 94 |
|
110 |
|
| 95 |
#$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/))) |
|
|
| 96 |
.ENDIF # "$(GUI)"!="WNT" |
111 |
.ENDIF # "$(GUI)"!="WNT" |
| 97 |
PYFILES = \ |
112 |
PYFILES = \ |
| 98 |
$(DLLDEST)$/core.py \ |
113 |
$(DLLDEST)$/core.py \ |
|
Lines 139-147
Link Here
|
| 139 |
@echo start test with dmake runtest |
154 |
@echo start test with dmake runtest |
| 140 |
|
155 |
|
| 141 |
runtest : ALL |
156 |
runtest : ALL |
| 142 |
+cd $(DLLDEST) && python main.py |
157 |
+cd $(DLLDEST) && $(PYTHON) main.py |
| 143 |
+cd $(DLLDEST) && regcomp -register -br pyuno_regcomp.rdb -r dummy.rdb \ |
158 |
+cd $(DLLDEST) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy.rdb \ |
| 144 |
-l com.sun.star.loader.Python $(foreach,i,$(PYCOMPONENTS) -c vnd.openoffice.pymodule:$(i)) |
159 |
-l com.sun.star.loader.Python $(foreach,i,$(PYCOMPONENTS) -c vnd.openoffice.pymodule:$(i)) |
| 145 |
+cd $(DLLDEST) && $(REGCOMP_ENV) && regcomp -register -br pyuno_regcomp.rdb -r dummy2.rdb \ |
160 |
+cd $(DLLDEST) && $(REGCOMP_ENV) && $(REGCOMP) -register -br pyuno_regcomp.rdb -r dummy2.rdb \ |
| 146 |
-l com.sun.star.loader.Python -c vnd.sun.star.expand:$(DOLLAR_SIGN)FOO/samplecomponent.py |
161 |
-l com.sun.star.loader.Python -c vnd.sun.star.expand:$(DOLLAR_SIGN)FOO/samplecomponent.py |
| 147 |
|
162 |
|