[Libreoffice-commits] core.git: odk/settings

[Mike Kaganski (via logerrit)]

 odk/settings/platform.mk |   66 ---
 1 file changed, 23 insertions(+), 43 deletions(-)

New commits:
commit 5af26c9ecdcfe70f5954c4acc340e8f9846aacfe
Author: Mike Kaganski 
AuthorDate: Sun Oct 23 20:12:07 2022 +0200
Commit: Mike Kaganski 
CommitDate: Sun Oct 23 22:15:48 2022 +0200

Avoid nesting using 'else conditional-directive'

See https://www.gnu.org/software/make/manual/make.html#Conditional-Syntax

Change-Id: Iddd4ee2d42c83e6d661ef7d91c93a06caf307001
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141708
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/odk/settings/platform.mk b/odk/settings/platform.mk
index fe3aab26..ea3a0ed01380 100644
--- a/odk/settings/platform.mk
+++ b/odk/settings/platform.mk
@@ -25,48 +25,28 @@
 # only make version 3.81 or later accepts the multiple else conditions
 ifeq "$(UNOPKG_PLATFORM)" "FreeBSD_x86"
 EXTENSION_PLATFORM=freebsd_x86
-else
-ifeq "$(UNOPKG_PLATFORM)" "FreeBSD_x86_64"
-EXTENSION_PLATFORM=freebsd_x86_64
-else
-ifeq "$(UNOPKG_PLATFORM)" "Linux_PowerPC"
-EXTENSION_PLATFORM=linux_powerpc
-else
-ifeq "$(UNOPKG_PLATFORM)" "Linux_x86"
-EXTENSION_PLATFORM=linux_x86
-else
-ifeq "$(UNOPKG_PLATFORM)" "Linux_x86_64"
-EXTENSION_PLATFORM=linux_x86_64
-else
-ifeq "$(UNOPKG_PLATFORM)" "MacOSX_PowerPC"
-EXTENSION_PLATFORM=macosx_powerpc
-else
-ifeq "$(UNOPKG_PLATFORM)" "MacOSX_x86"
-EXTENSION_PLATFORM=macosx_x86
-else
-ifeq "$(UNOPKG_PLATFORM)" "MacOSX_x86_64"
-EXTENSION_PLATFORM=macosx_x86_64
-else
-ifeq "$(UNOPKG_PLATFORM)" "Solaris_SPARC"
-EXTENSION_PLATFORM=solaris_sparc
-else
-ifeq "$(UNOPKG_PLATFORM)" "Solaris_x86"
-EXTENSION_PLATFORM=solaris_x86
-else
-ifeq "$(UNOPKG_PLATFORM)" "Windows"
-ifeq "$(PROCTYPE)" "x86_64"
-EXTENSION_PLATFORM=windows_x86_64
-else
-EXTENSION_PLATFORM=windows_x86
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
+else ifeq "$(UNOPKG_PLATFORM)" "FreeBSD_x86_64"
+EXTENSION_PLATFORM=freebsd_x86_64
+else ifeq "$(UNOPKG_PLATFORM)" "Linux_PowerPC"
+EXTENSION_PLATFORM=linux_powerpc
+else ifeq "$(UNOPKG_PLATFORM)" "Linux_x86"
+EXTENSION_PLATFORM=linux_x86
+else ifeq "$(UNOPKG_PLATFORM)" "Linux_x86_64"
+EXTENSION_PLATFORM=linux_x86_64
+else ifeq "$(UNOPKG_PLATFORM)" "MacOSX_PowerPC"
+EXTENSION_PLATFORM=macosx_powerpc
+else ifeq "$(UNOPKG_PLATFORM)" "MacOSX_x86"
+EXTENSION_PLATFORM=macosx_x86
+else ifeq "$(UNOPKG_PLATFORM)" "MacOSX_x86_64"
+EXTENSION_PLATFORM=macosx_x86_64
+else ifeq "$(UNOPKG_PLATFORM)" "Solaris_SPARC"
+EXTENSION_PLATFORM=solaris_sparc
+else ifeq "$(UNOPKG_PLATFORM)" "Solaris_x86"
+EXTENSION_PLATFORM=solaris_x86
+else ifeq "$(UNOPKG_PLATFORM)" "Windows"
+ifeq "$(PROCTYPE)" "x86_64"
+EXTENSION_PLATFORM=windows_x86_64
+else
+EXTENSION_PLATFORM=windows_x86
 endif
 endif

