diff options
| author | Petr Mladek <pmladek@suse.cz> | 2013-01-08 11:54:15 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-01-08 14:23:26 +0100 |
| commit | ba558a26bc93c0200d7d8bcc19a6e201d69792e4 (patch) | |
| tree | bb21ddc18bc9dfa0606e4dfb9a6a756745a79b7b /Makefile.top | |
| parent | 7389260dbf73aa88f8db18d04547c72a51f7d0e7 (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.
Change-Id: Ifecf947ba32e3381ef284d433096f7b37a02e9f5
Diffstat (limited to 'Makefile.top')
| -rw-r--r-- | Makefile.top | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.top b/Makefile.top index 3dabd7f83c1a..1cbaf607dc88 100644 --- a/Makefile.top +++ b/Makefile.top @@ -282,8 +282,8 @@ dev-install: build @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE - unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_install-arc_en-US.zip" - mv "$(DEVINSTALLDIR)"/LibreOffice*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt + unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip" + mv "$(DEVINSTALLDIR)"/LibreOffice*_archive/* "$(DEVINSTALLDIR)"/opt else ifeq ($(DISABLE_LINKOO),TRUE) @ooinstall $(DEVINSTALLDIR)/opt @@ -309,8 +309,8 @@ install-tb: @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE - unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_install-arc_en-US.zip" - mv "$(DEVINSTALLDIR)"/LibreOffice*_install-arc_en-US/* "$(DEVINSTALLDIR)"/opt + unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip" + mv "$(DEVINSTALLDIR)"/LibreOffice*_archive/* "$(DEVINSTALLDIR)"/opt else @ooinstall $(DEVINSTALLDIR)/opt @install-gdb-printers |