Kaydet (Commit) 16826147 authored tarafından Petr Mladek's avatar Petr Mladek

rename LOdev builds to LibreOfficeDev

It is similar change that we did for the release builds.

Also fixes make-dev install on Windows.

Change-Id: I7d9a4bc2e7b14e79516acdfb90c709dbde1378ab
üst 6f6443f2
......@@ -102,7 +102,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
rm -rf $(instsetoo_OUT)
ifeq (TRUE,$(LIBO_DEV_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip
unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
else # LIBO_DEV_INSTALL
$(call instsetoo_native_install_command,openoffice,$(instsetoo_native_WITH_LANG),,,$(PKGFORMAT))
......
......@@ -93,7 +93,7 @@ LibreOffice_Dev
{
variables
{
PRODUCTNAME LOdev
PRODUCTNAME LibreOfficeDev
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
UNIXBASISROOTNAME lodev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
......@@ -137,9 +137,9 @@ LibreOffice_Dev
active 1
compression 5
script setup_osl
downloadname LibO-dev_{productversion}_{os}_install_{languages}
langpackdownloadname LibO-dev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibO-dev_{productversion}_helppack_{os}_install_{languages}
downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
include {solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
}
......@@ -187,10 +187,10 @@ LibreOffice_Dev_SDK
{
Settings
{
downloadname LibO-Dev-SDK_{packageversion}_{os}_install_{languages}
downloadname LibreOfficeDev-SDK_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME LOdev
PRODUCTNAME LibreOfficeDev
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
UNIXBASISROOTNAME lodev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
......@@ -232,7 +232,7 @@ LibreOffice_Test
{
Settings
{
downloadname LO-Test_{packageversion}_{os}_install_{languages}
downloadname LibreOffice-Test_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME LibreOffice
......@@ -271,10 +271,10 @@ LibreOffice_Dev_Test
{
Settings
{
downloadname LO-Dev-Test_{packageversion}_{os}_install_{languages}
downloadname LibreOfficeDev-Test_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME LOdev
PRODUCTNAME LibreOfficeDev
PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
UNIXBASISROOTNAME lodev@LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@
......
......@@ -325,7 +325,7 @@ sub get_downloadname_productname
if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibreOffice"; }
if ( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) { $start = "LibO-Dev"; }
if ( $allvariables->{'PRODUCTNAME'} eq "LibreOfficeDev" ) { $start = "LibreOfficeDev"; }
if ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = "OOOP"; }
......
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