[Libreoffice-commits] core.git: odk/settings

[Thorsten Behrens (via logerrit)]

 odk/settings/settings.mk |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 2af494822da31ccadfc96f59d61493cae63d60d7
Author: Thorsten Behrens 
AuthorDate: Tue Oct 22 14:19:39 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Oct 23 09:02:55 2019 +0200

ODK: cleanup windows linker debug args

This was a somehow confused & partially commented-out setup

Change-Id: Iad5ef6721cda6f85ded3296650ee9a7df9ec59fd
Reviewed-on: https://gerrit.libreoffice.org/81333
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 25b31cd68fac..7998410704bd 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -123,21 +123,20 @@ CC_OUTPUT_SWITCH=-Fo
 
 LIBO_SDK_LDFLAGS_STDLIBS = $(LIBO_SDK_DETAIL_LDFLAGS_MSVCRT) kernel32.lib
 
-LIBRARY_LINK_FLAGS=/DLL /DEBUGTYPE:cv
-COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) /DEF:$(PRJ)/settings/component.uno.def
+LIBRARY_LINK_FLAGS=/DLL
+COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) 
/DEF:$(OO_SDK_HOME)/settings/component.uno.def
 EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x1b00 
/DEBUGTYPE:cv $(LIBO_SDK_LDFLAGS_STDLIBS)
 ifeq "$(DEBUG)" "yes"
-LIBRARY_LINK_FLAGS+=/DEBUG
+LIBRARY_LINK_FLAGS+=/DEBUGTYPE:cv /DEBUG
 EXE_LINK_FLAGS+=/DEBUG
+else
+EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x110
 endif
 
 LINK_JAVA_LIBS=/LIBPATH:"$(OO_SDK_JAVA_HOME)/lib"
 
 URE_MISC=${OFFICE_PROGRAM_PATH}
 
-# use this for release version
-#EXE_LINK_FLAGS=/MAP /OPT:NOREF /SUBSYSTEM:CONSOLE /BASE:0x110
-#LIBRARY_LINK_FLAGS=/DLL
 endif  
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann (via logerrit)]

 odk/settings/platform.mk |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit af7ce81494df6c1f23af1ee14adf4aa55132b5bb
Author: Stephan Bergmann 
AuthorDate: Tue Aug 20 13:15:03 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Aug 20 14:19:27 2019 +0200

Fix EXTENSION_PLATFORM for Windows x86_64

Change-Id: I7fbe1963aff666205dbc9405e94d6093fb9a5a48
Reviewed-on: https://gerrit.libreoffice.org/77804
Reviewed-by: Vasily Melenchuk 
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/odk/settings/platform.mk b/odk/settings/platform.mk
index 7e3b86c62a2c..6980a72715d0 100644
--- a/odk/settings/platform.mk
+++ b/odk/settings/platform.mk
@@ -54,7 +54,11 @@ else
 EXTENSION_PLATFORM=solaris_x86
 else
 ifeq "$(UNOPKG_PLATFORM)" "Windows"
-EXTENSION_PLATFORM=windows_x86
+ifeq "$(PROCTYPE)" "x86_64"
+EXTENSION_PLATFORM=windows_x86_64
+else
+EXTENSION_PLATFORM=windows_x86
+endif
 endif
 endif
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Rene Engelhard]

 odk/settings/settings.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 71183661e66d2e2897c999f39772a324c28a3bf7
Author: Rene Engelhard 
Date:   Wed Nov 8 19:47:17 2017 +0100

fix also odk/settings/settings.mk wrt Java 9 to find jawt

since we can't use HAVE_JAVA= here since it's in a different environment and
we don't know the Java version just do the -L. Doesn't do harm if Java
has the "old" path

