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

2023-11-17 Thread Stephan Bergmann (via logerrit) 
 instsetoo_native/CustomTarget_install.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63a5687e84c5f75990a6052658fb5676f7cc2767
Author: Stephan Bergmann 
AuthorDate: Fri Nov 17 08:45:56 2023 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 17 09:59:25 2023 +0100

Missing parenthesis

...from e514f1a462f5fe2d1ef2d58fa3a0ef94892c41fb "fix --enable-wix switch - 
that
didn't do anything"

Change-Id: I4d8124152d5dcb97a11d6fced071ac428ac09bb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159551
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 04ae89c565d8..4a6d92e1cd00 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -59,7 +59,7 @@ endif
 # delimiter is U+2027 Hyphenation point - files with colon in their name 
confuse the heck out of
 # make and cannot be used as targets or prerequisites. For passing to 
call_installer.sh it is
 # substituted by the : so that cut doesn't stumble over the delimiter
-ifeq (TRUE,$(filter TRUE,$(LIBO_TEST_INSTALL) $(ENABLE_WIX))
+ifeq (TRUE,$(filter TRUE,$(LIBO_TEST_INSTALL) $(ENABLE_WIX)))
 instsetoo_installer_targets = openoffice‧en-US‧‧‧archive‧nostrip
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
 instsetoo_installer_targets += sdkoo‧en-US‧_SDK‧‧archive‧nostrip

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

2023-11-08 Thread Christian Lohmaier (via logerrit) 
 instsetoo_native/CustomTarget_install.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 078e102b9fde39b4e5a1d32ace89a21e3ecc24bb
Author: Christian Lohmaier 
AuthorDate: Wed Nov 8 15:30:41 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 8 15:33:30 2023 +0100

msi packaging job-limiter: use CXX_FOR_BUILD

since it is a build-tool it needs to match the arch of the platform the
build is performed, already had used ILIB_FOR_BUILD, but CXX was missed
and broke the build for the aarch64 daily tinderbox

Change-Id: I79edf7d3f7813b43bb447d580d071914a5053b95

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 9326192e5c57..aa18e827fda9 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -99,7 +99,7 @@ gb_Make_JobLimiter := $(WORKDIR)/job-limiter.exe
 
 $(gb_Make_JobLimiter): $(SRCDIR)/solenv/bin/job-limiter.cpp
cd $(WORKDIR) && \
-   $(CXX) $(SOLARINC) -EHsc -Zi $^ -link -LIBPATH:$(subst ;, 
-LIBPATH:,$(ILIB_FOR_BUILD)) || rm -f $@
+   $(CXX_FOR_BUILD) $(SOLARINC) -EHsc $^ -link -LIBPATH:$(subst ;, 
-LIBPATH:,$(ILIB_FOR_BUILD)) || rm -f $@
 
 # with all languages the logfile name would be too long when building the 
windows installation set,
 # that's the reason for the substitution to multilang below in case more than 
just en-US is packaged

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

2023-11-05 Thread Christian Lohmaier (via logerrit) 
 instsetoo_native/CustomTarget_install.mk |   16 
 solenv/bin/job-limiter.cpp   |  116 +++
 2 files changed, 131 insertions(+), 1 deletion(-)

New commits:
commit edf6c155b0b22cbff2d255796c0541b644a5f245
Author: Christian Lohmaier 
AuthorDate: Fri Nov 3 15:41:39 2023 +0100
Commit: Christian Lohmaier 
CommitDate: Sun Nov 5 12:19:39 2023 +0100

limit parallelism during msi packaging stage to avoid cscript failures

with high parallelism there's a high risk of running into random
failures when calling WiLangId.vbs via cscript.

The limiter doesn't use make's jobserver since it is too easy to
deadlock the build since all jobs are started at once, consuming all
slots, but in addition all wait for an additional slot that never is
made available because all jobs are blocked waiting
All jobs being started at once and all jobs getting started from that
point on getting put under the limiter's control makes this simple
approach with separate grab/release calls possible. If they were spread
out the semaphore wouldn't be available (gets closed/removed as soon as
nothing waits for it anymore)

Change-Id: I345f2904a1d7e8989720722415fb51282ab3b05b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158886
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index f05b771fa107..9326192e5c57 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -95,8 +95,19 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_templates/%/Bin
$(call gb_Output_announce,setting up msi templates for type $* - 
copying binary assets,$(true),CPY,4)
rm -rf $@ && mkdir -p $@ && cd $@ && cp 
$(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.* ./
 
+gb_Make_JobLimiter := $(WORKDIR)/job-limiter.exe
+
+$(gb_Make_JobLimiter): $(SRCDIR)/solenv/bin/job-limiter.cpp
+   cd $(WORKDIR) && \
+   $(CXX) $(SOLARINC) -EHsc -Zi $^ -link -LIBPATH:$(subst ;, 
-LIBPATH:,$(ILIB_FOR_BUILD)) || rm -f $@
+
 # with all languages the logfile name would be too long when building the 
windows installation set,
 # that's the reason for the substitution to multilang below in case more than 
just en-US is packaged
+# also for windows msi packaging parallel execution is reduced by the 
job-limiter. This only has any
+# effect when building with help and multiple languages, and it also won't 
affect the real time for
+# packaging (since packaging the main installer takes longer than packaging 
sdk and all helppacks
+# even with the reduced parallelism (the higher the parallelism, the higher 
the chance for random
+# failures during the cscript call to WiLangId.vbs)
 $(instsetoo_installer_targets): $(SRCDIR)/solenv/bin/make_installer.pl \
 $(foreach ulf,$(instsetoo_ULFLIST),$(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
 $(if $(filter-out WNT,$(OS)),\
@@ -104,12 +115,15 @@ $(instsetoo_installer_targets): 
$(SRCDIR)/solenv/bin/make_installer.pl \
 bin/find-requires-gnome.sh \
 bin/find-requires-x11.sh) \
 ,instsetoo_msi_templates) \
-$(call gb_Postprocess_get_target,AllModulesButInstsetNative) | 
instsetoo_wipe
+$(call gb_Postprocess_get_target,AllModulesButInstsetNative) \
+| instsetoo_wipe $(if $(filter msi,$(PKGFORMAT)),$(gb_Make_JobLimiter))
$(call gb_Output_announce,$(if $(filter 
en-US$(COMMA)%,$(instsetoo_installer_langs)),$(subst 
$(instsetoo_installer_langs),multilang,$@),$@),$(true),INS,1)
+   $(if $(filter %msi‧nostrip,$@),$(gb_Make_JobLimiter) grab)
$(call gb_Trace_StartRange,$@,INSTALLER)
$(call gb_Helper_print_on_error, \
$(SRCDIR)/solenv/bin/call_installer.sh $(if 
$(verbose),-verbose,-quiet) $(subst ‧,:,$@),\
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/$(if 
$(filter en-US$(COMMA)%,$(instsetoo_installer_langs)),$(subst 
$(instsetoo_installer_langs),multilang,$@),$@).log)
+   $(if $(filter %msi‧nostrip,$@),$(gb_Make_JobLimiter) release)
$(call gb_Trace_EndRange,$@,INSTALLER)
 
 $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: 
$(instsetoo_installer_targets)
diff --git a/solenv/bin/job-limiter.cpp b/solenv/bin/job-limiter.cpp
new file mode 100644
index ..c5757bfb4a27
--- /dev/null
+++ b/solenv/bin/job-limiter.cpp
@@ -0,0 +1,116 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+

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

2023-04-26 Thread Thorsten Behrens (via logerrit) 
 instsetoo_native/CustomTarget_install.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 904dfc73d08ba51ed29f4009ba2290e6232c0489
Author: Thorsten Behrens 
AuthorDate: Sun Apr 23 12:48:38 2023 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Apr 26 18:50:06 2023 +0200

Disable WiX-based MSI generation for the moment

Right now, CI builders have no WiX toolset installed, breaking all
daily builds (since commit 9aee0383c3ebc3f267c99e19764728ba09c12d3a)

Change-Id: I92ba2590c5afa711d3079edc070fd904b01de6f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150823
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index e4c0f7fcb9e7..ee69d07ebd8f 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -115,7 +115,6 @@ $(instsetoo_installer_targets): 
$(SRCDIR)/solenv/bin/make_installer.pl \
 $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: 
$(instsetoo_installer_targets)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
-   $(if $(LODE_HOME),$(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/msicreator/create_installer.py $(BUILDDIR) $(SRCDIR) $(LIBO_VERSION) 
$(PRODUCTNAME_WITHOUT_SPACES))
 ifeq (TRUE,$(LIBO_TEST_INSTALL))
unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME_WITHOUT_SPACES)/archive/install/en-US/LibreOffice*_archive.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* 
$(TESTINSTALLDIR)/

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk instsetoo_native/inc_common msicreator/create_installer.py msicreator/createmsi.py

2023-04-21 Thread Rakielle (via logerrit) 
 instsetoo_native/CustomTarget_install.mk |3 
 instsetoo_native/inc_common/windows/msi_templates/Binary/Image_2.bmp |binary
 msicreator/create_installer.py   |   84 +
 msicreator/createmsi.py  |  605 
++
 4 files changed, 692 insertions(+)

New commits:
commit 9aee0383c3ebc3f267c99e19764728ba09c12d3a
Author: Rakielle 
AuthorDate: Sun Feb 12 21:42:00 2023 +0100
Commit: Thorsten Behrens 
CommitDate: Sat Apr 22 04:52:55 2023 +0200

Integrate msicreator into LO and generate installer

Co-authored-by: Ximena Alcaman 

Change-Id: Iea2ea3b4bddc975a032592403727a4ff00db4a5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146843
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 29dcb4b0b1cd..e4c0f7fcb9e7 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -74,6 +74,8 @@ instsetoo_installer_targets := $(foreach 
pkgformat,$(PKGFORMAT),\
 $(foreach lang,$(filter-out 
en-US,$(gb_WITH_LANG)),ooolangpack‧$(lang)‧‧-languagepack‧$(pkgformat)‧nostrip)))
 endif
 
+LIBO_VERSION = 
$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)
+
 instsetoo_wipe:
