[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk instsetoo_native/util solenv/bin

[Petr Mladek]

 instsetoo_native/CustomTarget_install.mk |    2 +-
 instsetoo_native/util/openoffice.lst.in  |   18 +++++++++---------
 solenv/bin/modules/installer/download.pm |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 16826147188bd78d67b97863226f903cc24add71
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Mar 1 16:45:35 2013 +0100

    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

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 288bbbd..1383e31 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 0f7907d..48298d8 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 at .@LIBO_VERSION_MINOR@
             PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             UNIXBASISROOTNAME lodev at LIBO_VERSION_MAJOR@. at 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 at .@LIBO_VERSION_MINOR@
             PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             UNIXBASISROOTNAME lodev at LIBO_VERSION_MAJOR@. at 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 at .@LIBO_VERSION_MINOR@
             PRODUCTEXTENSION . at LIBO_VERSION_MICRO@. at LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@
             UNIXBASISROOTNAME lodev at LIBO_VERSION_MAJOR@. at LIBO_VERSION_MINOR@
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 56606e8..18d2768 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -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"; }