CWS-TOOLING: integrate CWS sb107

2009-04-14 13:09:13 +0200 sb  r270758 : CWS-TOOLING: rebase CWS sb107 to trunk@270723 (milestone: DEV300:m46)
2009-04-06 14:11:54 +0200 sb  r270545 : #i100884# improve pagein effectiveness: wrap system libs in --as-needed on unxlngi6/unxlngx6 to avoid needing them where unneeded; link pagein as C program to avoid unneeded C++ runtime dependency; reorder pagein and javaldx in soffice startup script so that javaldx benefits from pagein
2009-03-31 16:40:23 +0200 sb  r270287 : decrease collisions in hashCode computation
2009-03-30 11:48:39 +0200 sb  r270207 : #i100668# corrected explicit template instantiation
2009-03-26 14:16:26 +0100 sb  r270078 : #i100408# inadvertently dropped libexslt dynamic library in previous rev 269789
2009-03-26 10:52:51 +0100 sb  r270058 : #i100576# fixed erroneous modification of RPM in previous rev 270057
2009-03-26 10:46:36 +0100 sb  r270057 : #i100576# Enable HAVE_LD_HASH_STYLE in sdev300.ini for unxlgni6 and unxlngx6; corrected unxlngx6.mk so that HAVE_LD_HASH_STYLE actually has an effect on ultimate LINKFLAGS value.
2009-03-25 16:53:39 +0100 sb  r270038 : #i85679# applied speed-symbolic-functions.diff provided by pmladek; re-ran autoconf; enabled HAVE_LD_BSYMBOLIC_FUNCTIONS for unxlngi6 and unxlngx6 in sdev300.ini
2009-03-25 15:29:12 +0100 sb  r270031 : #i100408# missing fixes in addition to -c 269789 (to actually only put single instances of certain libraries into installation sets)
2009-03-25 15:17:10 +0100 sb  r270029 : #i10084# revert masterfix additions of libraries to APPnSTDLIBs (during -r269000:269199) and instead use -rpath-link to avoid linker warnings on unxlngi6 and unxlngx6
2009-03-25 14:15:23 +0100 sb  r270023 : added svn:ignore
2009-03-25 10:25:08 +0100 sb  r270002 : #i10000# copied over trunk -c 269820
2009-03-23 10:16:00 +0100 sb  r269858 : CWS-TOOLING: rebase CWS sb107 to trunk@269781 (milestone: DEV300:m44)
2009-03-20 11:22:27 +0100 sb  r269789 : #i100408# reduce (multiple copies of) libraries delivered to solver; for that to work fine, deliver symlink feature got improved to only create a symlink if the original file exists
2009-03-20 09:21:32 +0100 sb  r269782 : #i100396# replace s(HTML|RTF)_xxx declarations with OOO_STRING_SVTOOLS_(HTML|RTF)_xxx macros to reduce symbolic relocations at load time (at least on ELF systems).
2009-03-19 11:34:56 +0100 sb  r269734 : #i100348# added VISIBILITY_HIDDEN=TRUE so that symbols from the resulting archive are not erroneously exported from dynamic libraries including the archive
2009-03-19 11:32:20 +0100 sb  r269733 : #i100348# as a prerequisite for following changes, brought jpeg-6b.patch into "dmake create_patch" format and removed application/octet-stream svn:mime-type
2009-03-12 10:39:08 +0100 sb  r269370 : duplicated cws/odfmetadata2/solenv/inc/target.mk -c 268831
2009-03-04 17:25:16 +0100 sb  r268849 : #i99880# missing AUGMENT_LIBRARY_PATH
2009-02-25 17:54:34 +0100 sb  r268459 : CWS-TOOLING: rebase CWS sb107 to trunk@268395 (milestone: DEV300:m42)
2009-02-25 09:23:15 +0100 sb  r268413 : #i99584# avoid undefined operations on nOffset (patch by cmc)
2009-02-23 10:02:25 +0100 sb  r268344 : #i99519 removed unnecessary library dependencies
2009-02-18 17:54:24 +0100 sb  r268250 : avoid warnings about format specifier and argument mismatch (on 64bit debug builds)
2009-02-18 17:50:34 +0100 sb  r268249 : avoid erroneous warning that control reaches end of non-void function
2009-02-18 17:33:53 +0100 sb  r268248 : sdext/source/pdfimport/misc/pdfihelper.cxx: #include <vcl/canvastools.hxx>

