[openoffice] branch scons-build updated: Pass the SharedObjects class itself to AOOSharedLibrary, so we can populate library defs.

[damjan]

This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch scons-build
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/scons-build by this push:
     new 793ec54  Pass the SharedObjects class itself to AOOSharedLibrary, so 
we can populate library defs.
793ec54 is described below

commit 793ec546a2e4941d7ad0fec56a058ad24a3b365e
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Sun Feb 9 09:07:05 2020 +0200

    Pass the SharedObjects class itself to AOOSharedLibrary,
    so we can populate library defs.
    
    Patch by: me
---
 .../src/main/java/org/apache/openoffice/gotoSCons/SConsConverter.java  | 2 +-
 main/fileaccess/SConscript                                             | 2 +-
 main/site_scons/sharedLibrary.py                                       | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/SConsConverter.java 
b/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/SConsConverter.java
index c3f1d50..4b51d67 100644
--- 
a/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/SConsConverter.java
+++ 
b/gotoSCons/src/main/java/org/apache/openoffice/gotoSCons/SConsConverter.java
@@ -81,7 +81,7 @@ public class SConsConverter {
         out.println(String.format("%s = AOOSharedLibrary(", 
library.getName()));
         out.println(String.format("    '%s',", library.getName()));
         out.println(String.format("    '%s',", layer));
-        out.println(String.format("    %s.objects", objectsVariable));
+        out.println(String.format("    %s", objectsVariable));
         out.println(String.format(")"));
 
         if (!library.getLinkedLibs().isEmpty()) {
diff --git a/main/fileaccess/SConscript b/main/fileaccess/SConscript
index cd47d9c..dfa021c 100644
--- a/main/fileaccess/SConscript
+++ b/main/fileaccess/SConscript
@@ -36,7 +36,7 @@ objs.AddCxxExceptionSources([
 fileacc = AOOSharedLibrary(
     'fileacc',
     'OOOLIBS',
-    objs.objects
+    objs
 )
 fileacc.AddLinkedLibs(
     [
diff --git a/main/site_scons/sharedLibrary.py b/main/site_scons/sharedLibrary.py
index df8a83e..de80ac0 100644
--- a/main/site_scons/sharedLibrary.py
+++ b/main/site_scons/sharedLibrary.py
@@ -26,9 +26,10 @@ from globals import *
 class AOOSharedLibrary:
     def __init__(self, target, group, sharedObjects):
         self.env = DefaultEnvironment().Clone()
+        sharedObjects.env.Append(CPPDEFINES=platform.getLibraryDefs(soenv))
         self.sharedLib = self.env.SharedLibrary(
             target,
-            source = sharedObjects
+            source = sharedObjects.objects
         )
         self.env['AOO_THIS'] = self.sharedLib[0]
         self.env.Append(LINKFLAGS=platform.getLibraryLDFlags(soenv, group, 
OUTDIRLOCATION, DEBUGGING, DEBUGLEVEL))