diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-09-26 17:43:42 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-09-26 17:46:05 +0200 |
| commit | a953cae319ce4e09626a6f0aae8f84fbb1dc6cf1 (patch) | |
| tree | 5aa26008d40d97d48af6d8630822b398aa59153c /solenv/inc/installationtest.mk | |
| parent | 44ff5f147760bf48b22c14c4dcd7512fb9f8075f (diff) | |
One step closer to a functional 'make dev-install' with MinGW.
Diffstat (limited to 'solenv/inc/installationtest.mk')
| -rw-r--r-- | solenv/inc/installationtest.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index 69e57381da1c..cf88139a3408 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -58,7 +58,7 @@ installationtest_instset = \ $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso) .END -.IF "$(OS)" == "WNT" +.IF "$(OS)" == "WNT" && "$(CROSS_COMPILING)" != "YES" installationtest_instpath = `cat $(MISC)/$(TARGET)/installation.flag` .ELSE installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation @@ -94,7 +94,7 @@ my_javaenv = \ # which is removed after smoketest); can be removed once issue 50885 is fixed; # on other platforms, a single installation to solver is created in # smoketestoo_native: -.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" +.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" && "$(CROSS_COMPILING)" != "YES" OOO_EXTRACT_TO:=$(shell cygpath -m `mktemp -dt ooosmoke.XXXXXX`) $(MISC)/$(TARGET)/installation.flag : $(shell \ ls $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).zip) @@ -116,7 +116,7 @@ cpptest .PHONY : unoexceptionprotector $(CPPTEST_LIBRARY) # As a workaround for #i111400#, ignore failure of $(RM): $(COMMAND_ECHO)- $(RM) -r $(MISC)/$(TARGET)/user -.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" +.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" && "$(CROSS_COMPILING)" != "YES" $(COMMAND_ECHO)$(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag cpptest : $(MISC)/$(TARGET)/installation.flag .END @@ -133,7 +133,7 @@ javatest_% .PHONY : $(JAVATARGET) org.junit.runner.JUnitCore \ $(subst,/,. $(PACKAGE)).$(@:s/javatest_//) $(RM) -r $(MISC)/$(TARGET)/user -.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" +.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" && "$(CROSS_COMPILING)" != "YES" $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag javatest : $(MISC)/$(TARGET)/installation.flag .END @@ -148,7 +148,7 @@ javatest .PHONY : $(JAVATARGET) org.junit.runner.JUnitCore \ $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//)) $(RM) -r $(MISC)/$(TARGET)/user -.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" +.IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == "" && "$(CROSS_COMPILING)" != "YES" $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag javatest : $(MISC)/$(TARGET)/installation.flag .END |