diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-01-08 11:54:15 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-01-08 19:40:57 +0100 |
| commit | a575f1243374e252e656888e04433adc5a3c4768 (patch) | |
| tree | bdf06949f601c465011f2e1b1beeccf2c6de7a23 /solenv/inc | |
| parent | 92045e69dab8be60a1c84774f04c437066c3c2bf (diff) | |
more easier and better sortable download names
+ get rid of "install_multi"
+ move "SDK" and "Test" from the main name to the name suffix;
use same position as "helppack" and "langpack"
+ move the content type identification "arc/deb/rpm" just
after the <arch> string
+ use "archive" instead of the unclear "arc" content identification
The new names look like:
LibreOffice_<version>_<os>_<arch>_<content>
LibreOffice_<version>_<os>_<arch>_<content>_helppack_<lang>
LibreOffice_<version>_<os>_<arch>_<content>_langpack_<lang>
LibreOffice_<version>_<os>_<arch>_<content>_sdk
LibreOffice_<version>_<os>_<arch>_<content>_test
, where the string "_<content>" is one of "_archive", "_deb", "_rpm".
This string is missing for .msi, and .dmg installers because
the content is described by the filename suffix.
Conflicts:
Makefile.in
Change-Id: Ifecf947ba32e3381ef284d433096f7b37a02e9f5
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/installationtest.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk index c9ed71936adb..e8286d6194f8 100644 --- a/solenv/inc/installationtest.mk +++ b/solenv/inc/installationtest.mk @@ -97,10 +97,10 @@ my_javaenv = \ .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)/LibreOffice_*_install-arc_$(defaultlangiso).zip) + ls $(installationtest_instset)/LibreOffice_*_archive.zip) $(COMMAND_ECHO)$(MKDIRHIER) $(@:d) - $(COMMAND_ECHO)unzip -q $(installationtest_instset)/LibreOffice_*_install-arc_$(defaultlangiso).zip -d "$(OOO_EXTRACT_TO)" - $(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/LibreOffice_*_install-arc_$(defaultlangiso) "$(OOO_EXTRACT_TO)"/opt + $(COMMAND_ECHO)unzip -q $(installationtest_instset)/LibreOffice_*_archive.zip -d "$(OOO_EXTRACT_TO)" + $(COMMAND_ECHO)mv "$(OOO_EXTRACT_TO)"/LibreOffice_*_archive "$(OOO_EXTRACT_TO)"/opt $(COMMAND_ECHO)echo "$(OOO_EXTRACT_TO)" > $@ .END |