$(call gb_Output_announce,wiping installation output dir,$(true),WPE,6)
rm -rf $(instsetoo_OUT)
@@ -113,6 +115,7 @@ $(instsetoo_installer_targets): 
$(SRCDIR)/solenv/bin/make_installer.pl \
 $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: 
$(instsetoo_installer_targets)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL)
+   $(if $(LODE_HOME),$(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/msicreator/create_installer.py $(BUILDDIR) $(SRCDIR) $(LIBO_VERSION) 
$(PRODUCTNAME_WITHOUT_SPACES))
 ifeq (TRUE,$(LIBO_TEST_INSTALL))
unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME_WITHOUT_SPACES)/archive/install/en-US/LibreOffice*_archive.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* 
$(TESTINSTALLDIR)/
diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image_2.bmp 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image_2.bmp
new file mode 100644
index ..b3795cadea7d
Binary files /dev/null and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image_2.bmp differ
diff --git a/msicreator/create_installer.py b/msicreator/create_installer.py
new file mode 100644
index ..01394a48c4a3
--- /dev/null
+++ b/msicreator/create_installer.py
@@ -0,0 +1,84 @@
+import os, sys
+from shutil import copytree, copy2, move, rmtree
+import json
+import createmsi
+
+build_dir = sys.argv[1]
+src_dir = sys.argv[2]
+creator_dir = os.path.join(build_dir, 'workdir/installation/MSICreatorLO')
+
+def prepare_project_dir():
+instdir = os.path.join(build_dir, 'instdir')
+fonts_dir = os.path.join(instdir, 'share/fonts')
+new_fonts_dir = os.path.join(creator_dir, 'libo-fonts/share/fonts')
+main_dir = os.path.join(creator_dir, 'main')
+src_uninstaller_icon = os.path.join(src_dir, 
'icon-themes/colibre/res/mainapp_48_8.png')
+src_ui_banner = os.path.join(src_dir, 
'instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp')
+src_ui_background = os.path.join(src_dir, 
'instsetoo_native/inc_common/windows/msi_templates/Binary/Image_2.bmp')
+graphics_dir = os.path.join(creator_dir, 'graphics')
+sdk_dir = os.path.join(creator_dir, 'main/sdk')
+try:
+move(fonts_dir, new_fonts_dir)
+copytree(instdir, main_dir, dirs_exist_ok=True)
+copy2(src_uninstaller_icon, creator_dir)
+os.mkdir(graphics_dir)
+copy2(src_ui_banner, graphics_dir)
+copy2(src_ui_background, graphics_dir)
+rmtree(sdk_dir)
+except FileExistsError as err:
+print(err)
+
+def create_creator_json():
+lo_version = sys.argv[3]
+lo_name = sys.argv[4]
+uninstaller_icon = 'mainapp_48_8.png'
+lo_dictionary = {
+"upgrade_guid": "6f05ed48-a735-4155-ab60-e4cc98455262",
+"version": lo_version,
+"product_name": lo_name,
+"manufacturer": "The Document Foundation",
+"name": lo_name,
+"name_base": lo_name,
+"comments": "Testing a libo installer",
+"installdir": "LibreOffice Test",
+"startmenu_shortcut": "program/soffice.exe",
+"desktop_shortcut": "program/soffice.exe",
+"addremove_icon": uninstaller_icon,
+"major_upgrade": {
+"AllowDowngrades": "yes",
+"IgnoreRemoveFailure": "yes"
+},
+"graphics": {
+"banner": "graphics/Banner.bmp",
+"background": "graphics/Image_2.bmp"
+},
+

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

2022-12-08 Thread Stephan Bergmann (via logerrit) 
 instsetoo_native/CustomTarget_install.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8cfffbc67ad25510d194e611871950979dc82253
Author: Stephan Bergmann 
AuthorDate: Wed Dec 7 15:39:21 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Thu Dec 8 09:21:03 2022 +

Stick to three-letter build step prefixes

(it makes the output so much nicer to look at :)

Change-Id: Ib4844e264fd950082b19994156661f460331a2d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143784
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index fd27209c533e..29dcb4b0b1cd 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -75,7 +75,7 @@ instsetoo_installer_targets := $(foreach 
pkgformat,$(PKGFORMAT),\
 endif
 
 instsetoo_wipe:
-   $(call gb_Output_announce,wiping installation output dir,$(true),WIPE,6)
+   $(call gb_Output_announce,wiping installation output dir,$(true),WPE,6)
rm -rf $(instsetoo_OUT)
 
 # list both as prerequisites so that make won't treat the $(template) one as 
intermediate /
@@ -103,7 +103,7 @@ $(instsetoo_installer_targets): 
$(SRCDIR)/solenv/bin/make_installer.pl \
 bin/find-requires-x11.sh) \
 ,instsetoo_msi_templates) \
 $(call gb_Postprocess_get_target,AllModulesButInstsetNative) | 