4 files changed, 11 insertions, 147 deletions

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index bddc90bb5516..cee36eda1085 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -23,10 +23,6 @@
 #define DOCONCAT9( x, y, z, a, b, c, u, v, w)   x##y##z##a##b##c##u##v##w
 #define CONCAT9( x, y, z, a, b, c, u, v, w)     DOCONCAT9(x,y,z,a,b,c,u,v,w)
 
-#define CURL_MAJOR 3
-#define CURL_MINOR 0
-#define CURL_MICRO 0
-
 #define MOD_NAME_DESC(id) \
         ALL_LANG(Name,STR_NAME_##id); \
         ALL_LANG(Description,STR_DESC_##id)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1a76476049ee..b0ebcd1dab77 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -210,7 +210,7 @@ File gid_File_Lib_Curl
     #ifdef MACOSX
        Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT8(libcurl,UNXSUFFIX,.,CURL_MAJOR,.,CURL_MINOR,.,CURL_MICRO));
+       Name = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
     #endif
   #else
    #ifdef _gcc3
@@ -1534,9 +1534,9 @@ File gid_File_Lib_Xslt
     Dir = gid_Dir_Program;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT8(libxslt,.,LIBXSLT_MAJOR,.,LIBXSLT_MINOR,.,LIBXSLT_MICRO,UNXSUFFIX));
+       Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT8(libxslt,UNXSUFFIX,.,LIBXSLT_MAJOR,.,LIBXSLT_MINOR,.,LIBXSLT_MICRO));
+       Name = STRING(CONCAT4(libxslt,UNXSUFFIX,.,LIBXSLT_MAJOR));
     #endif
   #else
    #ifdef _gcc3
@@ -1730,9 +1730,9 @@ File gid_File_Lib_Raptor
     Dir = gid_Dir_Program;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT8(libraptor,.,RAPTOR_MAJOR,.,RAPTOR_MINOR,.,RAPTOR_MICRO,UNXSUFFIX));
+       Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT8(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR,.,RAPTOR_MINOR,.,RAPTOR_MICRO));
+       Name = STRING(CONCAT4(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR));
     #endif
   #else
    #ifdef _gcc3
@@ -1749,9 +1749,9 @@ File gid_File_Lib_Rasqal
     Dir = gid_Dir_Program;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT8(librasqal,.,RASQAL_MAJOR,.,RASQAL_MINOR,.,RASQAL_MICRO,UNXSUFFIX));
+       Name = STRING(CONCAT4(librasqal,.,RASQAL_MAJOR,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT8(librasqal,UNXSUFFIX,.,RASQAL_MAJOR,.,RASQAL_MINOR,.,RASQAL_MICRO));
+       Name = STRING(CONCAT4(librasqal,UNXSUFFIX,.,RASQAL_MAJOR));
     #endif
   #else
    #ifdef _gcc3
@@ -1768,9 +1768,9 @@ File gid_File_Lib_Rdf
     Dir = gid_Dir_Program;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT8(librdf,.,REDLAND_MAJOR,.,REDLAND_MINOR,.,REDLAND_MICRO,UNXSUFFIX));
+       Name = STRING(CONCAT4(librdf,.,REDLAND_MAJOR,UNXSUFFIX));
     #else
-       Name = STRING(CONCAT8(librdf,UNXSUFFIX,.,REDLAND_MAJOR,.,REDLAND_MINOR,.,REDLAND_MICRO));
+       Name = STRING(CONCAT4(librdf,UNXSUFFIX,.,REDLAND_MAJOR));
     #endif
   #else
    #ifdef _gcc3
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 18828834ea16..adb0175252c1 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -111,10 +111,7 @@ SCPDEFS+=-DSYSTEM_LIBXML
 SCPDEFS+=-DSYSTEM_LIBXSLT
 .ELSE
 .INCLUDE :  libxsltversion.mk
-SCPDEFS+=\
-    -DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR) \
-    -DLIBXSLT_MINOR=$(LIBXSLT_MINOR) \
-    -DLIBXSLT_MICRO=$(LIBXSLT_MICRO)
+SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
 .ENDIF
 
 .IF "$(SYSTEM_DB)" == "YES"
