Skip to content

C
core
Kaydet (Commit) a0de0def authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien
Dosyalara gözat
Seçenekler

DEV300 masterfix: #i10000#: new naming scheme for installation sets

üst 46fd3a60
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
solenv/inc/installationtest.mk
Dosyayı görüntüle @ a0de0def
...@@ -71,12 +71,13 @@ my_javaenv = \ ...@@ -71,12 +71,13 @@ my_javaenv = \
# on other platforms, a single installation to solver is created in # on other platforms, a single installation to solver is created in
# smoketestoo_native: # smoketestoo_native:
.IF "$(OS)" == "WNT" .IF "$(OS)" == "WNT"
$(MISC)/$(TARGET)/installation.flag : \ $(MISC)/$(TARGET)/installation.flag : $(shell \
$(shell ls $(installationtest_instset)/OOo_*_install.zip) ls $(installationtest_instset)/OOo_*_install_$(defaultlangiso).zip)
$(MKDIRHIER) $(@:d) $(MKDIRHIER) $(@:d)
my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \ my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \
unzip $(installationtest_instset)/OOo_*_install.zip -d "$$my_tmp" && \ unzip $(installationtest_instset)/OOo_*_install_$(defaultlangiso).zip \
mv "$$my_tmp"/OOo_*_install "$$my_tmp"/opt && \ -d "$$my_tmp" && \
mv "$$my_tmp"/OOo_*_install_$(defaultlangiso) "$$my_tmp"/opt && \
echo "$$my_tmp" > $@ echo "$$my_tmp" > $@
.END .END
......
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