CWS-TOOLING: integrate CWS jsc320

2009-07-31 11:40:04 +0200 jsc r274518 : #103926# apply patch 2009-07-16 17:17:01 +0200 jsc r274063 : #i103311# check new Solaris compiler version ox5100 2009-07-07 17:20:41 +0200 jsc r273811 : cleanup 2009-07-07 15:21:26 +0200 jsc r273799 : #98322# correct LD_LIBRARY_PATH, sdk/lib dir instead of sdkout/platfrom/lib, all unix excepting mac 2009-07-07 15:07:05 +0200 jsc r273798 : #i98322# correct link 2009-07-07 09:43:57 +0200 jsc r273773 : #i98322# correct link path 2009-07-06 15:49:07 +0200 jsc r273749 : #i98322# correct typo 2009-07-06 14:17:27 +0200 jsc r273743 : #i103311# support sunstudio compiler 12u1, version 5.10 (which results in 0x5100) 2009-07-03 13:54:58 +0200 jsc r273693 : #i96576# support opensolaris and enhance docu to relfect usage of gmake 2009-07-02 13:12:02 +0200 jsc r273643 : #i103260# improve fix by using EXECPOST variable 2009-07-02 13:11:30 +0200 jsc r273642 : #i103260# improve fix by using EXECPOST variable 2009-07-02 13:05:35 +0200 jsc r273640 : #i103260# correct typo for windows 2009-07-02 13:01:34 +0200 jsc r273639 : #i103260# provide regview with path as argument 2009-07-01 07:18:01 +0200 jsc r273541 : CWS-TOOLING: rebase CWS jsc320 to trunk@273468 (milestone: DEV300:m51) 2009-06-30 08:01:13 +0200 jsc r273485 : #98322# include import purpenvhelper lib under windows 2009-06-10 15:07:29 +0200 jsc r272815 : CWS-TOOLING: rebase CWS jsc320 to trunk@272291 (milestone: DEV300:m49) 2009-05-27 09:36:23 +0200 jsc r272329 : #i98322# create link for purpenvhelper library in SDK 2009-05-27 09:35:41 +0200 jsc r272328 : #i98322# create link for purpenvhelpr library in SDK 2009-05-14 16:19:41 +0200 jsc r271900 : increase version number in SDK header image 2009-05-14 16:11:05 +0200 jsc r271899 : #i101408# new version 3.2 2009-05-14 15:33:47 +0200 jsc r271894 : #i99163# apply patch to correct wrong tags for autodoc 2009-05-14 14:49:58 +0200 jsc r271889 : #i99707# apply patch to remove unused code
2009-08-06 07:01:05 +00:00
parent 854b9eeffe
commit e64d8c0b66
7 changed files with 11 additions and 45 deletions
--- a/cppu/inc/uno/lbnames.h
+++ b/cppu/inc/uno/lbnames.h
@@ -46,12 +46,9 @@
 #endif /* (_MSC_VER < 1000) */
 /* sunpro cc */
 #elif defined (__SUNPRO_CC)
-#if (__SUNPRO_CC < 0x500)
-#error "sunpro cc must be at least 5.x"
-provoking error here, because PP ignores #error
-#elif (__SUNPRO_CC < 0x600)
+#if ((__SUNPRO_CC >= 0x5000 && __SUNPRO_CC < 0x6000) || (__SUNPRO_CC >= 0x500 && __SUNPRO_CC < 0x600))
 #define TMP_CPPU_ENV sunpro5
-#else
+#elif
 #error "sunpro cc version must be 5.x"
 provoking error here, because PP ignores #error
 #endif /* defined (__SUNPRO_CC) */
--- a/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
+++ b/offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl
@@ -62,7 +62,7 @@ interface XTreeDataModelListener: com::sun::star::lang::XEventListener
        Example: the name of a file has changed, but it is in the same location in the file system.

        To indicate the root has changed, <member>TreeDataModelEvent::Nodes</member> will contain
-        the root node and and <member>TreeDataModelEvent::ParentNode</member will be empty.
+        the root node and <member>TreeDataModelEvent::ParentNode</member> will be empty.
    */
    void treeNodesChanged( [in] TreeDataModelEvent Event );

--- a/offapi/util/checknewapi.pl
+++ b/offapi/util/checknewapi.pl
@@ -6,23 +6,25 @@
 # Copyright (c) 2005 Sun Microsystems, Inc.
 #

