incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From le...@apache.org
Subject svn commit: r1357041 - /incubator/ooo/trunk/main/solenv/inc/installationtest.mk
Date Wed, 04 Jul 2012 02:08:06 GMT
Author: leidb
Date: Wed Jul  4 02:08:05 2012
New Revision: 1357041

URL: http://svn.apache.org/viewvc?rev=1357041&view=rev
Log:
Fix the issue running junit test with OOO_SUBSEQUENT_TESTS on Window.
Change installation zip from OOo_*_install-arc_ to Apache_OpenOffice_*_install-arc_

Modified:
    incubator/ooo/trunk/main/solenv/inc/installationtest.mk

Modified: incubator/ooo/trunk/main/solenv/inc/installationtest.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/installationtest.mk?rev=1357041&r1=1357040&r2=1357041&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/installationtest.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/installationtest.mk Wed Jul  4 02:08:05 2012
@@ -95,10 +95,10 @@ my_javaenv = \
 .IF "$(OS)" == "WNT" && "$(OOO_TEST_SOFFICE)" == ""
 OOO_EXTRACT_TO:=$(shell cygpath -m `mktemp -dt ooosmoke.XXXXXX`)
 $(MISC)/$(TARGET)/installation.flag : $(shell \
-        ls $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip)
+        ls $(installationtest_instset)/Apache_OpenOffice_*_install-arc_$(defaultlangiso).zip)
     $(COMMAND_ECHO)$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)unzip -q $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip
-d "$(OOO_EXTRACT_TO)"
-    $(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/OOo_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt
+    $(COMMAND_ECHO)unzip -q $(installationtest_instset)/Apache_OpenOffice_*_install-arc_$(defaultlangiso).zip
-d "$(OOO_EXTRACT_TO)"
+    $(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/Apache_OpenOffice_*_install-arc_$(defaultlangiso)
"$(OOO_EXTRACT_TO)"/opt
     $(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@
 .END
 



Mime
View raw message