[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 4 commits - solenv/bin solenv/inc

[René Engelhard]

 solenv/bin/addsym.awk |   23 ++++++++++++++++++-----
 solenv/inc/minor.mk   |    2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

New commits:
commit 7483d886132c8c8c272010d4013bc1fb95608d63
Merge: 9beb461... e67a599...
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Nov 21 14:46:24 2010 +0100

    Merge commit 'ooo/OOO330_m16' into libreoffice-3-3

diff --cc solenv/inc/minor.mk
index 94f8dc2,6b22483..80c9d76
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@@ -1,5 -1,5 +1,5 @@@
  RSCVERSION=330
 -RSCREVISION=330m16(Build:9549)
 -BUILD=9549
 +RSCREVISION=330m15(Build:1)
 +BUILD=1
- LAST_MINOR=m15
+ LAST_MINOR=m16
  SOURCEVERSION=OOO330
commit e67a59928bd4d8d5d7d04faa652662bc3e7fcf58
Author: Release Engineering <releng at openoffice.org>
Date:   Thu Nov 18 19:10:50 2010 +0100

    OOO330

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index e22bfc3..6b22483 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
-RSCREVISION=330m15(Build:9546)
-BUILD=9546
-LAST_MINOR=m15
+RSCREVISION=330m16(Build:9549)
+BUILD=9549
+LAST_MINOR=m16
 SOURCEVERSION=OOO330
commit 4ff87f5b1a420be0768a7d96d9afdce4984969b9
Merge: 65adbdf... 652c3b7...
Author: obo <obo at openoffice.org>
Date:   Thu Nov 18 18:39:08 2010 +0100

    CWS-TOOLING: integrate CWS sb136

commit 652c3b75bb078d65cfed006a3790dceb234c2ea2
Author: sb <sb at openoffice.org>
Date:   Wed Nov 17 15:17:56 2010 +0100

    sb136: #i114155# partially revert fix for i108776 to avoid ABI incompatibility of jvmaccess library

diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index 52efcb4..621ca2e 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -26,16 +26,29 @@
 #*************************************************************************
 
 # Add certain symbol patterns to the first global section.
+#
+# The below code fails with 'perverted' mapfiles (using a strange line layout,
+# or containing version UDK_3_0_0 without a global section, ...).
 
 BEGIN { state = 0 }
-/\{/ && state == 1 { exit 1 } #TODO: print error explanation to stderr?
-/^[\t ]*UDK_3_0_0[\t ]*\{/ && state == 0 { state = 1 }
-/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
-{ print }
+END {
+    if (state == 0) {
+        print "# Weak RTTI symbols for C++ exceptions:"
+        print "UDK_3_0_0 {"
+        print "global:"
+        print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
+        if (ENVIRON["USE_SYSTEM_STL"] != "YES")
+            print "_ZN4_STL7num_put*; # for STLport"
+        print "};"
+    }
+}
 state == 2 {
     print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
     if (ENVIRON["USE_SYSTEM_STL"] != "YES")
         print "_ZN4_STL7num_put*; # for STLport"
     state = 3
 }
-END { if (state != 3) exit 1 } #TODO: print error explanation to stderr?
+# #i66636# - ???
+/^[\t ]*UDK_3_0_0[\t ]*\{/ { state = 1 }
+/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
+{ print }