-if($#ARGV != 2)
+if($#ARGV != 3)
 {
-    die "usage: checknewapi <new_type_library> <reference_type_library> <buildinfodescr>\n";
+    die "usage: checknewapi <new_type_library> <reference_type_library> <buildinfodescr> <fullpath_regview>\n";
 }

 -e "$ARGV[0]" || die "ERROR: type library \"$ARGV[0]\" does not exist\n";
 -e "$ARGV[1]" || die "ERROR: reference type library \"$ARGV[1]\" does not exist\n";
+-e "$ARGV[3]" || die "ERROR: invalid path to the regview tool \"$ARGV[3]\", please specify the full qualified path\n";

 # debug flag
 $DEBUG = 0;

 $main::buildinfo = "$ARGV[2]";
+$main::regview = "$ARGV[3]";
 %{$main::reftypes} = ();
 %{$main::currenttypes} = ();
 %{$main::removedtypes} = ();

-open ( FILEIN, "regview \"$ARGV[0]\" |" ) || die "could not use content of current typelibrary \"$ARGV[0]\", regview doesn't work\n";
+open ( FILEIN, "$main::regview \"$ARGV[0]\" |" ) || die "could not use content of current typelibrary \"$ARGV[0]\", regview doesn't work\n";

 if ($DEBUG == 1)
 {
@@ -74,7 +76,7 @@ while (<FILEIN>)
 close( FILEIN );
 close( CURRENT );

-open ( FILEIN, "regview \"$ARGV[1]\" |" ) || die "could not use content of reference type library \"$ARGV[1]\", regview doesn't work\n";
+open ( FILEIN, "$main::regview \"$ARGV[1]\" |" ) || die "could not use content of reference type library \"$ARGV[1]\", regview doesn't work\n";

 if ($DEBUG == 1)
 {
--- a/offapi/util/makefile.mk
+++ b/offapi/util/makefile.mk
@@ -152,6 +152,7 @@ REGISTRYCHECKFLAG=$(MISC)$/registrycheck.flag

 UNOTYPE_STATISTICS=$(MISC)$/unotype_statistics.txt

+REGVIEWTOOL=$(SOLARBINDIR)$/regview$(EXECPOST)

 # --- Targets ------------------------------------------------------

@@ -183,6 +184,6 @@ $(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
 #JSC: new target to prepare some UNO type statistics, the ouput will be later used
 #     for versioning of UNO cli type libraries
 $(UNOTYPE_STATISTICS) : $(REGISTRYCHECKFLAG)
-    $(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" > $@
+    $(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" "$(REGVIEWTOOL)" > $@

 .INCLUDE :  target.mk
--- a/rdbmaker/inc/codemaker/dependency.hxx
+++ b/rdbmaker/inc/codemaker/dependency.hxx
@@ -154,7 +154,6 @@ public:

    sal_Bool        insert(const ::rtl::OString& type, const ::rtl::OString& depend, sal_uInt16);
    TypeUsingSet    getDependencies(const ::rtl::OString& type);
-    sal_Bool        lookupDependency(const ::rtl::OString& type, const ::rtl::OString& depend, sal_uInt16);
    sal_Bool        hasDependencies(const ::rtl::OString& type);

    void        setGenerated(const ::rtl::OString& type, sal_uInt16 genFlag=CODEGEN_DEFAULT);
--- a/rdbmaker/inc/codemaker/global.hxx
+++ b/rdbmaker/inc/codemaker/global.hxx
@@ -75,10 +75,6 @@ typedef ::std::set< ::rtl::OString, LessString >    StringSet;
 ::rtl::OString makeTempName();

 const ::rtl::OString inGlobalSet(const ::rtl::OUString & r);
-inline const ::rtl::OString inGlobalSet(sal_Char* p)
-{
-    return inGlobalSet( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(p) ) );
-}

 ::rtl::OUString convertToFileUrl(const ::rtl::OString& fileName);

--- a/rdbmaker/source/codemaker/dependency.cxx
+++ b/rdbmaker/source/codemaker/dependency.cxx
@@ -100,35 +100,6 @@ TypeUsingSet TypeDependency::getDependencies(const OString& type)
    return TypeUsingSet();
 }

-sal_Bool TypeDependency::lookupDependency(const OString& type, const OString& depend, sal_uInt16 use)
-{
-    sal_Bool ret =  sal_False;
-
-    if (type.getLength() > 0 && depend.getLength() > 0)
-    {
-        if (m_pImpl->m_dependencies.count(type) > 0)
-        {
-            TypeUsingSet::const_iterator iter = m_pImpl->m_dependencies[type].begin();
-
-            while (iter != m_pImpl->m_dependencies[type].end())
-            {
-                if (depend == (*iter).m_type &&
-                    (use & (*iter).m_use))
-                {
-                    ret = sal_True;
-                    break;
-                }
-                iter++;
-            }
-        } else
-        {
-            ret = sal_False;
-        }
-    }
-
-    return ret;
-}
-
 sal_Bool TypeDependency::hasDependencies(const OString& type)
 {
    if (type.getLength() > 0)