configure.ac | 2 +-
instsetoo_native/util/openoffice.lst.in | 2 +-
pyuno/Package_python_shell.mk | 4 ++++
scp2/source/ooo/common_brand.scp | 4 +---
setup_native/source/packinfo/finals_instsetoo.txt | 1 +
solenv/bin/modules/installer/globals.pm | 2 +-
solenv/bin/modules/installer/windows/admin.pm | 2 ++
7 files changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 5b2a1630676e48f9e09e1ca67bed85f41e2c53b7
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sat Aug 22 08:33:11 2015 +0200
scp2: EULA to Resources on OS X
Change-Id: I87bbb61884d77729832e4d3f36aca29d6dada277
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 1c2738e..507101d 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1305,10 +1305,8 @@ End
File gid_Eula_Odt
BIN_FILE_BODY;
-#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
+#if defined MACOSX
Dir = gid_Dir_Bundle_Contents_Resources;
-#elif defined MACOSX
- Dir = gid_Dir_Bundle_Contents;
#else
Dir = gid_Dir_Brand_Root;
#endif
commit b410c29d3e0adc9d3d454a308965dcbd6e40702e
Author: Andras Timar <andras.ti...@collabora.com>
Date: Thu Jul 2 16:26:50 2015 +0200
put python starter shell script to Resources folder of OS X app
Change-Id: Iaed947b9168fbd1e2d2c79da724426b56bd8a830
diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk
index e8c3fa6..f75cda3 100644
--- a/pyuno/Package_python_shell.mk
+++ b/pyuno/Package_python_shell.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_Package_Package,python_shell,$(call
gb_CustomTarget_get_workdir,pyuno/python_shell)))
+ifeq ($(OS),MACOSX)
+$(eval $(call
gb_Package_add_file,python_shell,$(LIBO_ETC_FOLDER)/python,python.sh))
+else
$(eval $(call
gb_Package_add_file,python_shell,$(LIBO_BIN_FOLDER)/python,python.sh))
+endif
# vim: set noet sw=4 ts=4:
commit b28713d65f9986712cc2f1ed48f76ab3a83f77c2
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Sep 6 01:31:01 2015 -0700
hack to fix an MSP creation error
Change-Id: Ifa833d3adfce5dcc247a8c6e2f972c0638e5c05c
diff --git a/solenv/bin/modules/installer/windows/admin.pm
b/solenv/bin/modules/installer/windows/admin.pm
index 6fb1858..9e2dcd1 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -296,6 +296,8 @@ sub create_directory_structure
{
if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} =
$targetdir; }
}
+ # FIXME why is this hack needed? ERROR: Did not find full directory path
for dir: "ystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"
+ $fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"}
= $targetdir . $installer::globals::separator . "System";
return \%fullpathhash;
}
commit 2b705d6d4d9b03b6a3dbf5c098139f2b517d6064
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sat Sep 5 02:26:15 2015 -0700
Bump version to 4.4-8
Change-Id: I0776bcfd878e7943857bf7515e9031f5804c3a18
diff --git a/configure.ac b/configure.ac
index 0534b27..f2a7271 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[4.4.10.2],[],[],[https://libreoffice-from-collabora.com/])
+AC_INIT([LibreOffice],[4.4.10.8],[],[],[https://libreoffice-from-collabora.com/])
AC_PREREQ([2.59])
commit 97657b7235aff5cb5190248e8483848b89097efa
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sun Jan 12 13:41:18 2014 -0800
enable MSP creation
Change-Id: I3d28cae66d8658505e2339d22304c1b3852fbb43
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 9117dca..efd5a1e 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -26,7 +26,7 @@ Globals
REGISTRYLAYERNAME Layers
SERVICEPACK 1
UPDATE_DATABASE 1
- CREATE_MSP_INSTALLSET 0
+ CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@
diff --git a/setup_native/source/packinfo/finals_instsetoo.txt
b/setup_native/source/packinfo/finals_instsetoo.txt
index d5a68d36..b733122 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt
+++ b/setup_native/source/packinfo/finals_instsetoo.txt
@@ -30,3 +30,4 @@
# OpenOffice pro de
\\<server>\<path>\msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
# OpenOfficeLanguagePack pro es
\\<server>\<path>\msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
# URE pro en-US
\\<server>\<path>\msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
+LibreOffice pro
en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW
c:\lo\src\cp-4.4-2\LibreOffice_4.4-2_Win_x86.msi
diff --git a/solenv/bin/modules/installer/globals.pm
b/solenv/bin/modules/installer/globals.pm
index 5a7423a..40c4823 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -221,7 +221,7 @@ BEGIN
$fix_number_of_cab_files = 1;
$cabfilecompressionlevel = 21; # Using LZX compression, possible values
are: 15 | 16 | ... | 21 (best compression)
$number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1
- $include_cab_in_msi = 1;
+ $include_cab_in_msi = 0;
$msidatabasename = "";
$prepare_winpatch = 0;
$previous_idt_dir = "";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