@@ -167,14 +164,8 @@ SCPDEFS+=-DSYSTEM_REDLAND
 .INCLUDE :  redlandversion.mk
 SCPDEFS+=\
     -DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \
-    -DRAPTOR_MINOR=$(RAPTOR_MINOR) \
-    -DRAPTOR_MICRO=$(RAPTOR_MICRO) \
     -DRASQAL_MAJOR=$(RASQAL_MAJOR) \
-    -DRASQAL_MINOR=$(RASQAL_MINOR) \
-    -DRASQAL_MICRO=$(RASQAL_MICRO) \
-    -DREDLAND_MAJOR=$(REDLAND_MAJOR) \
-    -DREDLAND_MINOR=$(REDLAND_MINOR) \
-    -DREDLAND_MICRO=$(REDLAND_MICRO)
+    -DREDLAND_MAJOR=$(REDLAND_MAJOR)
 .ENDIF
 
 .IF "$(SYSTEM_BSH)" == "YES"
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 6d0d12f6a879..2740fe563b69 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -30,60 +30,6 @@
 
 #include "macros.inc"
 
-#ifndef SYSTEM_LIBXSLT
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Xslt
-    FileID = gid_File_Lib_Xslt;
-    Dir = gid_Dir_Program;
-#ifdef MACOSX
-    Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX));
-#else
-    Name = STRING(CONCAT4(libxslt,UNXSUFFIX,.,LIBXSLT_MAJOR));
-#endif
-    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Xslt_2
-    ShortcutID = gid_Shortcut_Lib_Xslt;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libxslt,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
-End
-
-#endif
-#endif
-
-#ifndef SYSTEM_CURL
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Curl_0
-    FileID = gid_File_Lib_Curl;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#ifdef UNX
-
-Shortcut gid_Shortcut_Lib_Curl_1
-    FileID = gid_File_Lib_Curl;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT4(libcurl,UNXSUFFIX,.,CURL_MAJOR));
-    Styles = (NETWORK,RELATIVE);
-End
-
-#endif
-
-#endif
-
 #ifdef UNX
 #ifndef SYSTEM_ICU
 
@@ -130,72 +76,3 @@ End
 #endif
 
 //i44154 -end-
-
-#ifndef SYSTEM_REDLAND
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Raptor_1
-    FileID = gid_File_Lib_Raptor;
-    Dir = gid_Dir_Program;
-#ifdef MACOSX
-    Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX));
-#else
-    Name = STRING(CONCAT4(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR));
-#endif
-    Styles = (RELATIVE);
-End
-#endif
-
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Raptor_2
-    ShortcutID = gid_Shortcut_Lib_Raptor_1;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libraptor,UNXSUFFIX));
-    Styles = (RELATIVE);
-End
-#endif
-
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Rasqal_1
-    FileID = gid_File_Lib_Rasqal;
-    Dir = gid_Dir_Program;
-#ifdef MACOSX
-    Name = STRING(CONCAT4(librasqal,.,RASQAL_MAJOR,UNXSUFFIX));
-#else
-    Name = STRING(CONCAT4(librasqal,UNXSUFFIX,.,RASQAL_MAJOR));
-#endif
-    Styles = (RELATIVE);
-End
-#endif
-
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Rasqal_2
-    ShortcutID = gid_Shortcut_Lib_Rasqal_1;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(librasqal,UNXSUFFIX));
-    Styles = (RELATIVE);
-End
-#endif
-
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Rdf_1
-    FileID = gid_File_Lib_Rdf;
-    Dir = gid_Dir_Program;
-#ifdef MACOSX
-    Name = STRING(CONCAT4(librdf,.,REDLAND_MAJOR,UNXSUFFIX));
-#else
-    Name = STRING(CONCAT4(librdf,UNXSUFFIX,.,REDLAND_MAJOR));
-#endif
-    Styles = (RELATIVE);
-End
-#endif
-
-#ifdef UNX
-Shortcut gid_Shortcut_Lib_Rdf_2
-    ShortcutID = gid_Shortcut_Lib_Rdf_1;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(librdf,UNXSUFFIX));
-    Styles = (RELATIVE);
-End
-#endif
-#endif // SYSTEM_REDLAND
-