Change-Id: I2f912c417597d3b14e570f362f2cfc2df5954108

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 2813959f5dec..e21d33829ba9 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -376,7 +376,7 @@ COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS)
 
 EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined -Wl,-export-dynamic -Wl,-z,defs 
-Wl,--no-whole-archive
 LINK_LIBS=-L"$(OUT)/lib" -L"$(OO_SDK_HOME)/lib" -L"$(OO_SDK_URE_LIB_DIR)"
-LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)"
+LINK_JAVA_LIBS=-L"$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)" 
-L"$(OO_SDK_JAVA_HOME)/lib"
 
 URE_MISC=$(OFFICE_PROGRAM_PATH)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Rene Engelhard]

 odk/settings/settings.mk |   24 
 1 file changed, 24 insertions(+)

New commits:
commit 4256ac0daa42107cfaf1ce54dbd1db6ce82975b0
Author: Rene Engelhard 
Date:   Fri Jun 9 21:08:31 2017 +0200

odk settings.mk: add various missing JAVA_PROC_TYPE overrides for Linux 
arches

... which were missing since ~ ever but now break the odk_build-examples 
test
with /usr/bin/ld: cannot find -ljawt

Change-Id: Ie504ce0c8e21c7d58f1b7e591505940a2f80a2ea

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index b455a6b5d399..2813959f5dec 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -275,6 +275,30 @@ ifeq "$(PROCTYPE)" "powerpc64"
 JAVA_PROC_TYPE=ppc64
 endif
 
+ifeq "$(PROCTYPE)" "powerpc64_le"
+JAVA_PROC_TYPE=ppc64le
+endif
+
+ifeq "$(PROCTYPE)" "arm_eabi"
+JAVA_PROC_TYPE=arm
+endif
+
+ifeq "$(PROCTYPE)" "arm_oabi"
+JAVA_PROC_TYPE=arm
+endif
+
+ifeq "$(PROCTYPE)" "mips_eb"
+JAVA_PROC_TYPE=mips
+endif
+
+ifeq "$(PROCTYPE)" "mips_el"
+JAVA_PROC_TYPE=mipsel
+endif
+
+ifeq "$(PROCTYPE)" "mips64_el"
+JAVA_PROC_TYPE=mips64el
+endif
+
 ifeq "$(PROCTYPE)" "sparc64"
 UNOPKG_PLATFORM=Linux_SPARC64
 JAVA_PROC_TYPE=sparcv9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/std.mk |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 2e244d879126f681488a99b0eb86c3ec2c2170f8
Author: Stephan Bergmann 
Date:   Tue Jan 31 13:47:23 2017 +0100

Allow some OO_SDK_*_HOME to be empty

...in which case the corresponding tool is located on the PATH

Change-Id: I4242180fbbc829f11aa1a12cf1e6b9f0a21ab7c6

diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index ac2d4aa..e69fc3e 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -73,9 +73,21 @@ DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
 SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)
 SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac"
 SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar"
+ifneq "$(OO_SDK_ZIP_HOME)" ""
 SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip"
+else
+SDK_ZIP=zip
+endif
+ifneq "$(OO_SDK_CAT_HOME)" ""
 SDK_CAT="$(OO_SDK_CAT_HOME)/cat"
+else
+SDK_CAT=cat
+endif
+ifneq "$(OO_SDK_SED_HOME)" ""
 SDK_SED="$(OO_SDK_SED_HOME)/sed"
+else
+SDK_SED=sed
+endif
 IDLC="$(OO_SDK_HOME)/bin/idlc"
 CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker"
 JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/settings.mk |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 3aaa820446f1ad3d3b0ddc557238b6fb3496dd54
Author: Stephan Bergmann 
Date:   Mon Sep 12 16:08:38 2016 +0200

tdf#91966: In SDK, set CPPU_ENV=mscx for 64-bit Windows

Change-Id: Ib93b2db40f43f98d8369cb91ca35692cc92f023b

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index bad655c..1d6ad05 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -113,8 +113,14 @@ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" 
-I"$(OO_SDK_JAVA_HOME)/inclu
 # define for used compiler necessary for UNO
 # -DCPPU_ENV=msci -- windows msvc 4.x - 7.x
 
-CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
-CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
+ifeq "$(PROCTYPE)" "x86_64"
+CPPU_ENV=mscx
+else
+CPPU_ENV=msci
+endif
+
+CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=$(CPPU_ENV)
+CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=$(CPPU_ENV)
 CC_OUTPUT_SWITCH=-Fo
 
 LIBO_SDK_LDFLAGS_STDLIBS = $(LIBO_SDK_DETAIL_LDFLAGS_MSVCRT) kernel32.lib
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Zenaan Harkness]

 odk/settings/std.mk |9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 690a1aa9dcf8ce98ec7f96a5980b571566152865
Author: Zenaan Harkness 
Date:   Mon Aug 22 21:58:36 2016 +1000

java extensions makefile - generify

See http://listarchives.libreoffice.org/global/users/msg49357.html

odk/settings/std.mk currently adds each .class file separately,
therefore having to be updated manually any time one class or
anonymous class is added, removed etc.; all the .class files in
com/sun/star/lib/loader/ are needed in the jar anyway, so use a
generic makefile rule.

Change-Id: I3819ab94e2c056220993971de44408e46a4559ed
Reviewed-on: https://gerrit.libreoffice.org/28317
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 
Reviewed-by: jan iversen 

diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 4cabe70..ac2d4aa 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -82,12 +82,5 @@ JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"
 REGMERGE="$(OO_SDK_URE_BIN_DIR)/regmerge"
 
 SDK_JAVA_UNO_BOOTSTRAP_FILES=\
--C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
--C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$1.class$(SQM) \
--C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class$(SQM) \
--C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
--C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/InstallationFinder.class$(SQM) \
--C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class$(SQM) \
--C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/WinRegKey.class$(SQM) \
--C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/WinRegKeyException.class$(SQM) \
+-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/$(SQM) \
 -C $(CLASSES_DIR) $(SQM)win/unowinreg.dll$(SQM)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/std.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 5e1476af00466e657290d952365f2cf91a59a614
Author: Stephan Bergmann 
Date:   Wed Aug 17 17:58:35 2016 +0200

Remove duplicate line

...that was added with both c4c10c17adfb139a208deeb1a47a9fcad924b9c3
"INTEGRATION: CWS sb87: #i88687# let Loader call new unoinfo instead of old
juh.jar UnoInfo.getJars" and 9d53b3321881bd54526f08a9219c539c1430f2b5
"INTEGRATION: CWS jsc21"

Change-Id: I355cbd933e3cff76416d02af8d6717326e0f3cb7

diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 841ecdd..4cabe70 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -84,7 +84,6 @@ REGMERGE="$(OO_SDK_URE_BIN_DIR)/regmerge"
 SDK_JAVA_UNO_BOOTSTRAP_FILES=\
 -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
 -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$1.class$(SQM) \
--C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
 -C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class$(SQM) \
 -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
 -C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/InstallationFinder.class$(SQM) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/std.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e175592a2732c34e16bcd9c19dc465e4974071c3
Author: Stephan Bergmann 
Date:   Wed Aug 17 17:51:13 2016 +0200

Add missing Loader$1.class

...that was introduced with abbf4777f29374025d576ef8daa3f6dcba02ddf5
"cid#1326844: DP: Use doPrivileged"

Change-Id: I8cd4d947b258313d4d171c5888490d1a860ebee7

diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 9fe1e79..841ecdd 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -83,6 +83,7 @@ REGMERGE="$(OO_SDK_URE_BIN_DIR)/regmerge"
 
 SDK_JAVA_UNO_BOOTSTRAP_FILES=\
 -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
+-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$1.class$(SQM) \
 -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
 -C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class$(SQM) \
 -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Riccardo Magliocchetti]

 odk/settings/settings.mk |   20 
 1 file changed, 20 deletions(-)

New commits:
commit cd49f0f80c015703b8ff92a62c0079cf3410b381
Author: Riccardo Magliocchetti 
Date:   Mon Oct 12 12:38:51 2015 +0200

Kill dead mac os x 32bit odk build config

