[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

2019-01-29 Thread Libreoffice Gerrit user 
 solenv/inc/langlist.mk |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 2549494ea9e4b37cf74e0bc6e3e84213ef104df9
Author: Matthias Seidel 
AuthorDate: Tue Jan 29 10:09:29 2019 +
Commit: Matthias Seidel 
CommitDate: Tue Jan 29 10:09:29 2019 +

Added Armenian (hy) to language list

diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 71b305ae9fcb..c3281f285ec1 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -1,5 +1,5 @@
 #**
-#  
+#
 #  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
@@ -7,16 +7,16 @@
 #  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
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**
 
 
@@ -68,6 +68,7 @@ hi-IN \
 hr \
 ht \
 hu \
+hy \
 is \
 it \
 ja \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

2019-01-24 Thread Libreoffice Gerrit user 
 solenv/inc/minor.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d54692a8b5ed2764d64f89d4db5dba11c62fe4d9
Author: Jim Jagielski 
AuthorDate: Thu Jan 24 13:00:15 2019 +
Commit: Jim Jagielski 
CommitDate: Thu Jan 24 13:00:15 2019 +

Pre-allocate BUILD numbers... Start at 9800 for 4.1.4, 9820 for 4.2.0 and 
9900 for 4.5.x

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index f39950ec596f..316a77d654bb 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -21,7 +21,7 @@
 # $Id$
 
 RSCVERSION=450
-RSCREVISION=450m1(Build:1)
-BUILD=1
+RSCREVISION=450m1(Build:9900)
+BUILD=9900
 LAST_MINOR=m1
 SOURCEVERSION=AOO450
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

2019-01-16 Thread Libreoffice Gerrit user 
 solenv/inc/minor.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a1f6a5d075edc1b5060a62838ac502d9ac672bd8
Author: Jim Jagielski 
AuthorDate: Wed Jan 16 21:55:08 2019 +
Commit: Jim Jagielski 
CommitDate: Wed Jan 16 21:55:08 2019 +

Use something smaller for a build number for 4.5.0 (but leave room for 
4.2/3/4.0)

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index d2c9684586ca..f39950ec596f 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -21,7 +21,7 @@
 # $Id$
 
 RSCVERSION=450
-RSCREVISION=450m1(Build:1009800)
-BUILD=1009800
+RSCREVISION=450m1(Build:1)
+BUILD=1
 LAST_MINOR=m1
 SOURCEVERSION=AOO450
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

2018-07-09 Thread Matthias Seidel 
 solenv/inc/version.lst |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a1dd1b5da2200e7f3e65eaa40978b61cd88f60c0
Author: Matthias Seidel 
Date:   Mon Jul 9 15:05:51 2018 +

Updated version number

diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
index f841368438a8..913688c97769 100755
--- a/solenv/inc/version.lst
+++ b/solenv/inc/version.lst
@@ -20,9 +20,9 @@
 #**
 
 OOOBASEVERSIONMAJOR=4
-OOOBASEVERSIONMINOR=0
+OOOBASEVERSIONMINOR=2
 OOOBASEVERSIONMICRO=0
 
-OOOBASEVERSIONDAY=5
-OOOBASEVERSIONMONTH=2
-OOOBASEVERSIONYEAR=2013
+OOOBASEVERSIONDAY=9
+OOOBASEVERSIONMONTH=7
+OOOBASEVERSIONYEAR=2018
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc vcl/Library_vcl.mk

2017-10-09 Thread Jim Jagielski 
 solenv/inc/unxmacc.mk |2 +-
 solenv/inc/unxmacx.mk |2 +-
 vcl/Library_vcl.mk|6 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 965224b537cbf234195818075d1172184fc3193e
Author: Jim Jagielski 
Date:   Mon Oct 9 17:07:51 2017 +

Get macOS compiling again:

o Restore 10.7 as min
o Deprecated is no longer a fatal warning error
o We need LDFLAGS when linking

diff --git a/solenv/inc/unxmacc.mk b/solenv/inc/unxmacc.mk
index dc651800b678..523dba9b5578 100644
--- a/solenv/inc/unxmacc.mk
+++ b/solenv/inc/unxmacc.mk
@@ -142,7 +142,7 @@ CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -Wno-error=deprecated
 
 # All modules on this platform compile without warnings.
 # If you need to set MODULES_WITH_WARNINGS here, comment
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 8169c14b83a5..46c5252d809a 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -143,7 +143,7 @@ CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -Wno-error=deprecated
 
 # All modules on this platform compile without warnings.
 # If you need to set MODULES_WITH_WARNINGS here, comment
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 6947ae8394ef..0f6393ce9ec1 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -105,6 +105,12 @@ $(eval $(call gb_Library_add_libs,vcl,\
 
 endif
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_set_ldflags,vcl,\
+$$(LDFLAGS) \
+))
+endif
+
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_cxxflags,vcl,\
 $(gb_OBJCXXFLAGS) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

2014-06-19 Thread Herbert Dürr 
 solenv/inc/tg_ext.mk |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 563d895d861c04adb2e18a18d1b54276bfe65a7a
Author: Herbert Dürr h...@apache.org
Date:   Thu Jun 19 08:34:18 2014 +

#i125121# speed up the make writeable step when building external 
libraries

avoiding the many individual invocations of chmod for each directory makes
this step about ten times faster on Windows without SSD (460sec - 41sec
for boost alone). With SSD storage the speedup should be even higher.

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 290b503..ab3a519 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -164,8 +164,7 @@ $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : 
$(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE
 @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
 $(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir)  ( $(shell @$(TYPE) 
$(PRJ)/$(ROUT)/misc/$(TARFILE_MD5)-$(TARFILE_NAME).unpack))  $(TOUCH) 
$(UNTAR_FLAG_FILE)
 @echo make writeable...
-@cd $(PACKAGE_DIR)  chmod -R +rw $(TARFILE_ROOTDIR)  $(TOUCH) 
$(UNTAR_FLAG_FILE)
-@cd $(PACKAGE_DIR)  find $(TARFILE_ROOTDIR) -type d -exec chmod a+x {{}} 
\;
+@cd $(PACKAGE_DIR)  chmod -R +rwX $(TARFILE_ROOTDIR)  $(TOUCH) 
$(UNTAR_FLAG_FILE)
 
 #add new files to patch
 $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) 
$(T_ADDITIONAL_FILES:+.dummy)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

2014-04-10 Thread Oliver-Rainer Wittmann 
 solenv/inc/minor.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit db8e07f2634ef6edc206e99965e9a89b3e14673a
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Thu Apr 10 07:57:12 2014 +

completing 'adapt build meta data for better differentiation to 4.1'

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 21c4192..397a1e1 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -19,7 +19,7 @@
 #
 # *
 RSCVERSION=420
-RSCREVISION=410m1(Build:9800)
+RSCREVISION=420m1(Build:9800)
 BUILD=9800
 LAST_MINOR=m1
 SOURCEVERSION=AOO410
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

2014-04-09 Thread Jürgen Schmidt 
 solenv/inc/minor.mk |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e621072725d304efdada3d5ea261c86676ad2adf
Author: Jürgen Schmidt j...@apache.org
Date:   Wed Apr 9 14:15:47 2014 +

adapt build meta data for better differentiation to 4.1

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 0a775ca..21c4192 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -18,8 +18,8 @@
 #  under the License.
 #
 # *
-RSCVERSION=410
-RSCREVISION=410m14(Build:9760)
-BUILD=9760
-LAST_MINOR=m14
+RSCVERSION=420
+RSCREVISION=410m1(Build:9800)
+BUILD=9800
+LAST_MINOR=m1
 SOURCEVERSION=AOO410
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

2014-03-03 Thread Herbert Dürr 
 solenv/inc/tg_compv.mk |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 2ae9c18c80c3bec0c52dc1b457ab667ced2172ee
Author: Herbert Dürr h...@apache.org
Date:   Mon Mar 3 12:46:45 2014 +

#i124351# avoid clang: no input file build error messages

which were caused by the build system getting the compiler version

diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index f8d7969..5585be8 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -35,9 +35,11 @@ CFLAGSVERSION=-dumpversion
 CFLAGSVERSION_CMD=-dumpversion
 CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f 
$(SOLARENV)/bin/getcompver.awk
 #CFLAGSNUMVERSION_CMD=-dumpversion | 21  $(AWK) -v num=true -f 
$(SOLARENV)/bin/getcompver.awk
-.ENDIF
-
-.IF $(COM)==MSC
+.ELIF $(COM)==CLANG
+CFLAGSVERSION=--version
+CFLAGSVERSION_CMD=--version | head -n1 | sed -es/.*version // -es/ .*//
+CFLAGSNUMVERSION_CMD=${CFLAGSVERSION_CMD} | sed -es/\.//
+.ELIF $(COM)==MSC
 CFLAGSVERSION=
 CFLAGSVERSION_CMD=  $(PIPEERROR) $(AWK) -f $(SOLARENV)/bin/getcompver.awk
 CFLAGSNUMVERSION_CMD=  $(PIPEERROR) $(AWK) -v num=true -f 
$(SOLARENV)/bin/getcompver.awk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

2013-08-16 Thread Jürgen Schmidt 
 solenv/inc/minor.mk |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c8dba796d1fc4df773f26e79554a952cd6219968
Author: Jürgen Schmidt j...@apache.org
Date:   Fri Aug 16 07:54:02 2013 +

adapt version and build number for AOO 4.1.0

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 8fbfec4..2278b56 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -18,8 +18,8 @@
 #  under the License.
 #
 # *
-RSCVERSION=400
-RSCREVISION=400m3(Build:9702)
-BUILD=9702
-LAST_MINOR=m3
-SOURCEVERSION=AOO400
+RSCVERSION=410
+RSCREVISION=410m1(Build:9750)
+BUILD=9750
+LAST_MINOR=m1
+SOURCEVERSION=AOO410
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

2013-05-21 Thread Jürgen Schmidt 
 solenv/inc/minor.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8244f9cbe48e171c0ad0cfbd41efadecac41696d
Author: Jürgen Schmidt j...@apache.org
Date:   Tue May 21 11:10:28 2013 +

increase build id and minor, future imporvement is to get rid of this and 
use rev only

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 9e43088..7e9a080 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -19,7 +19,7 @@
 #
 # *
 RSCVERSION=400
-RSCREVISION=400m1(Build:9700)
-BUILD=9700
-LAST_MINOR=m1
+RSCREVISION=400m2(Build:9701)
+BUILD=9701
+LAST_MINOR=m2
 SOURCEVERSION=AOO400
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits