summaryrefslogtreecommitdiff
path: root/instsetoo_native
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2013-03-01 16:45:35 +0100
committerPetr Mladek <pmladek@suse.cz>2013-03-01 16:48:29 +0100
commit16826147188bd78d67b97863226f903cc24add71 (patch)
tree8ac500f00aed2e6e22d43bd0706dc7866eb7474e /instsetoo_native
parent6f6443f2cbbe21249aceed28bc575227e63ed393 (diff)
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
Diffstat (limited to 'instsetoo_native')
-rw-r--r--instsetoo_native/CustomTarget_install.mk2
-rw-r--r--instsetoo_native/util/openoffice.lst.in18
2 files changed, 10 insertions, 10 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 288bbbd9812b..1383e3193cb3 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -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))
diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in
index 0f7907d3c377..48298d8e51fb 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -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@