Change-Id: I6e35709a399aa520c9ad198c39a5fb03f3500c9c
Reviewed-on: https://gerrit.libreoffice.org/19320
Tested-by: Jenkins 
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 554ac74..b5bee39 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -355,36 +355,16 @@ endif
 #
 ###
 ifeq "$(PLATFORM)" "macosx"
-# Settings for MacOSX using gcc 4.0.1 compiler
 
-ifeq "$(PROCTYPE)" "x86"
-UNOPKG_PLATFORM=MacOSX_x86
-else
-ifeq "$(PROCTYPE)" "x86_64"
 UNOPKG_PLATFORM=MacOSX_x86_64
-endif
-endif
 JAVABIN=Commands
 
-ifeq "$(PROCTYPE)" "x86"
-GCC_VERSION =$(shell gcc -dumpversion| cut -d"." -f1,2)
-ifeq "$(GCC_VERSION)" "4.2"
-GCC_ARCH_OPTION=-arch i386
-endif
-endif
-
 OS=MACOSX
 PS=/
 ICL=\$$
-ifeq "$(PROCTYPE)" "x86"
-CC=gcc-$(GCC_VERSION)
-LINK=g++-$(GCC_VERSION)
-LIB=g++-$(GCC_VERSION)
-else
 CC=clang++
 LINK=clang++
 LIB=clang++
-endif
 ECHO=@echo
 MKDIR=mkdir -p
 CAT=cat
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/settings.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 428bd61cd80b49c0e4ec1b2ee4b4b8870ebf9a35
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 2 15:44:07 2014 +0100

Consistently use $(...)

Change-Id: I68d3f99ca2a53988fb40ce0d5d364e19a8781cc0

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index b8548e3..2169af4 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -235,7 +235,7 @@ LIBRARY_LINK_FLAGS+=-m64
 EXE_LINK_FLAGS+=-m64
 endif
 
-URE_MISC=${OFFICE_PROGRAM_PATH}
+URE_MISC=$(OFFICE_PROGRAM_PATH)
 
 endif
 
@@ -347,7 +347,7 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined 
-Wl,-export-dynamic -Wl,-z,defs -Wl,-
 LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_LIB_DIR)
 LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)
 
-URE_MISC=${OFFICE_PROGRAM_PATH}
+URE_MISC=$(OFFICE_PROGRAM_PATH)
 
 endif
 
@@ -555,6 +555,6 @@ EXE_LINK_FLAGS=-Wl,--allow-shlib-undefined
 LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_HOME)/lib -L$(OO_SDK_URE_LIB_DIR) 
$(PTHREAD_LIBS)
 LINK_JAVA_LIBS=-L$(OO_SDK_JAVA_HOME)/jre/lib/$(JAVA_PROC_TYPE)
 
-URE_MISC=${OFFICE_PROGRAM_PATH}
+URE_MISC=$(OFFICE_PROGRAM_PATH)
 
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/settings.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4845fd13cb3dde2320df429c2660d95af0f5df64
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Sep 17 00:04:56 2014 +0200

Remove obsolete -malign-natural on Mac OS X from SDK, too

...causes clang: error: unknown argument: '-malign-natural'
[-Wunused-command-line-argument-hard-error-in-future]; clang: note: this 
will be
a hard error (cannot be downgraded to a warning) in the future at least 
with
Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn), and last
mention of -malign-natural in solenv/gbuild was removed with
4ea84822b1b638a61495af5006041bea8db8a3eb OSX: drop -malign-natural flag for
non-clang compilers.

Change-Id: I0db1de484e45ba3eddf113392da71f20d099e9b5

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 0377c57..0075142 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -434,8 +434,8 @@ OPT_FLAGS=-g
 else
 OPT_FLAGS=-O
 endif
-CC_FLAGS_JNI=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) 
$(OPT_FLAGS)
-CC_FLAGS=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) 
-fvisibility=hidden $(OPT_FLAGS)
+CC_FLAGS_JNI=-c -fPIC -fno-common $(GCC_ARCH_OPTION) $(OPT_FLAGS)
+CC_FLAGS=-c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden 
$(OPT_FLAGS)
 
 SDK_JAVA_INCLUDES = 
