Commits

Anonymous committed 052c3d7

CWS-TOOLING: integrate CWS dv06_DEV300

  • Participants
  • Parent commits 0b48274

Comments (0)

Files changed (8)

File desktop/source/deployment/misc/dp_dependencies.cxx

  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dp_dependencies.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.156.2 $
  *
  * This file is part of OpenOffice.org.
  *
 static char const xmlNamespace[] =
     "http://openoffice.org/extensions/description/2006";
 
-bool satisfiesMinimalVersion(::rtl::OUString const & version) {
-    ::rtl::OUString v(
-        RTL_CONSTASCII_USTRINGPARAM(
-            "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version")
-            ":Version:OOOBaseVersion}"));
-    ::rtl::Bootstrap::expandMacros(v);
-    return ::dp_misc::compareVersions(version, v) != ::dp_misc::GREATER;
+#define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
+
+bool satisfiesMinimalVersion( ::rtl::OUString const & version )
+{
+    ::rtl::OUString aBaseVersion( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":Version:OOOPackageVersion}" ) );
+    ::rtl::Bootstrap::expandMacros( aBaseVersion );
+
+    return ::dp_misc::compareVersions(version, aBaseVersion) != ::dp_misc::GREATER;
 };
 
 }

File testautomation/extensions/optional/includes/platforms.inc

         printlog( "Current extension: " & cCurrentExtensionFile )
         iStatus = hExtensionAddGUI( cCurrentExtensionPath, "InstallForUser, NoLicense, NoUpdate, Verbose" )
         
-        if ( iStatus > 0 ) then
+        if ( iStatus >= 0 ) then
         
             kontext "Active"
             if ( Active.exists( 2 ) ) then

File testautomation/extensions/optional/input/dependencies/version30.oxt

-PK
-m��m�Q|�M����$���/ut��������������M����a�2 ��V(s��P��3�^���SQn��~K�ܨF��
-�?���6(b�)�FՒYF,��|
-�
-���\��!�����ñ��r��
+PK@rWn�:_�t����^���c~�48 |7�j~�g
-����+���@�����)�9���?����Д2p���L�����Է28��,39�h4��S�+
+�
+�Z��G���k��?׫��������Z��U�[B�	4����?<�3�YH�4M��

File testautomation/extensions/optional/input/dependencies/version300.oxt

Binary file added.

File testautomation/extensions/optional/input/dependencies/version301.oxt

Binary file added.

File testautomation/extensions/optional/input/dependencies/version31.oxt

-PK
-m��m�Q|�M����$���/ut��������������M����a�2 ��V(s��P��3�^���SQn��~K�ܨF��
-�?���6(b�)�FՒYF,��|
-��f�戈u'7�<��>�I>PK@rWn�:_�t����^���c~�48 |7�j~�g
-�
-���\��!�����ñ��r��
+PKm��m�Q|�M����$���/ut��������������M����a�2 ��V(s��P��3�^���SQn��~K�ܨF��
+�?���6(b�)�FՒYF,��|
-�
-���\��!�����ñ��r��

File testautomation/extensions/optional/input/dependencies/version937.oxt

Binary file added.

File testautomation/extensions/optional/input/files.txt

 dependencies\version21other.oxt;1,0,0,0,0
 dependencies\version25.oxt;0,0,1,0,0
 dependencies\version30.oxt;0,0,1,0,0
+dependencies\version300.oxt;0,0,1,0,0
+dependencies\version301.oxt;0,0,1,0,0
+dependencies\versionempty.oxt;0,0,1,0,0
 dependencies\version31.oxt;1,0,0,0,0
-dependencies\versionempty.oxt;0,0,1,0,0
+dependencies\version937.oxt;1,0,0,0,0
 dependencies\versionnone.oxt;0,0,1,0,0
 versions/plain.oxt;0,0,1,0,0
 versions/plain.oxt;0,0,1,0,1