[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - solenv/bin

[Stephan Bergmann]

 solenv/bin/modules/installer.pm |   31 +---
 solenv/bin/modules/installer/scriptitems.pm |9 +---
 2 files changed, 21 insertions(+), 19 deletions(-)

New commits:
commit 10ddf01246a4a4b47666c59b4c4fc8ca7b800746
Author: Stephan Bergmann 
Date:   Fri Mar 16 14:21:01 2018 +0100

sdk/lib dir missing from Linux installation sets

...after cfd2691e5bf398304d7816227b933e53907b6204 "[API CHANGE] Remove 
salcpprt
static library" had removed the sole regular File item from gid_Dir_Lib_Sdk,
leaving only Unixlink items.  But the solenv/bin/modules/installer.pm code 
used
to only auto-create any directories that contain regular Files.  Changed 
that to
also consider Unixlinks in addition to regular Files.

And to add insult to injury, the code in
solenv/bin/modules/installer/simplepackage.pm creating the actual symlinks
represented by the Unixlink items silently does nothing when a symlink 
cannot be
created (because the partent dir is missing).  To be fixed in another 
follow-up
commit.

Change-Id: Ic7a682a17ac59c789c85c56c825dd623bc59428c
(cherry picked from commit f07e2496963baf8f7c0fecc79e7a420544075d98)
Reviewed-on: https://gerrit.libreoffice.org/51421
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 3d88b9986e14..151462f94ffc 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -636,6 +636,18 @@ sub run {
 
 
installer::scpzipfiles::resolving_scpzip_replace_flag($filesinproductlanguageresolvedarrayref,
 $allvariableshashref, "File", $languagestringref);
 
+#
+# language dependent unix links part
+#
+
+installer::logger::print_message( "... analyzing unix links ...\n" );
+
+my $unixlinksinproductlanguageresolvedarrayref = 
installer::scriptitems::resolving_all_languages_in_productlists($unixlinksinproductarrayref,
 $languagesarrayref);
+
+
installer::scriptitems::changing_name_of_language_dependent_keys($unixlinksinproductlanguageresolvedarrayref);
+
+
installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($unixlinksinproductlanguageresolvedarrayref,
 $dirsinproductarrayref);
+
 
 # Collecting directories for epm list file
 
@@ -649,8 +661,7 @@ sub run {
 # It will be possible, that in the setup script only those directoies 
have to be defined,
 # that have a CREATE flag. All other directories are created, if they 
contain at least one file.
 
-my ($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref);
-
+my ($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref,
 $unixlinksinproductlanguageresolvedarrayref);
 ($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_with_create_flag_from_directoryarray($dirsinproductlanguageresolvedarrayref,
 $alldirectoryhash);
 
 #
@@ -690,18 +701,6 @@ sub run {
 
installer::scriptitems::resolve_links_with_flag_relative($linksinproductlanguageresolvedarrayref);
 
 #
-# language dependent unix links part
-#
-
-installer::logger::print_message( "... analyzing unix links ...\n" );
-
-my $unixlinksinproductlanguageresolvedarrayref = 
installer::scriptitems::resolving_all_languages_in_productlists($unixlinksinproductarrayref,
 $languagesarrayref);
-
-
installer::scriptitems::changing_name_of_language_dependent_keys($unixlinksinproductlanguageresolvedarrayref);
-
-
installer::scriptitems::get_Destination_Directory_For_Item_From_Directorylist($unixlinksinproductlanguageresolvedarrayref,
 $dirsinproductarrayref);
-
-#
 # language dependent part for profiles and profileitems
 #
 
@@ -814,7 +813,7 @@ sub run {
 @{$folderitemsinproductlanguageresolvedarrayref} = (); # no 
folderitems in languagepacks
 
 # Collecting the directories again, to include only the language 
specific directories
-($directoriesforepmarrayref, $alldirectoryhash) = 
installer::scriptitems::collect_directories_from_filesarray($filesinproductlanguageresolvedarrayref);
+  

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - solenv/bin solenv/gbuild

[Michael Stahl]

 solenv/bin/concat-deps.c|5 ++
 solenv/gbuild/Library.mk|1 
 solenv/gbuild/LinkTarget.mk |   63 ++--
 solenv/gbuild/TargetLocations.mk|2 +
 solenv/gbuild/platform/com_MSC_class.mk |1 
 5 files changed, 70 insertions(+), 2 deletions(-)

New commits:
commit 6d1d4ebb8b5b1fc753f5cb3439703705ffcff270
Author: Michael Stahl 
Date:   Fri Nov 24 01:09:58 2017 +0100

tdf#113787: gbuild: fix the version of cli_cppuhelper assembly

There is one usage of gb_Library_add_generated_cxxclrobjects in
the entire repo, and regrettably generated C++/CLR objects
weren't actually implemented in the new build system, so the
assembly.cxx with its generated version number was simply ignored.

(cherry picked from commit bb9413907cd7bea0feadb7e4e3d44d5078fe5a26)

Change-Id: I2d40de12da58361891a9d405280e06bf5fc23e01
Reviewed-on: https://gerrit.libreoffice.org/45221
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 88144465eda7..b0b0e13d86b1 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -1082,6 +1082,11 @@ off_t size;
 created_line = generate_phony_line(src_relative, "o");
 rc = generate_phony_file(fn, created_line);
 }
+else if(strncmp(src_relative, "GenCxxClrObject/", 16) == 0)
+{
+created_line = generate_phony_line(src_relative, "o");
+rc = generate_phony_file(fn, created_line);
+}
 else
 {
 fprintf(stderr, "no magic for %s(%s) in %s\n", fn, 
src_relative, work_dir);
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 18640d6437d4..77851c1bc129 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -177,6 +177,7 @@ $(eval $(foreach method,\
add_objcxxobjects \
add_cxxclrobject \
add_cxxclrobjects \
+   add_generated_cxxclrobjects \
add_asmobject \
add_asmobjects \
add_exception_objects \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 5d192df299cb..f04e375c8cda 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -173,9 +173,9 @@ endef
 # Overview of dependencies and tasks of LinkTarget
 #
 # target  task depends on
-# LinkTarget  linking  AsmObject CObject 
CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject CxxClrObject
+# LinkTarget  linking  AsmObject CObject 
CxxObject GenCObject GenCxxObject ObjCObject ObjCxxObject CxxClrObject 
GenCxxClrObject
 #  LinkTarget/headers
-# LinkTarget/dep  joined dep file  AsmObject/dep 
CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep 
ObjCxxObject/dep CxxClrObject/dep
+# LinkTarget/dep  joined dep file  AsmObject/dep 
CObject/dep CxxObject/dep GenCObject/dep GenCxxObject/dep ObjCObject/dep 
ObjCxxObject/dep CxxClrObject/dep GenCxxClrObject/dep
 #  | LinkTarget/headers
 # LinkTarget/headers  all headers available
 # including own generated
@@ -189,6 +189,8 @@ endef
 # ObjCObject  objective c compile  | LinkTarget/headers
 # ObjCxxObjectobjective c++ compile| LinkTarget/headers
 # CxxClrObjectC++ CLR compile  | LinkTarget/headers
+# GenCxxClrObject C++ CLR compile from | LinkTarget/headers
+#  generated source
 #
 # AsmObject   asm compile  | LinkTarget
 #
@@ -199,6 +201,7 @@ endef
 # ObjCObject/depdependencies
 # ObjCxxObject/depdependencies
 # CxxClrObject/depdependencies
+# GenCxxClrObject/dep dependencies
 # AsmObject/dep   dependencies
 
 # LinkTarget/headers means gb_LinkTarget_get_headers_target etc.
@@ -350,6 +353,28 @@ $(call gb_GenCxxObject_get_dep_target,%) :
 endif
 
 
+# GenCxxClrObject class
+
+gb_GenCxxClrObject_get_source = 
$(WORKDIR)/$(1).$(gb_LinkTarget_CXX_SUFFIX_$(call 
gb_LinkTarget__get_workdir_linktargetname,$(2)))
+
+$(call gb_GenCxxClrObject_get_target,%) : $(gb_FORCE_COMPILE_ALL_TARGET)
+   $(call gb_Output_announce,$(subst 
$(BUILDDIR)/,,$(GEN_CXXCLR_SOURCE)),$(true),CLR,3)
+   test -f $(GEN_CXXCLR_SOURCE) || (echo "Missing generated source file 
$(GEN_CXXCLR_SOURCE)" && false)
+   $(call gb_CObject__command_pattern,$@,$(T_CXXCLRFLAGS) 
$(T_CXXCLRFLAGS_APPEND),$(GEN_CXXCLR_SOURCE),$(call 
gb_GenCxxClrObject_g

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - solenv/bin

[Stephan Bergmann]

 solenv/bin/assemble-flatpak.sh |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 3cb4ddd70e4bdfafd75291cc49702c4f6472c4cf
Author: Stephan Bergmann 
Date:   Tue Nov 14 18:42:03 2017 +0100

Make sure there is a org.libreoffice.LibreOffice.desktop again in the 
Flatpak

...after 1b85d725663a7d7546549e6b78ea43bea1cde7b9 "Include all .desktop 
files in
the Flatpak".  org.libreoffice.LibreOffice.appdata.xml references that in 
its

  org.libreoffice.LibreOffice.desktop

which is at least used to find an icon for the AppData (see
 "No icon 
shown
on flathub.org").  On #flatpak it was deemed impossible to change that id to
point at the the LibreOffice-startcenter.desktop file, so rather change 
that one
desktop file's name.

Change-Id: I78c3ae131be213e41cc4fcdeddae1b6c9e6c29df
(cherry picked from commit d7d12bf1ff10570de5f3392058f7f9c2de04c0a2)
Reviewed-on: https://gerrit.libreoffice.org/44749
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index d514c3ee41fc..e678b9894b86 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -24,6 +24,8 @@ do
   -e 's/^Icon=libreoffice-/Icon=org.libreoffice.LibreOffice-/' "$i" \
   
>/app/share/applications/org.libreoffice.LibreOffice-"${i#"${PREFIXDIR?}"/share/applications/libreoffice-}"
 done
+mv /app/share/applications/org.libreoffice.LibreOffice-startcenter.desktop \
+ /app/share/applications/org.libreoffice.LibreOffice.desktop
 
 ## icons/hicolor/*/apps/libreoffice-* ->
 ## icons/hicolor/*/apps/org.libreoffice.LibreOffice-*:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - solenv/bin

[Stephan Bergmann]

 solenv/bin/assemble-flatpak.sh |   26 +++---
 1 file changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 35fc8885760030cb78b856a23ad02f5148268296
Author: Stephan Bergmann 
Date:   Thu Sep 7 10:50:34 2017 +0200

Include all .desktop files in the Flatpak

...GNOME Software reportedly is fine with that now.

Change-Id: I418fc60a3215078109d3d8e9f426f98fdf37322b
(cherry picked from commit 1b85d725663a7d7546549e6b78ea43bea1cde7b9)
Reviewed-on: https://gerrit.libreoffice.org/42051
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index e73848b6e050..d514c3ee41fc 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -15,29 +15,25 @@ set -e
 
 cp -r "${PREFIXDIR?}"/lib/libreoffice /app/
 
-## libreoffice-startcenter.desktop -> org.libreoffice.LibreOffice.desktop,
-## combining all libreoffice-*.desktop MimeType= lines:
+## libreoffice-*.desktop -> org.libreoffice.LibreOffice-*.desktop:
 mkdir /app/share
 mkdir /app/share/applications
-my_mimetypes=$(awk -d 'BEGIN { FS="="; ORS=""; semi=0 }; \
- /^MimeType=/ && length($2) \
-  { if (semi) print ";"; print $2; semi = match($2, ";$") == 0 }' \
- "${PREFIXDIR?}"/share/applications/libreoffice-*.desktop)
-sed -e 's,^Exec=libreoffice,Exec=/app/libreoffice/program/soffice,' \
- -e 's/^Icon=libreoffice-/Icon=org.libreoffice.LibreOffice-/' \
- -e 's|^MimeType=.*$|MimeType='"$my_mimetypes"'|' \
- "${PREFIXDIR?}"/share/applications/libreoffice-startcenter.desktop \
- >/app/share/applications/org.libreoffice.LibreOffice.desktop
+for i in "${PREFIXDIR?}"/share/applications/libreoffice-*.desktop
+do
+ sed -e 's,^Exec=libreoffice,Exec=/app/libreoffice/program/soffice,' \
+  -e 's/^Icon=libreoffice-/Icon=org.libreoffice.LibreOffice-/' "$i" \
+  
>/app/share/applications/org.libreoffice.LibreOffice-"${i#"${PREFIXDIR?}"/share/applications/libreoffice-}"
+done
 
-## icons/hicolor/*/apps/libreoffice-startcenter.* ->
-## icons/hicolor/*/apps/org.libreoffice.LibreOffice-startcenter.*:
+## icons/hicolor/*/apps/libreoffice-* ->
+## icons/hicolor/*/apps/org.libreoffice.LibreOffice-*:
 mkdir /app/share/icons
-for i in "${PREFIXDIR?}"/share/icons/hicolor/*/apps/libreoffice-startcenter.*
+for i in "${PREFIXDIR?}"/share/icons/hicolor/*/apps/libreoffice-*
 do
  mkdir -p \
   "$(dirname 
/app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"
  cp -a "$i" \
-  "$(dirname 
/app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"/org.libreoffice.LibreOffice-startcenter."${i##*/apps/libreoffice-startcenter.}"
+  "$(dirname 
/app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"/org.libreoffice.LibreOffice-"${i##*/apps/libreoffice-}"
 done
 
 ## org.libreoffice.LibreOffice.appdata.xml is manually derived from the various
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - solenv/bin

[Stephan Bergmann]

 solenv/bin/assemble-flatpak.sh |  110 +
 1 file changed, 110 insertions(+)

New commits:
commit 4f3f3542b8925564a673b9d000aee03e3043f4e0
Author: Stephan Bergmann 
Date:   Tue Jul 4 17:09:16 2017 +0200

Break solenv/bin/assemble-flatpak.sh out of dev-tools flatpak/build.sh

,,,in preparation of moving to a flatpak-builder manifest.json approach

Change-Id: Ie9e90a85cc6e94ff7191161085c6e607512db0c4
(cherry picked from commit 19c13650c81ae7e0ad6cf0d7b8661f8440ee7892)
Reviewed-on: https://gerrit.libreoffice.org/39508
Reviewed-by: Michael Stahl 
Tested-by: Jenkins 

diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
new file mode 100755
index ..e73848b6e050
--- /dev/null
+++ b/solenv/bin/assemble-flatpak.sh
@@ -0,0 +1,110 @@
+#! /bin/bash
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# Assemble Flatpak app files and metadata under /app/, copying from the
+# installation tree generated by 'make distro-pack-install-strip' (at
+# $PREFIXDIR):
+
+set -e
+
+cp -r "${PREFIXDIR?}"/lib/libreoffice /app/
+
+## libreoffice-startcenter.desktop -> org.libreoffice.LibreOffice.desktop,
+## combining all libreoffice-*.desktop MimeType= lines:
+mkdir /app/share
+mkdir /app/share/applications
+my_mimetypes=$(awk -d 'BEGIN { FS="="; ORS=""; semi=0 }; \
+ /^MimeType=/ && length($2) \
+  { if (semi) print ";"; print $2; semi = match($2, ";$") == 0 }' \
+ "${PREFIXDIR?}"/share/applications/libreoffice-*.desktop)
+sed -e 's,^Exec=libreoffice,Exec=/app/libreoffice/program/soffice,' \
+ -e 's/^Icon=libreoffice-/Icon=org.libreoffice.LibreOffice-/' \
+ -e 's|^MimeType=.*$|MimeType='"$my_mimetypes"'|' \
+ "${PREFIXDIR?}"/share/applications/libreoffice-startcenter.desktop \
+ >/app/share/applications/org.libreoffice.LibreOffice.desktop
+
+## icons/hicolor/*/apps/libreoffice-startcenter.* ->
+## icons/hicolor/*/apps/org.libreoffice.LibreOffice-startcenter.*:
+mkdir /app/share/icons
+for i in "${PREFIXDIR?}"/share/icons/hicolor/*/apps/libreoffice-startcenter.*
+do
+ mkdir -p \
+  "$(dirname 
/app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"
+ cp -a "$i" \
+  "$(dirname 
/app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"/org.libreoffice.LibreOffice-startcenter."${i##*/apps/libreoffice-startcenter.}"
+done
+
+## org.libreoffice.LibreOffice.appdata.xml is manually derived from the various
+## inst/share/appdata/libreoffice-*.appdata.xml (at least recent GNOME Software
+## doesn't show more than five screenshots anyway, so restrict to one each from
+## the five libreoffice-*.appdata.xml: Writer, Calc, Impress, Draw, Base):
+mkdir /app/share/appdata
+cat <<\EOF >/app/share/appdata/org.libreoffice.LibreOffice.appdata.xml
+
+
+ org.libreoffice.LibreOffice.desktop
+ CC0-1.0
+ MPL-2.0
+ LibreOffice
+ The LibreOffice productivity suite
+ 
+  LibreOffice is a powerful office suite.  Its clean interface and
+  feature-rich tools help you unleash your creativity and enhance your
+  productivity.  LibreOffice includes several applications that make it the 
most
+  powerful Free and Open Source office suite on the market: Writer (word
+  processing), Calc (spreadsheets), Impress (presentations), Draw (vector
+  graphics and flowcharts), Base (databases), and Math (formula editing).
+  LibreOffice supports opening and saving into a wide variety of formats, so
+  you can easily share documents with users of other popular office suites
+  without worrying about compatibility.
+ 
+ http://www.libreoffice.org/discover/libreoffice/
+ https://bugs.documentfoundation.org/
+ https://donate.libreoffice.org/
+ https://wiki.documentfoundation.org/Faq
+ http://www.libreoffice.org/get-help/documentation/
+ https://wiki.documentfoundation.org/Translating_LibreOffice
+ 
+  
+   
http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-02-Table-of-Contents-Getting-Started-Guide-4-2.png
+   
+  
+  
+   
http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Calc-02-exemple-ods.png
+   
+  
+  
+   
http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Impress-01-Blank.png
+   
+  
+  
+   
http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-02-Tiger-fdo82219.png
+   
+  
+  
+   
http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-78.png
+   
+  
+ 
+ The Document Foundation
+ libreoffice_at_lists.freedesktop.org
+ 
+  HiDpiIcon
+  HighContrast
+  ModernToolkit
+  UserDocs
+ 
+
+EOF
+
+## see  for further places where build-finish would
+