-I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers 
-I/System/Library/Frameworks/JavaVM.framework/Headers
 CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/settings.mk |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit e5ad31e2f784856506c28092166dc8704c84e868
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jan 20 23:40:36 2014 +0100

Fix Mac OS X 64 bit SDK settings.mk

...to simply use Xcode clang++ (which implicitly uses libc++).

Change-Id: I02578f971e4abddfe74211046674bdcd23d7b279

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 9bc42f5..1153746 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -371,22 +371,30 @@ ifeq $(PROCTYPE) x86
 UNOPKG_PLATFORM=MacOSX_x86
 else
 ifeq $(PROCTYPE) x86_64
-UNOPKG_PLATFORM=MacOSX_x86
+UNOPKG_PLATFORM=MacOSX_x86_64
 endif
 endif
 JAVABIN=Commands
 
+ifeq $(PROCTYPE) x86
 GCC_VERSION =$(shell gcc -dumpversion| cut -d. -f1,2)
 ifeq $(GCC_VERSION) 4.2
 GCC_ARCH_OPTION=-arch i386
 endif
+endif
 
 OS=MACOSX
 PS=/
 ICL=\$$
+ifeq $(PROCTYPE) x86
 CC=gcc-$(GCC_VERSION)
 LINK=g++-$(GCC_VERSION)
 LIB=g++-$(GCC_VERSION)
+else
+CC=clang++
+LINK=clang++
+LIB=clang++
+endif
 ECHO=@echo
 MKDIR=mkdir -p
 CAT=cat
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings solenv/gbuild

[Herbert Dürr]

 odk/settings/settings.mk   |4 ++--
 solenv/gbuild/platform/com_MSC_defs.mk |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1ff69ad5524017914904fd572f1c4b860be81971
Author: Herbert Dürr h...@apache.org
Date:   Wed Jul 17 11:55:51 2013 +

Resolves: #i122767# disallow pre-standard C++ for-scope

(cherry picked from commit 197b1ac3007b870e6c51ae9c767ad4f2a340e799)

Conflicts:
odk/settings/settings.mk
solenv/gbuild/platform/windows.mk
solenv/inc/set_wntx64.mk
solenv/inc/wntmsci11.mk

Change-Id: I266a0d7672839b4568e76b7223aae15d82cd9a63

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index ffab229..b884e75 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -107,8 +107,8 @@ endif
 ifeq $(DEBUG) yes
 OPT_FLAGS=-Zi
 endif
-CC_FLAGS_JNI=-c $(LIBO_SDK_DETAIL_CFLAGS_MSVCRT) -Zm500 -Zc:forScope,wchar_t- 
-wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa 
$(OPT_FLAGS)
-CC_FLAGS=-c $(LIBO_SDK_DETAIL_CFLAGS_MSVCRT) -Zm500 -Zc:forScope,wchar_t- 
-wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa 
$(OPT_FLAGS)
+CC_FLAGS_JNI=-c $(LIBO_SDK_DETAIL_CFLAGS_MSVCRT) -Zm500 -Zc:wchar_t- -wd4251 
-wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -GR -EHa $(OPT_FLAGS)
+CC_FLAGS=-c $(LIBO_SDK_DETAIL_CFLAGS_MSVCRT) -Zm500 -Zc:wchar_t- -wd4251 
-wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -GR -EHa $(OPT_FLAGS)
 ifeq $(CPP_MANIFEST) true
 LINK_MANIFEST=mt -manifest $@.manifest -outputresource:$@;2
 else
diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 04748ed..bb0a141 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -145,7 +145,7 @@ gb_CFLAGS := \
-wd4626 \
-wd4706 \
-wd4800 \
-   -Zc:forScope,wchar_t- \
+   -Zc:wchar_t- \
-Zm500 \
 
 gb_CXXFLAGS := \
@@ -175,7 +175,7 @@ gb_CXXFLAGS := \
-wd4706 \
-wd4800 \
-wd4913 \
-   -Zc:forScope,wchar_t- \
+   -Zc:wchar_t- \
-Zm500 \
 
 ifneq ($(MSVC_USE_DEBUG_RUNTIME),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Jürgen Schmidt]

 odk/settings/std.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 64f19368ccb2ab9658a0827efd4c0619a4343939
