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 /Makefile.in | |
| 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 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index af83e648fa2b..9c122585ff3f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -325,8 +325,8 @@ dev-install: build @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) cd $(SRC_ROOT)/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 @@ -352,8 +352,8 @@ install-tb: @mkdir $(DEVINSTALLDIR) ifeq ($(OS_FOR_BUILD),WNT) cd $(SRC_ROOT)/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 |