instsetoo_wipe
-   $(call gb_Output_announce,$(if $(filter 
en-US$(COMMA)%,$(instsetoo_installer_langs)),$(subst 
$(instsetoo_installer_langs),multilang,$@),$@),$(true),INST,1)
+   $(call gb_Output_announce,$(if $(filter 
en-US$(COMMA)%,$(instsetoo_installer_langs)),$(subst 
$(instsetoo_installer_langs),multilang,$@),$@),$(true),INS,1)
$(call gb_Trace_StartRange,$@,INSTALLER)
$(call gb_Helper_print_on_error, \
$(SRCDIR)/solenv/bin/call_installer.sh $(if 
$(verbose),-verbose,-quiet) $(subst ‧,:,$@),\

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

2022-12-06 Thread Andrea Gelmini (via logerrit) 
 instsetoo_native/CustomTarget_install.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 968242fe3220bc3df8104c163bc3a17eee5916c1
Author: Andrea Gelmini 
AuthorDate: Tue Dec 6 18:33:58 2022 +0100
Commit: Andrea Gelmini 
CommitDate: Tue Dec 6 19:51:14 2022 +

Fix typo

Change-Id: I30f6c0d9a3d373078cffc46a243cdde99e707b81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143742
Tested-by: Jenkins
Reviewed-by: Andrea Gelmini 

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 1e6fb07e88ec..fd27209c533e 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -94,7 +94,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_templates/%/Bin
rm -rf $@ && mkdir -p $@ && cd $@ && cp 
$(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.* ./
 
 # with all languages the logfile name would be too long when building the 
windows installation set,
-# that's the reason for the subsitution to multilang below in case more than 
just en-US is packaged
+# that's the reason for the substitution to multilang below in case more than 
just en-US is packaged
 $(instsetoo_installer_targets): $(SRCDIR)/solenv/bin/make_installer.pl \
 $(foreach ulf,$(instsetoo_ULFLIST),$(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
 $(if $(filter-out WNT,$(OS)),\

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

2022-05-27 Thread Thorsten Behrens (via logerrit) 
 instsetoo_native/CustomTarget_install.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c9d018df610b7bd7d5794231b2ccb0d8090573a6
Author: Thorsten Behrens 
AuthorDate: Fri May 27 00:45:18 2022 +0200
Commit: Thorsten Behrens 
CommitDate: Fri May 27 09:33:45 2022 +0200

make_installer: convert Win to Unix path for cygwin

Usual cygwin auto-conversion magic doesn't work for PATH variable,
which requires proper /cygdrive/foo/bar entries.

Change-Id: Ic07ffcdf7cb28c5e5702964c331f337ee811c063
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135032
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 37b177ab94c2..e4642c6ed6d2 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -71,7 +71,10 @@ $(if $(GNUPARALLEL), \
 , \
 $(call gb_Helper_print_on_error, \
 cd $(dir $@) \
-&& PATH="$(SRCDIR)/solenv/bin:$$PATH" \
+$(if $(filter WNT,$(OS)), \
+   && PATH="$(shell cygpath -u $(SRCDIR)/solenv/bin):$$PATH" \
+, \
+   && PATH="$(SRCDIR)/solenv/bin:$$PATH") \
 $(foreach curpkg,$(1),\
 && call_installer.sh $(if $(verbose),-verbose,-quiet) $(curpkg) \
 ),$@.log))

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

2022-05-25 Thread Thorsten Behrens (via logerrit) 
 instsetoo_native/CustomTarget_install.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit aee953d7b66c02bbd7034cbf8991e3748dc3794a
Author: Thorsten Behrens 
AuthorDate: Wed May 25 13:21:26 2022 +0200
Commit: Thorsten Behrens 
CommitDate: Thu May 26 01:09:55 2022 +0200

Reduce cmd line length for make_installer calls

Seems on Windows, we're hitting the 8k character max cmd line length,
on setups with slightly deeper src tree path locations. Shorten length
of expanded call_installer calls by putting shell script into PATH
locally.

Change-Id: If1cddab9e4e07a7c5ebfae7a4e88e43b1bc8b907
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134938
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 47b2ffe1a262..37b177ab94c2 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -71,8 +71,9 @@ $(if $(GNUPARALLEL), \
 , \
 $(call gb_Helper_print_on_error, \
 cd $(dir $@) \
+&& PATH="$(SRCDIR)/solenv/bin:$$PATH" \
 $(foreach curpkg,$(1),\
-&& $(SRCDIR)/solenv/bin/call_installer.sh $(if $(verbose),-verbose,-quiet) 
$(curpkg) \
+&& call_installer.sh $(if $(verbose),-verbose,-quiet) $(curpkg) \
 ),$@.log))
 endef

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

2021-01-07 Thread Vasily Melenchuk (via logerrit) 
 instsetoo_native/CustomTarget_install.mk |   20 +---
 1 file changed, 9 insertions(+), 11 deletions(-)

New commits:
commit 3e789a83b0d11c99157da86d2082b247fe6a7113
Author: Vasily Melenchuk 
AuthorDate: Wed Dec 9 19:59:52 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Thu Jan 7 14:33:21 2021 +0100

Support for signing when PRODUCTNAME contain spaces

Anyway files are stored without spaces, so we should use same name.

Additionally removed PRODUCTNAME_no_spaces variable, it's just a
redundant alias.

Change-Id: I5b88ac3b07d06969f7639a25603392c9d662d3f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108405
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index b9991d208dd4..1dd705217c63 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -62,8 +62,6 @@ export LOCAL_COMMON_OUT := $(instsetoo_OUT)
 
 instsetoo_native_WITH_LANG := en-US $(filter-out en-US,$(gb_WITH_LANG))
 
-PRODUCTNAME_no_spaces := $(subst $(WHITESPACE),,$(PRODUCTNAME))
-
 ifeq (WNT,$(OS))
 define instsetoo_native_msitemplates
 
@@ -85,7 +83,7 @@ $(foreach pkgformat,$(5),\
 && $(if $(filter-out archive,$(pkgformat)),ENABLE_STRIP=1) $(PERL) -w $< \
-f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-   -p $(PRODUCTNAME_no_spaces)$(3) \
+   -p $(PRODUCTNAME_WITHOUT_SPACES)$(3) \
-u $(instsetoo_OUT) \
-buildid $(if $(filter deb0 
rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
$(if $(filter WNT,$(OS)), \
@@ -104,13 +102,13 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
rm -rf $(instsetoo_OUT)
 ifeq (TRUE,$(LIBO_TEST_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
-   unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME_no_spaces)/archive/install/en-US/LibreOffice*_archive.zip
+   unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME_WITHOUT_SPACES)/archive/install/en-US/LibreOffice*_archive.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* 
$(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
-   unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME_no_spaces)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
+   unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME_WITHOUT_SPACES)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
 $(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
@@ -157,8 +155,8 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.do
$(if $(PFXFILE),-f $(PFXFILE)) \
$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
$(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
-   -d $(PRODUCTNAME)\ 
$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)
 \
-   
$(WORKDIR)/installation/$(PRODUCTNAME)/msi/install/*/*.msi \
+   -d $(PRODUCTNAME_WITHOUT_SPACES)\ 
$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)
 \
+   
$(WORKDIR)/installation/$(PRODUCTNAME_WITHOUT_SPACES)/msi/install/*/*.msi \
&& touch $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
 
@@ -171,8 +169,8 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signin
$(if $(PFXFILE),-f $(PFXFILE)) \
$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
$(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
-   -d $(PRODUCTNAME)\ 
$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
 Helppack \
-   
$(WORKDIR)/installation/$(PRODUCTNAME)_helppack/msi/install/*/*.msi \
+   -d $(PRODUCTNAME_WITHOUT_SPACES)\ 
$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
 Helppack \
+   
$(WORKDIR)/installation/$(PRODUCTNAME_WITHOUT_SPACES)_helppack/msi/install/*/*.msi
 \
&& touch $@
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL)
 
@@ -185,8 +183,8 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.don
$(if $(PFXFILE),-f $(PFXFILE)) \
$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \

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

2019-09-06 Thread Christian Lohmaier (via logerrit) 
 instsetoo_native/CustomTarget_install.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 551f757b27ee7e3f6a316afd5ae8966ff40b7e25
Author: Christian Lohmaier 
AuthorDate: Fri Sep 6 18:29:27 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Sep 6 18:31:23 2019 +0200

WINDOWS_BUILD_SIGNING: check for explicit TRUE for signing msi

it's one of those variables that are set to FALSE and not left empty...

Change-Id: Ic26888e4e983db625b5943a2c094eacc84fe1331

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 3272a57b71f4..ab620d5844ed 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -20,7 +20,7 @@ $(eval $(call 
gb_CustomTarget_CustomTarget,instsetoo_native/install))
 
 $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\
install.phony \
-   $(if $(WINDOWS_BUILD_SIGNING),msi_signing.done) \
+   $(if $(filter TRUE,$(WINDOWS_BUILD_SIGNING)),msi_signing.done) \
$(if $(filter-out WNT,$(OS)),\
bin/find-requires-gnome.sh \
bin/find-requires-x11.sh) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-06-13 Thread Christian Lohmaier 
 instsetoo_native/CustomTarget_install.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2797c4a0efe60726467593c6f2ea93774038b683
Author: Christian Lohmaier 
Date:   Tue Jun 13 20:32:07 2017 +0200

always strip non-archive type installation packages

Change-Id: I676414b679bff95829bdc1d5d02cef4fcfca4576

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 59a4500e6ece..016fbbd03abd 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -79,7 +79,7 @@ $(call instsetoo_native_msitemplates,$(1))
 $(call gb_Helper_print_on_error, \
 cd $(dir $@) \
 $(foreach pkgformat,$(5),\
-&& $(PERL) -w $< \
+&& $(if $(filter-out archive,$(pkgformat)),ENABLE_STRIP=1) $(PERL) -w $< \
-f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-p $(PRODUCTNAME_no_spaces)$(3) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-02 Thread Jan Holesovsky 
 instsetoo_native/CustomTarget_install.mk |8 +---
 solenv/bin/ooinstall |5 -
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 010a2a8ed3214380d514be56171c974f99010bc1
Author: Jan Holesovsky 
Date:   Tue Aug 2 09:15:37 2016 +0100

Don't use spaces in the product names when packaging.

Change-Id: I55f332117cc7530eb6d562846db379d95e628a22

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 0fb97da..59a4500 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -59,6 +59,8 @@ export LOCAL_COMMON_OUT := $(instsetoo_OUT)
 
 instsetoo_native_WITH_LANG := en-US $(filter-out en-US,$(gb_WITH_LANG))
 
+PRODUCTNAME_no_spaces := $(subst $(WHITESPACE),,$(PRODUCTNAME))
+
 ifeq (WNT,$(OS))
 define instsetoo_native_msitemplates
 
@@ -80,7 +82,7 @@ $(foreach pkgformat,$(5),\
 && $(PERL) -w $< \
-f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-   -p $(PRODUCTNAME)$(3) \
+   -p $(PRODUCTNAME_no_spaces)$(3) \
-u $(instsetoo_OUT) \
-buildid $(if $(filter deb0 
rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
$(if $(filter WNT,$(OS)), \
@@ -98,13 +100,13 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
rm -rf $(instsetoo_OUT)
 ifeq (TRUE,$(LIBO_TEST_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
-   unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME)/archive/install/en-US/LibreOffice*_archive.zip
+   unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME_no_spaces)/archive/install/en-US/LibreOffice*_archive.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* 
$(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
-   unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
+   unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME_no_spaces)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
 $(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index f9034cd..edd3d83 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -89,11 +89,14 @@ if ($destdir && "$ENV{DESTDIR}" ne "/" && -d 
"$ENV{DESTDIR}") {
 
 print "Running LibreOffice installer\n";
 
+my $PRODUCTNAME_no_spaces = $ENV{PRODUCTNAME};
+$PRODUCTNAME_no_spaces =~ s/ //g;
+
 system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
 "perl " .
 (scalar keys(%DB::sub) ? "-d " : "") .
 "-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
-"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
$ENV{PRODUCTNAME}" . " " .
+"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
$PRODUCTNAME_no_spaces " .
 "-u $tmp_dir " .
 "-buildid $BUILD $destdir $strip $msi " .
 "-simple $path") && die "Failed to install: $!";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-02 Thread Jan-Marek Glogowski 
 instsetoo_native/CustomTarget_install.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d526f5d739bbf923a6c882cb9a92a15f590a3388
Author: Jan-Marek Glogowski 
Date:   Thu Oct 1 17:57:33 2015 +0200

Ignore grep return code for MSI builds

So "grep -v" returns != 0, if your input or output file is empty.
which breaks the Jenkins build, because Jenkins runs scripts with
-xe per default.

The "strip comments" grep currently fails for the empty file
instsetoo_native/inc_openoffice/windows/msi_templates/components.txt

Change-Id: I53a477702dbcc3c00c4a23263c3b402cb936250a

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index a74a2177..0fb97da 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -65,7 +65,7 @@ define instsetoo_native_msitemplates
 TEMPLATE_DIR=$(dir $@)msi_templates \
 && rm -rf $${TEMPLATE_DIR} \
 && mkdir -p $${TEMPLATE_DIR}/Binary \
-&& for I in $(SRCDIR)/instsetoo_native/inc_$(1)/windows/msi_templates/*.* ; do 
$(GREP) -v '^#' "$$I" > $${TEMPLATE_DIR}/`basename $$I` ; done \
+&& for I in $(SRCDIR)/instsetoo_native/inc_$(1)/windows/msi_templates/*.* ; do 
$(GREP) -v '^#' "$$I" > $${TEMPLATE_DIR}/`basename $$I` || true ; done \
 && $(GNUCOPY) 
$(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.* 
$${TEMPLATE_DIR}/Binary
 endef
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk setup_native/source

2015-06-29 Thread Martin Hollmichel 
 instsetoo_native/CustomTarget_install.mk  |2 
 setup_native/source/packinfo/package_names.txt|   64 +-
 setup_native/source/packinfo/packinfo_office_help.txt |2 
 setup_native/source/packinfo/packinfo_office_lang.txt |   20 ++---
 4 files changed, 44 insertions(+), 44 deletions(-)

New commits:
commit 39b04ad7cb2e10f32e92d3c9bec57e35f64a3304
Author: Martin Hollmichel martin.hollmic...@gmail.com
Date:   Mon Jun 29 18:18:22 2015 +0100

Remove some hard coded references to LibreOffice as Productname.

Change-Id: Ibd0a500d7ba31ec4c25bad64b39311d45e94dca3
Reviewed-on: https://gerrit.libreoffice.org/16590
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index f894ae5..1643783 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -80,7 +80,7 @@ $(foreach pkgformat,$(5),\
  $(PERL) -w $ \
-f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-   -p LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \
+   -p $(PRODUCTNAME)$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \
-u $(instsetoo_OUT) \
-buildid $(if $(filter deb0 
rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
$(if $(filter WNT,$(OS)), \
diff --git a/setup_native/source/packinfo/package_names.txt 
b/setup_native/source/packinfo/package_names.txt
index ac89557..f23e332 100644
--- a/setup_native/source/packinfo/package_names.txt
+++ b/setup_native/source/packinfo/package_names.txt
@@ -1,37 +1,37 @@
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING   Language module 
for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-base  Base 
language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-calc  Calc 
language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-draw  Draw 
language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-fonts 
Language fonts module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-help  
Language help module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-impress   Impress 
language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-math  Math 
language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-onlineupd Online 
update language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-res   
Language resource module for LibreOffice %PRODUCTVERSION, language 
%LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-writerWriter 
language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-activex   ActiveX control for 
LibreOffice %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base  Base module for 
LibreOffice %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc  Calc module for 
LibreOffice %PRODUCTVERSION
-%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core  Core module for 
LibreOffice %PRODUCTVERSION
+%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING   Language module 
for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-base  Base 
language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-calc  Calc 
language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-draw  Draw 
language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-fonts 
Language fonts module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-help  
Language help module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING
+%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-impress   Impress 
language module for %PRODUCTNAME %PRODUCTVERSION, language %LANGUAGESTRING

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

2015-06-29 Thread Michael Stahl 
 instsetoo_native/CustomTarget_install.mk |6 +++---
 instsetoo_native/util/openoffice.lst.in  |4 ++--
 solenv/bin/ooinstall |2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2e63faa863e1a6b9cd7556978c86c16299eaec43
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jun 29 22:08:16 2015 +0200

instsetoo_native: fix building installation sets

... after 39b04ad7cb2e10f32e92d3c9bec57e35f64a3304 started using
PRODUCTNAME but here it was LibreOffice_Dev for mysterious reasons
whereas PRODUCTNAME is LibreOfficeDev so rename for consistency.

Change-Id: Ia5f5a24f405923a7ea1641de65709fbf842df79c

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 1643783..03134ce 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -80,7 +80,7 @@ $(foreach pkgformat,$(5),\
  $(PERL) -w $ \
-f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-   -p $(PRODUCTNAME)$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \
+   -p $(PRODUCTNAME)$(3) \
-u $(instsetoo_OUT) \
-buildid $(if $(filter deb0 
rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
$(if $(filter WNT,$(OS)), \
@@ -98,13 +98,13 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
rm -rf $(instsetoo_OUT)
 ifeq (TRUE,$(LIBO_TEST_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
-   unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if 
$(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
+   unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME)/archive/install/en-US/LibreOffice*_archive.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* 
$(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
-   unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if 
$(ENABLE_RELEASE_BUILD),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
+   unzip -q -d $(TESTINSTALLDIR) 
$(instsetoo_OUT)/$(PRODUCTNAME)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
mv $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
 $(TESTINSTALLDIR)/
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index d05f8ab..f197c3c 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -84,7 +84,7 @@ LibreOffice
 }
 }
 
-LibreOffice_Dev
+LibreOfficeDev
 {
 Settings
 {
@@ -176,7 +176,7 @@ LibreOffice_SDK
 }
 }
 
-LibreOffice_Dev_SDK
+LibreOfficeDev_SDK
 {
 Settings
 {
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index cf4d3db..04de7ab 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -98,7 +98,7 @@ system (cd $ENV{SRC_ROOT}/instsetoo_native/util ;  .
 perl  .
 (scalar keys(%DB::sub) ? -d  : ) .
 -w $ENV{SRCDIR}/solenv/bin/make_installer.pl  .
--f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
LibreOffice . ($ENV{ENABLE_RELEASE_BUILD} ?  : _Dev) .   .
+-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p 
$ENV{PRODUCTNAME} .   .
 -u $tmp_dir  .
 -buildid $BUILD $destdir $strip $msi  .
 -simple $path)  die Failed to install: $!;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk instsetoo_native/inc_openoffice

2015-06-15 Thread Caolán McNamara 
 instsetoo_native/CustomTarget_install.mk   |6 -
 instsetoo_native/inc_openoffice/unix/find-requires-glib.sh |   26 ---
 instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh|   33 
++
 instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh |   26 ---
 4 files changed, 35 insertions(+), 56 deletions(-)

New commits:
commit 1a038dc88b19ee601f411d5847ee74751b08c476
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jun 15 17:04:07 2015 +0100

alternative solution to avoid adding a gnome-vfs dependency if disabled

i.e. don't add gnomevfs requires to epm created rpms if GNOMEVFS is 
disabled

seeing as setup_native/source/packinfo/packinfo_office.txt references
find-requires-gnome.sh and doesn't have conditional support revert the split
and put the the conditional into find-requires-gnome.sh

Change-Id: I34bd37c4fd252f2175ff055024293dea946b4881

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 101160c..f894ae5 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -21,8 +21,7 @@ $(eval $(call 
gb_CustomTarget_CustomTarget,instsetoo_native/install))
 $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\
install.phony \
$(if $(filter-out WNT,$(OS)),\
-   $(if $(ENABLE_GNOMEVFS),bin/find-requires-gnomevfs.sh) \
-   bin/find-requires-glib.sh \
+   bin/find-requires-gnome.sh \
bin/find-requires-x11.sh) \
$(foreach ulf,$(instsetoo_ULFLIST),win_ulffiles/$(ulf).ulf) \
 ))
@@ -32,8 +31,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \
$(foreach ulf,$(instsetoo_ULFLIST),$(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
$(if $(filter-out WNT,$(OS)),\
$(addprefix $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/,\
-   $(if $(ENABLE_GNOMEVFS),bin/find-requires-gnomevfs.sh) \
-   bin/find-requires-glib.sh \
+   bin/find-requires-gnome.sh \
bin/find-requires-x11.sh) \
) \
$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-glib.sh 
b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
similarity index 84%
rename from instsetoo_native/inc_openoffice/unix/find-requires-glib.sh
rename to instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
index 4be8766..bd40ad3 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-glib.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
@@ -19,6 +19,13 @@
 
 cat  /dev/null
 [[ ${PLATFORMID} == linux_x86_64 ]]  mark64=()(64bit)
+if [[ ${ENABLE_GNOMEVFS} == TRUE ]]; then
+  if [[ ${OS} == AIX ]]; then
+echo libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})
+  else
+echo libgnomevfs-2.so.0${mark64}
+  fi
+fi
 if [[ ${OS} == AIX ]]; then
   echo libgconf-2.a(libgconf-2.so.4${mark64})
 else
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh 
b/instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh
deleted file mode 100644
index 12d03c9..000
--- a/instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# 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/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the License); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-cat  /dev/null
-[[ ${PLATFORMID} == linux_x86_64 ]]  mark64=()(64bit)
-if [[ ${OS} == AIX ]]; then
-  echo libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})
-else
-  echo libgnomevfs-2.so.0${mark64}
-fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk instsetoo_native/inc_openoffice

2015-06-10 Thread Caolán McNamara 
 instsetoo_native/CustomTarget_install.mk   |6 +-
 instsetoo_native/inc_openoffice/unix/find-requires-glib.sh |   26 +
 instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh|   28 
--
 instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh |   26 +
 4 files changed, 56 insertions(+), 30 deletions(-)

New commits:
commit bb42b693c81814a966723b5067a2d20754fe82e0
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 10 10:37:19 2015 +0100

don't add gnomevfs requires to epm created rpms if GNOMEVFS is disabled

Change-Id: I689783e176921ea03475d3e113426563bf20b9d7

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index f894ae5..101160c 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -21,7 +21,8 @@ $(eval $(call 
gb_CustomTarget_CustomTarget,instsetoo_native/install))
 $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\
install.phony \
$(if $(filter-out WNT,$(OS)),\
-   bin/find-requires-gnome.sh \
+   $(if $(ENABLE_GNOMEVFS),bin/find-requires-gnomevfs.sh) \
+   bin/find-requires-glib.sh \
bin/find-requires-x11.sh) \
$(foreach ulf,$(instsetoo_ULFLIST),win_ulffiles/$(ulf).ulf) \
 ))
@@ -31,7 +32,8 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \
$(foreach ulf,$(instsetoo_ULFLIST),$(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
$(if $(filter-out WNT,$(OS)),\
$(addprefix $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/,\
-   bin/find-requires-gnome.sh \
+   $(if $(ENABLE_GNOMEVFS),bin/find-requires-gnomevfs.sh) \
+   bin/find-requires-glib.sh \
bin/find-requires-x11.sh) \
) \
$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-glib.sh 
b/instsetoo_native/inc_openoffice/unix/find-requires-glib.sh
new file mode 100644
index 000..4be8766
--- /dev/null
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-glib.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# 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/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the License); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+cat  /dev/null
+[[ ${PLATFORMID} == linux_x86_64 ]]  mark64=()(64bit)
+if [[ ${OS} == AIX ]]; then
+  echo libgconf-2.a(libgconf-2.so.4${mark64})
+else
+  echo libgconf-2.so.4${mark64}
+fi
diff --git a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh 
b/instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh
similarity index 92%
rename from instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
rename to instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh
index 8b91d77..12d03c9 100644
--- a/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh
+++ b/instsetoo_native/inc_openoffice/unix/find-requires-gnomevfs.sh
@@ -21,8 +21,6 @@ cat  /dev/null
 [[ ${PLATFORMID} == linux_x86_64 ]]  mark64=()(64bit)
 if [[ ${OS} == AIX ]]; then
   echo libgnomevfs-2.a(libgnomevfs-2.so.0${mark64})
-  echo libgconf-2.a(libgconf-2.so.4${mark64})
 else
   echo libgnomevfs-2.so.0${mark64}
-  echo libgconf-2.so.4${mark64}
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-18 Thread Stephan Bergmann 
 instsetoo_native/CustomTarget_install.mk |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a55adb16ece70360c88342ca008d5a9d5b9d5b52
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Nov 18 22:57:16 2014 +0100

Hide instsetoo_native output

Change-Id: Ifd3fca29325dc18166d041badd5664d2ad8ba7c9

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index ea03413..2d6f537 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -74,6 +74,7 @@ endif
 
 define instsetoo_native_install_command
 $(call instsetoo_native_msitemplates,$(1))
+$(call gb_Helper_print_on_error, \
 cd $(dir $@) \
 $(foreach pkgformat,$(5),\
  $(PERL) -w $ \
@@ -89,7 +90,7 @@ $(foreach pkgformat,$(5),\
$(4) \
-format $(pkgformat) \
$(if $(VERBOSE)$(verbose),-verbose,-quiet) \
-)
+),$@.log)
 endef
 
 $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-02 Thread Christian Lohmaier 
 instsetoo_native/CustomTarget_install.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d67e273cf8b210f2f80908dfa4f50be6acbcf5c
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Mon Jun 2 11:49:05 2014 +0200

don't limit the 0 → 1 replacement in release to deb

since there are rpm-frontends that do their own version comparison that
is different from rpm itself.

Change-Id: Iddf38c14e7f48eec5d043de57e3404fcd9da24f7

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 16b841c..ea03413 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -81,7 +81,7 @@ $(foreach pkgformat,$(5),\
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-p LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \
-u $(instsetoo_OUT) \
-   -buildid $(if $(filter 
deb0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
+   -buildid $(if $(filter deb0 
rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
$(if $(filter WNT,$(OS)), \
-msitemplate $(dir $@)msi_templates \
-msilanguage $(dir $@)win_ulffiles \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-21 Thread Christian Lohmaier 
 instsetoo_native/CustomTarget_install.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a95d12b547e2635e10aa074fe42f12a0ea151163
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date:   Wed May 21 17:37:33 2014 +0200

fdo#70596 dependency problem with debian packages for master/dev builds

debian packages don't cope with release number of 0, so use release 1
for debian master/dev-packages

Change-Id: Id91926322d13bddad3a39faccfee4e131d8956b0

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 2af27ac..16b841c 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -81,7 +81,7 @@ $(foreach pkgformat,$(5),\
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-p LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \
-u $(instsetoo_OUT) \
-   -buildid $(LIBO_VERSION_PATCH) \
+   -buildid $(if $(filter 
deb0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \
$(if $(filter WNT,$(OS)), \
-msitemplate $(dir $@)msi_templates \
-msilanguage $(dir $@)win_ulffiles \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk instsetoo_native/util Repository.mk scp2/InstallModule_smoketest.mk scp2/InstallScript_test.mk scp2/Module_scp2.mk scp2/source

2013-10-18 Thread Stephan Bergmann 
 Repository.mk  |6 
 instsetoo_native/CustomTarget_install.mk   |3 
 instsetoo_native/util/openoffice.lst.in|   85 ---
 instsetoo_native/util/pack.lst |1 
 scp2/InstallModule_smoketest.mk|   16 
 scp2/InstallScript_test.mk |   16 
 scp2/Module_scp2.mk|2 
 scp2/source/smoketest/smoketest.scp|  171 --
 setup_native/Package_packinfo.mk   |1 
 setup_native/source/packinfo/packinfo_test.txt |   35 -
 smoketest/Module_smoketest.mk  |2 
 smoketest/Package_losmoketest.mk   |   15 
 smoketest/Package_smoketestdoc.mk  |   14 
 smoketest/lodownloadtest.py|  662 -
 smoketest/losmoketest  |   41 -
 smoketest/losmoketest.readme   |  186 ---
 16 files changed, 1 insertion(+), 1255 deletions(-)

New commits:
commit 359472b2b50165966c27c239eccd3ecfb03e2acc
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Oct 18 12:45:00 2013 +0200

Remove *_Test product, so cppunittester can be NONE again

...as per #libreoffice-dev IRC:

Sep 19 10:32:24 mst__ sberg, moggi  why the hell is that thing named
  cppunit/cppunittester and inside a subdir?  it's obstructing my attempt 
to
  put it in $(INSTDIR)/program
Sep 19 10:33:28 mst__ (... and if you wonder wtf does it have to do with
  INSTDIR you have never heard of awesome LibreOffice_Test installset 
not
  that i would know who needs it :)
Sep 19 10:36:36 sberg mst__, it is in a subdir of solver/*/bin so that on
  Windows it would not accidentally have picked DLLs next to itself instead 
of
  the module-local DLLs it was supposed to test (back when we had 
module-local
  output trees)
Sep 19 10:37:02 mst__ sberg, ahh hysteric reasons then, /me renames it
Sep 19 10:37:55 tml mst__, if nobody you know uses LibreOffice_Test, just 
kill
  it?
Sep 19 10:38:59 sberg mst__, tml, LibreOffice_Test was conceived by 
pmladek
  and/or kendy, IIRC
Sep 19 10:40:31 * kendy does not remember anything about it :-)
Sep 19 10:42:17 sberg wasn't that something so users (or QA people?) could
  easily run the smoketest against an installation, to see whether the
  installation is any good at all, by installing that LibreOffice_Test 
alongside
  the installation proper?
Sep 19 10:43:26 sberg mst__, ...and I'd unscientifically vote to kill it
Sep 19 11:34:23 pmladek mst__, sberg: I have created the LibreOffice_Test
  package for one QA guy. He does not longer work on LO. I am not sure if 
anyone
  else started to use it. So, I think that it can be killed.

Oct 17 18:18:07 tml_ sberg: have you ever noticed that when you try to
  actually run instdir/unxmacxi/LibreOfficeDev.app , the system actually 
tries
  to run cppunittester inside the app bundle (it says so in the crash 
report)
  (it crashes because cppunittester requires a specialized 
DYLIB_LIBRARY_PATH
  apparently)
Oct 17 18:19:29 tml_ I suspect that the system when cppunittester as part 
of
  the build process is run from inside instdir (i.e. inside an app bundle) 
the
  system caches this false knowledge, and thinks that the executable of 
the
  app bundle is cppunittester...
Oct 17 18:19:36 sberg tml_, no, never noticed; with run
  instdir/unxmacxi/LibreOfficeDev.app you mean calling open
  instdir/unxmacxi/LibreOfficeDev.app?  (I always call
  .app/Contenst/MacOS/program explicitly)
Oct 17 18:19:52 tml_ yes, I mean open instdir/...
Oct 17 18:20:53 tml_ some googling tells me that at least years ago, the
  CFBundleExecutable key in the Info.plist is ignored if it is manually 
changed,
  so I guess similar caching of mapping between an app bundle and which
  executable to actually run happens in this case
Oct 17 18:23:17 tml_ and last year somebody even claims And while on 
Mountain
  Lion, CFBundleExecutable seems to be a no-op, which would be odd, surely
  there must be widely used apps that have several executables inside the 
MacOS
  directory; how would the system know which one to run when the app is run?
Oct 17 18:24:38 tml_ hmm, apparently the code that handles this might be 
open
  source even, 
http://www.opensource.apple.com/source/CF/CF-744.18/CFBundle.c
Oct 17 18:25:52 tml_ some mention of caches there yes, my guesses might 
be
  right
Oct 17 18:27:05 tml_ if I cp -R instdir/unxmacxi/LibreOffice.app foo.app 
and
  open foo.app, it works fine
Oct 17 18:28:33 tml_ anyway, I guess it would be cleaner to have 
cppunittester
  somewhere else even without this problem
Oct 17 18:37:09 sberg tml_, yes, IIRC having cppunittester in instdir was 
a
  misguided mst decision, because that odd

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk Makefile.in

2013-10-02 Thread Michael Stahl 
 Makefile.in  |8 
 instsetoo_native/CustomTarget_install.mk |3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 0d3c536d0535fb7d50c123dd8b9d3fdf5d5dc973
Author: Michael Stahl mst...@redhat.com
Date:   Tue Oct 1 23:48:56 2013 +0200

fix make test-install on WNT

Change-Id: I681f2c4989b88943fe57e6173554a019539a18cc

diff --git a/Makefile.in b/Makefile.in
index 450d674..050e7a1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -299,14 +299,14 @@ endif
@echo If you want to edit the .ui files with glade first execute:
@echo
@echo export GLADE_CATALOG_SEARCH_PATH=$(TESTINSTALLDIR)/share/glade
-ifeq ($(OS),LINUX)
+ifneq ($(OS),MACOSX)
@echo
@echo Test installation finished, you can now execute:
@echo
-   @echo $(TESTINSTALLDIR)/program/soffice
-else ifeq ($(OS),MACOSX)
+   @echo   $(TESTINSTALLDIR)/program/soffice
+else
@echo
-   @echo Developer installation finished, you can now run:
+   @echo Test installation finished, you can now run:
@echo
@echo   open $(TESTINSTALLDIR)/LibreOffice.app
@echo
diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index ba9fc4b..04e78d4 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -98,7 +98,8 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
 ifeq (TRUE,$(LIBO_TEST_INSTALL))
$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if 
$(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
-   mv $(TESTINSTALLDIR)/LibreOffice*_archive/* $(TESTINSTALLDIR)/
+   mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* 
$(TESTINSTALLDIR)/
+   rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*
rmdir $(TESTINSTALLDIR)/LibreOffice*_archive
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-24 Thread David Tardon 
 instsetoo_native/CustomTarget_install.mk  |5 +
 solenv/bin/modules/installer/epmfile.pm   |2 +-
 solenv/bin/modules/installer/globals.pm   |2 ++
 solenv/bin/modules/installer/parameter.pm |5 +
 4 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 8bae88b146529d469742b33ead50b3a01457e313
Author: David Tardon dtar...@redhat.com
Date:   Wed Jul 24 08:50:45 2013 +0200

look for find-requires-gnome.sh in the right path

... and make sure it exists as well.

Change-Id: Ia895d93d2755a2b0b9d87601ace54ee47b5c1b80

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index e3a52f2..ffedb20 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -29,6 +29,11 @@ $(eval $(call 
gb_CustomTarget_register_targets,instsetoo_native/install,\
 $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \
$(SOLARENV)/bin/make_installer.pl \
$(foreach ulf,$(instsetoo_ULFLIST),$(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
+   $(if $(filter-out WNT,$(OS)),\
+   $(addprefix $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/,\
+   bin/find-requires-gnome.sh \
+   bin/find-requires-x11.sh) \
+   ) \
$(call gb_Postprocess_get_target,AllModulesButInstsetNative)
 
 $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%.sh: 
$(SRCDIR)/instsetoo_native/inc_openoffice/unix/find-requires-%.sh
diff --git a/solenv/bin/modules/installer/epmfile.pm 
b/solenv/bin/modules/installer/epmfile.pm
index 4ea85b6..c1dd768 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -1702,7 +1702,7 @@ sub prepare_packages
 if ( $installer::globals::isrpmbuild )
 {
 set_topdir_in_specfile($changefile, $filename, $newepmdir);
-set_autoprovreq_in_specfile($changefile, 
$onepackage-{'findrequires'}, $installer::globals::unpackpath . /bin);
+set_autoprovreq_in_specfile($changefile, 
$onepackage-{'findrequires'}, $installer::globals::workpath . /bin);
 set_packager_in_specfile($changefile);
 if ( is_extension_package($changefile) ) { 
set_prereq_in_specfile($changefile); }
 set_license_in_specfile($changefile, $variableshashref);
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index cb58cdc0..2940407 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -59,6 +59,8 @@ BEGIN
 $ismacbuild = 0;
 $ismacdmgbuild = 0;
 $unpackpath = ;
+$workpath = ; # installation working dir; some helper scripts are
+# placed here by gbuild
 $idttemplatepath = ;
 $idtlanguagepath = ;
 $buildid = Not set;
diff --git a/solenv/bin/modules/installer/parameter.pm 
b/solenv/bin/modules/installer/parameter.pm
index 4475ec4..0cc6e9e 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -349,6 +349,11 @@ sub setglobalvariables
 $installer::globals::unpackpath = cwd();
 }
 
+if ($installer::globals::workpath eq )  # workpath not set
+{
+$installer::globals::workpath = cwd();
+}
+
 if ( $installer::globals::localunpackdir ne  ) { 
$installer::globals::unpackpath = $installer::globals::localunpackdir; }
 
 if (!($installer::globals::unpackpath eq ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-19 Thread David Tardon 
 instsetoo_native/CustomTarget_install.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d0db3134653cfc0e3c59e25203728a02865ceead
Author: David Tardon dtar...@redhat.com
Date:   Thu Jun 20 06:35:11 2013 +0200

do not try to install helppacks that were not built

Change-Id: I0156c38e71fe46ea599a8366b953d429dfa424bb

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 0962ac8..573b9c6 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -122,7 +122,7 @@ ifeq (,$(filter WNT MACOSX,$(OS)))
$(call 
instsetoo_native_install_command,not-used,en-US,_Test,,$(PKGFORMAT))
 endif
 ifeq (HELP,$(filter HELP,$(BUILD_TYPE))$(filter MACOSX,$(OS)))
-   $(foreach lang,$(filter-out 
$(WITH_POOR_HELP_LOCALIZATIONS),$(instsetoo_native_WITH_LANG)), \
+   $(foreach lang,$(gb_HELP_LANGS),\
$(call 
instsetoo_native_install_command,ooohelppack,$(lang),,-helppack,$(PKGFORMAT)))
 endif
 ifneq (WNT,$(OS))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-05-17 Thread Tor Lillqvist 
 instsetoo_native/CustomTarget_install.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8186a4a1e478f5f869443d2c34d06877433e444c
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri May 17 13:42:42 2013 +0300

Check for ODK in BUILD_TYPE

Change-Id: Ia3c5cf74dc88dbb741ea1eac7bbdf0b41617ded9

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 4a94395..0962ac8 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -105,12 +105,14 @@ ifeq (TRUE,$(LIBO_DEV_INSTALL))
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
rmdir $(DEVINSTALLDIR)/LibreOffice*_archive
+ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter 
TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
mv $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
 $(DEVINSTALLDIR)/opt/
rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk
+endif
 else # LIBO_DEV_INSTALL
$(call instsetoo_native_install_command,openoffice,$(if $(filter 
WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT))
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-15 Thread Stephan Bergmann 
 instsetoo_native/CustomTarget_install.mk |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f99df8b7ac4cba88ba5f6aa5439605fcff2d1e3e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Apr 15 10:51:04 2013 +0200

Fix for LibreOfficeDev naming scheme

Change-Id: I77dd5b38e729310d58c92aa4aaf82228d2fe781b

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index bb8af19..78ed0a1 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -102,15 +102,15 @@ $(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$(if $(filter 
TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice_*_archive.zip
-   mv $(DEVINSTALLDIR)/LibreOffice_*_archive/* $(DEVINSTALLDIR)/opt
-   rmdir $(DEVINSTALLDIR)/LibreOffice_*_archive
+   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
+   rmdir $(DEVINSTALLDIR)/LibreOffice*_archive
$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
-   unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter 
TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)_SDK/archive/install/en-US/LibreOffice_*_archive_sdk.zip
-   mv $(DEVINSTALLDIR)/LibreOffice_*_archive_sdk/LibreOffice_*_SDK/sdk \
+   unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter 
TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
+   mv $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
 $(DEVINSTALLDIR)/opt/
-   rmdir $(DEVINSTALLDIR)/LibreOffice_*_archive_sdk/LibreOffice_*_SDK
-   rmdir $(DEVINSTALLDIR)/LibreOffice_*_archive_sdk
+   rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
+   rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk
 else # LIBO_DEV_INSTALL
$(call 
instsetoo_native_install_command,openoffice,$(instsetoo_native_WITH_LANG),,,$(PKGFORMAT))
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-03-01 Thread 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 pmla...@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@.@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
-downloadnameLibO-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@
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-commits] core.git: instsetoo_native/CustomTarget_install.mk solenv/bin solenv/CustomTarget_versionlist.mk solenv/Package_minor.mk

2013-02-27 Thread Norbert Thiebaud 
 instsetoo_native/CustomTarget_install.mk|2 +-
 solenv/CustomTarget_versionlist.mk  |4 ++--
 solenv/Package_minor.mk |2 +-
 solenv/bin/modules/installer/scriptitems.pm |2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4038f2467cc97ab964880dd39e1227fcf4f42a7b
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Wed Feb 27 23:17:37 2013 -0600

fix: BUILDDIR is not always SRCDIR

Change-Id: I6028fe295e467aa448d8503097be0c80a42908ed

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 1135616..288bbbd 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -81,7 +81,7 @@ $(call instsetoo_native_msitemplates,$(1))
 cd $(dir $@) \
 $(foreach pkgformat,$(5),\
  $(PERL) -w $ \
-   -f $(SRCDIR)/instsetoo_native/util/openoffice.lst \
+   -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \
-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
-p LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)$(3) \
-u $(instsetoo_OUT) \
diff --git a/solenv/CustomTarget_versionlist.mk 
b/solenv/CustomTarget_versionlist.mk
index f7706ac..5ffed0b 100644
--- a/solenv/CustomTarget_versionlist.mk
+++ b/solenv/CustomTarget_versionlist.mk
@@ -27,12 +27,12 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,solenv/versionlist))
 
-include $(SRCDIR)/solenv/inc/minor.mk
+include $(BUILDDIR)/solenv/inc/minor.mk
 
 $(call gb_CustomTarget_get_target,solenv/versionlist) : $(call 
gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc
 
 $(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc : \
-   $(SRCDIR)/solenv/inc/minor.mk \
+   $(BUILDDIR)/solenv/inc/minor.mk \
| $(call gb_CustomTarget_get_workdir,solenv/versionlist)/.dir
 
 $(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc :
diff --git a/solenv/Package_minor.mk b/solenv/Package_minor.mk
index 7ea056a..70b0faf 100644
--- a/solenv/Package_minor.mk
+++ b/solenv/Package_minor.mk
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Package_Package,solenv_minor_mk,$(SRCDIR)/solenv/inc))
+$(eval $(call gb_Package_Package,solenv_minor_mk,$(BUILDDIR)/solenv/inc))
 
 $(eval $(call gb_Package_add_file,solenv_minor_mk,inc/$(UPD)minor.mk,minor.mk))
 $(eval $(call 
gb_Package_add_file,solenv_minor_mk,inc/minormkchanged.flg,minor.mk))
diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index 77fa1d3..cd4b141 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -672,7 +672,7 @@ sub replace_setup_variables
 
 if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; }   # 
using 680 instead of src680
 
-my $buildidstring = `git log -n 1 --pretty=format:%H`;
+my $buildidstring = `cd $ENV{'SRCDIR'} 21 /dev/null  git log -n 1 
--pretty=format:%H`;
 if ($? || !$buildidstring) {
 $buildidstring = $localbuild . $localminor . (Build: . 
$installer::globals::buildid . );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk Module_tail_build.mk solenv/gbuild

2013-02-27 Thread Bjoern Michaelsen 
 Module_tail_build.mk |1 +
 instsetoo_native/CustomTarget_install.mk |9 ++---
 solenv/gbuild/Module.mk  |5 +
 3 files changed, 12 insertions(+), 3 deletions(-)

New commits:
commit 87c57d871c65b4669a54fed009b16c5f37acbbf8
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Feb 26 17:42:05 2013 +0100

move instsetoo_native to gbuild

Change-Id: Ie4deddc426356636b76ad4fc27552c6d3a1dd815
Reviewed-on: https://gerrit.libreoffice.org/2429
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 68a23db..0469a4b 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -95,6 +95,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
$(call gb_Helper_optional,ICU,icu) \
idl \
$(call gb_Helper_optional,DESKTOP,idlc) \
+   instsetoo_native \
io \
javaunohelper \
$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 6f12965..1135616 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -28,7 +28,8 @@ $(eval $(call 
gb_CustomTarget_register_targets,instsetoo_native/install,\
 
 $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \
$(SOLARENV)/bin/make_installer.pl \
-   $(foreach ulf,$(instsetoo_ULFLIST),$(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf)
+   $(foreach ulf,$(instsetoo_ULFLIST),$(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
+   $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
 
 $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%.sh: 
$(SRCDIR)/instsetoo_native/inc_openoffice/unix/find-requires-%.sh
cat $ | tr -d \015  $@
@@ -37,7 +38,8 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%
 ifneq ($(WITH_LANG),)
 $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \

$(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf | \
-   $(call gb_Executable_get_runtime_dependencies,ulfex)
+   $(call gb_Executable_get_runtime_dependencies,ulfex) \
+   $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call gb_Output_announce,$@,$(true),SUM,1)
MERGEINPUT=`$(gb_MKTEMP)`  \
echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/instsetoo_native/inc_openoffice/windows/msi_languages.po)
  $${MERGEINPUT}  \
@@ -46,7 +48,8 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf:
rm -rf $${MERGEINPUT}
 else
 $(call 
gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \
-   $(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf
+   
$(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf \
+   $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
cp $ $@
 endif
 
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index d20176a..52c2113 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -154,6 +154,7 @@ gb_Module__debug_enabled = \
$(filter all $(1)/,$(ENABLE_DEBUGINFO_FOR)))
 
 define gb_Module_Module
+$(if $(filter-out tail_build instsetoo_native,$(1)),$(call 
gb_Postprocess_get_target,AllModulesButInstsetNative) : $(call 
gb_Module_get_target,$(1)))
 gb_Module_ALLMODULES += $(1)
 gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword 
$(MAKEFILE_LIST
 gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1)) 
$(gb_Module_TARGETSTACK)
@@ -290,4 +291,8 @@ endif
 $$(eval $$(gb_Extensions_final_hook))
 endef
 
+$(call gb_Postprocess_get_target,AllModulesButInstsetNative) :
+   $(call gb_Output_announce,All modules but instset: $^,$(true),ALL)
+   $(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@)  touch $@)
+
 # vim: set noet sw=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-02-26 Thread Andras Timar 
 instsetoo_native/CustomTarget_install.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b4e8f99a253ee20cba0718d042ca17cca2e8dcb5
Author: Andras Timar ati...@suse.com
Date:   Tue Feb 26 11:02:56 2013 +0100

instsetoo_native: fix helppack generation

Change-Id: I30778847b23aabccba2275d518eba7f57ffcefd5

diff --git a/instsetoo_native/CustomTarget_install.mk 
b/instsetoo_native/CustomTarget_install.mk
index 8b55cad..6f12965 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -62,6 +62,7 @@ instsetoo_native_WITH_LANG := en-US $(filter-out 
en-US,$(gb_WITH_LANG))
 
 ifeq (WNT,$(OS))
 define instsetoo_native_msitemplates
+
 TEMPLATE_DIR=$(dir $@)msi_templates \
  rm -rf $${TEMPLATE_DIR} \
  mkdir -p $${TEMPLATE_DIR}/Binary \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk instsetoo_native/inc_common instsetoo_native/inc_openoffice instsetoo_native/Makefile instsetoo_native/Module_instsetoo_native.

2013-02-24 Thread Peter Foley 
 Makefile.in |   23 
 dev/null|binary
 instsetoo_native/CustomTarget_install.mk|  121 +++
 instsetoo_native/Makefile   |   14 
 instsetoo_native/Module_instsetoo_native.mk |   20 
 instsetoo_native/README |4 
 instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp  |binary
 instsetoo_native/inc_openoffice/unix/makefile.mk|   46 -
 instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk   |   50 -
 instsetoo_native/prj/build.lst  |5 
 instsetoo_native/prj/d.lst  |3 
 instsetoo_native/util/makefile.mk   |  361 
--
 instsetoo_native/util/update.xml|   27 
 scp2/source/python/file_python.scp  |6 
 solenv/bin/modules/installer/control.pm |1 
 solenv/bin/modules/installer/windows/idtglobal.pm   |2 
 17 files changed, 167 insertions(+), 516 deletions(-)

New commits:
commit 1d84e9d1d363bd550129efcbeafe670c0a049dd0
Author: Peter Foley pefol...@verizon.net
Date:   Thu Feb 21 20:40:59 2013 -0500

instsetoo_native: convert to gbuild

Removes:
 * instsetoo_native/util/update.xml
  - gen_update_info.pl can be removed ?

  On Windows the binary artifacts are created now in:
  workdir/*/installation/LibreOffice_Dev/native/install/en-US/*.msi

Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259d49
Reviewed-on: https://gerrit.libreoffice.org/2242
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: David Ostrovsky david.ostrov...@gmx.de
Tested-by: David Ostrovsky david.ostrov...@gmx.de

diff --git a/Makefile.in b/Makefile.in
index c276b63..7895009 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,7 +67,7 @@ $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard 
*/prj/dmake) $(BUILD
echo gbuild_modules:= tail_build \\  $@
for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done  $@
echo  $@
-   echo -n dmake_modules:= helpcontent2 instsetoo_native  $@
+   echo -n dmake_modules:= helpcontent2  $@
echo  $@
 
 -include $(WORKDIR)/modules.mk
@@ -257,7 +257,7 @@ $(WORKDIR)/bootstrap:
 #
 # Build
 #
-build-postprocess: bootstrap fetch $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
+build: bootstrap fetch $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
 ifeq ($(DISABLE_SCRIPTING),TRUE)
 # We must get the headers from vbahelper delivered because
 # as we don't link to any libs from there they won't otherwise be, or
@@ -270,16 +270,9 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
 # Ditto for dbconnectivity in the --disable-database-connectivity case
$(GNUMAKE) connectivity
 endif
-   cd $(SRC_ROOT)/postprocess  unset MAKEFLAGS  \
+   cd $(SRCDIR)/postprocess  unset MAKEFLAGS  \
$(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- 
-P$(PARALLELISM)
-
-build: build-postprocess
-ifeq ($(OS_FOR_BUILD),WNT)
-   cd $(SRC_ROOT)/instsetoo_native  unset MAKEFLAGS  
$(SOLARENV)/bin/build.pl
-else
-   cd $(SRC_ROOT)/instsetoo_native  unset MAKEFLAGS  \
-$(SOLARENV)/bin/build.pl -P$(PARALLELISM) -- -P$(PARALLELISM)
-endif
+   cd $(SRCDIR)/instsetoo_native  $(GNUMAKE) -j $(PARALLELISM) 
$(GMAKE_OPTIONS)
 ifeq ($(OS),ANDROID)
cd android  $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
 endif
@@ -322,9 +315,7 @@ dev-install: build
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
-   cd $(SRC_ROOT)/instsetoo_native  unset MAKEFLAGS  
$(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE
-   unzip -q -d $(DEVINSTALLDIR) 
$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip
-   mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
+   cd $(SRCDIR)/instsetoo_native  $(GNUMAKE) LIBO_DEV_INSTALL=TRUE 
$(GMAKE_OPTIONS)
 else
 ifeq ($(DISABLE_LINKOO),TRUE)
@ooinstall $(DEVINSTALLDIR)/opt
@@ -413,9 +404,7 @@ install-tb:
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
-   cd $(SRC_ROOT)/instsetoo_native  unset MAKEFLAGS  
$(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE
-   unzip -q -d $(DEVINSTALLDIR) 
$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip
-   mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
+   cd $(SRCDIR)/instsetoo_native  $(GNUMAKE) LIBO_DEV_INSTALL=TRUE 
$(GMAKE_OPTIONS)
 else