Author: Jürgen Schmidt j...@apache.org
Date:   Thu Jun 27 13:21:43 2013 +

Related: #i122356# quote rdb path, windows spaces in paths

(cherry picked from commit 65ef7b5de4d5fa7b8b440a73329b088917f77957)

Conflicts:
odk/settings/std.mk

Change-Id: I73e62097456ab8dbe601f557a4f5b65f9b7aba6b

diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 84c986c..93fa862 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -43,10 +43,10 @@ COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN))
 SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
 
 URE_TYPES=$(subst \,/,$(URE_MISC)$(PS)types.rdb)
-URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb)
+URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb)
 
 OFFICE_TYPES=$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types$(PS)offapi.rdb)
-OFFICE_SERVICES=$(subst 
\\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb)
+OFFICE_SERVICES=$(subst 
\\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb)
 
 OFFICE_TYPE_LIBRARY=$(OFFICE_TYPES)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/std.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 391477d40ea718c46089e16484726dba085a6ad8
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Apr 19 09:26:53 2013 +0200

fdo#63693 Do not force java -d32 for a 64-bit SDK

The test to determine JAVA_OPTIONS was already cheesy (e.g., it does not 
catch
java-1.7.0-openjdk-1.7.0.9-2.3.8.0.fc18.x86_64, as there java -version 
outputs
OpenJDK 64-Bit Server VM (build 23.7-b01, mixed mode) with 64-Bit in the
second instead of the third field), so make it a bit more cheesy still 
(i.e.,
just cover the case to not set -d32 for x86_64).

Change-Id: Ib10a16fb3f8104875bfda7de0e8bce59b9c3b06a

diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 1b260b3..d8c5f51 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -54,9 +54,11 @@ JAVA_OPTIONS=
 ifneq $(OO_SDK_JAVA_HOME) 
 JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 21 | tail 
-1 | cut -d   -f3)
 ifeq $(JAVA_BITS) 64-Bit
+ifneq $(PROCTYPE) x86_64
 JAVA_OPTIONS=-d32
 endif
 endif
+endif
 
 DEPLOYTOOL=$(OFFICE_PROGRAM_PATH)$(PS)unopkg add -f
 SDK_JAVA=$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java $(JAVA_OPTIONS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/settings.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fe6c9239d787a5d6057addbd38c5bb42760bbceb
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Apr 18 14:03:41 2013 +0200

Properly set PS to a single backslash for Windows

I guess all those $(subst \\,\,...) in odk/examples/.../Makefile are only
workarounds for a broken PS setting and could go, too.

Change-Id: I2e44108f23803e1f49157a91be11af5ad860673c

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index acaabbc..b69724a 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -55,7 +55,7 @@ ifeq $(PLATFORM) windows
 # Settings for Windows using Microsoft compiler/linker
 
 OS=WIN
-PS=\\
+PS:=$(strip \ )
 ICL=$$
 CC=cl
 LINK=link
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/settings

[Stephan Bergmann]

 odk/settings/settings.mk |   52 +++
 1 file changed, 22 insertions(+), 30 deletions(-)

New commits:
commit a14eedf997daf30379ceabc1933273360d4d3188
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Feb 20 17:49:20 2013 +0100

rhbz#742780: Let make OPT_FLAGS=... override SDK optimization/debugging 
flags

Change-Id: I639fa16f74342b108a395d7d0335d116f96677f1

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index a71be27..eecde50 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -95,17 +95,16 @@ EMPTYSTRING=
 PATH_SEPARATOR=;
 
 # use this for release version
-CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 
-wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa
-CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 
-wd4786 -wd4800 -Zc:forScope -GR -EHa
+ifeq $(DEBUG) yes
+OPT_FLAGS=-Zi
+endif
+CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 
-wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa $(OPT_FLAGS)
+CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 
-wd4786 -wd4800 -Zc:forScope -GR -EHa $(OPT_FLAGS)
 ifeq $(CPP_MANIFEST) true
 LINK_MANIFEST=mt -manifest $@.manifest -outputresource:$@;2
 else
 LINK_MANIFEST=
 endif
-ifeq $(DEBUG) yes
-CC_FLAGS_JNI+=-Zi
-CC_FLAGS+=-Zi
-endif
 
 CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
 SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include 
-I$(OO_SDK_JAVA_HOME)/include/win32
@@ -213,14 +212,13 @@ STORELIB=-lstore
 EMPTYSTRING=
 PATH_SEPARATOR=:
 
-#CC_FLAGS_JNI=-c -KPIC
-#CC_FLAGS=-c -KPIC -xldscope=hidden
-CC_FLAGS_JNI=-c -fpic
-CC_FLAGS=-c -fpic -fvisibility=hidden
 ifeq $(DEBUG) yes
-CC_FLAGS_JNI+=-g
-CC_FLAGS+=-g
+OPT_FLAGS=-g
 endif
+#CC_FLAGS_JNI=-c -KPIC $(OPT_FLAGS)
+#CC_FLAGS=-c -KPIC -xldscope=hidden $(OPT_FLAGS)
+CC_FLAGS_JNI=-c -fpic $(OPT_FLAGS)
+CC_FLAGS=-c -fpic -fvisibility=hidden $(OPT_FLAGS)
 CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
 SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include 
-I$(OO_SDK_JAVA_HOME)/include/solaris
 
@@ -341,16 +339,14 @@ STORELIB=-lstore
 EMPTYSTRING=
 PATH_SEPARATOR=:
 
-CC_FLAGS_JNI=-c -fpic
-CC_FLAGS=-c -fpic -fvisibility=hidden
 # -O is necessary for inlining (see gcc documentation)
 ifeq $(DEBUG) yes
-CC_FLAGS_JNI+=-g
-CC_FLAGS+=-g
+OPT_FLAGS=-g
 else
-CC_FLAGS_JNI+=-O
-CC_FLAGS+=-O
+OPT_FLAGS=-O
 endif
+CC_FLAGS_JNI=-c -fpic $(OPT_FLAGS)
+CC_FLAGS=-c -fpic -fvisibility=hidden $(OPT_FLAGS)
 
 ifeq $(PROCTYPE) ppc
 CC_FLAGS+=-fPIC
@@ -466,16 +462,14 @@ INSTALL_NAME_URELIBS_BIN=$(XCRUN) install_name_tool 
-change @___
 EMPTYSTRING=
 PATH_SEPARATOR=:
 
-CC_FLAGS_JNI=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION)
-CC_FLAGS=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) 
-fvisibility=hidden
 # -O is necessary for inlining (see gcc documentation)
 ifeq $(DEBUG) yes
-CC_FLAGS_JNI+=-g
-CC_FLAGS+=-g
+OPT_FLAGS=-g
 else
-CC_FLAGS_JNI+=-O
-CC_FLAGS+=-O
+OPT_FLAGS=-O
 endif
+CC_FLAGS_JNI=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) 
$(OPT_FLAGS)
+CC_FLAGS=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) 
-fvisibility=hidden $(OPT_FLAGS)
 
 SDK_JAVA_INCLUDES = 
-I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers 
-I/System/Library/Frameworks/JavaVM.framework/Headers
 CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
@@ -580,16 +574,14 @@ STORELIB=-lstore
 EMPTYSTRING=
 PATH_SEPARATOR=:
 
-CC_FLAGS_JNI=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS)
-CC_FLAGS=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) -fvisibility=hidden
 # -O is necessary for inlining (see gcc documentation)
 ifeq $(DEBUG) yes
-CC_FLAGS_JNI+=-g
-CC_FLAGS+=-g
+OPT_FLAGS=-g
 else
-CC_FLAGS_JNI+=-O
-CC_FLAGS+=-O
+OPT_FLAGS=-O
 endif
+CC_FLAGS_JNI=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) $(OPT_FLAGS)
+CC_FLAGS=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) -fvisibility=hidden $(OPT_FLAGS)
 
 SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include 
-I$(OO_SDK_JAVA_HOME)/include/freebsd
 CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits