Commits

Anonymous committed 6737b42 Merge

#i117363#cws automationdev300m102cat0#w_updt.bas splitted in two parts, therefor this file was deleted

Comments (0)

Files changed (10)

 055aad264da0cf9598fd1b7aafbd3e144c9b8ce2 DEV300_m99
 20c5c9384888da33596d864251881e6e46bdd339 DEV300_m100
 564e24baaaae5e18c8bfa76811993fbefa571b5c DEV300_m101
+7dbaa615ad894cfd4f9611e82783250bd0a3016d DEV300_m102
          if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
       else
          if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
-$SED -e s/c++/strip/`", so it can be a program name with args.
-set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
-$SED -e s/c++/strip/`; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`", so it can be a program name with args.
+set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
-$SED -e s/c++/strip/`"
+    ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 fi
 if test -z "$ac_cv_prog_MINGWSTRIP"; then
   ac_ct_MINGWSTRIP=$MINGWSTRIP
-  # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
-$SED -e s/c++/strip/`", so it can be a program name with args.
-set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
-$SED -e s/c++/strip/`; ac_word=$2
+  # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`", so it can be a program name with args.
+set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_MINGWSTRIP+set}" = set; then
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
-$SED -e s/c++/strip/`"
+    ac_cv_prog_ac_ct_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
       if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
          if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
       else
-         AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGWIN | $SED -e s/g++/strip/ |
-$SED -e s/c++/strip/`, false)
+         AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/`, false)
       fi
       if test "$MINGWSTRIP" = "false"; then
          AC_MSG_ERROR(MinGW32 binutils needed. Install them.)

solenv/bin/packmodule

     deliverlog = open(os.path.join('inc', module, 'gb_deliver.log'))
     packedmodule = zipfile.ZipFile(os.path.join(zipdir,module+'.zip'), 'w')
     [packedmodule.write(path) for path in stripped_paths_to_pack(deliverlog)]
+    packedmodule.write(os.path.join('inc', module, 'gb_deliver.log'))
     packedmodule.close()
 
 if __name__ == "__main__":

solenv/gbuild/extensions/post_PackModule.mk

 endif
 endef
 
-packmodule : all deliverlog
+packmodule : allandcheck deliverlog
 	$(eval $(call gb_PackModule_setpackmodulecommand))
 	$(COMMAND)
 

solenv/gbuild/gbuild.mk

 endif
 
 # for clean, setuplocal and removelocal goals we switch off dependencies
-ifneq ($(filter clean setuplocal removelocal showdeliverables,$(MAKECMDGOALS)),)
+ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables,$(MAKECMDGOALS)),)
 gb_FULLDEPS := $(false)
 else
 gb_FULLDEPS := $(true)

testautomation/writer/required/includes/w_002_.inc

             printlog( "Check for <Imagemap changed> messagebox (should not appear)" )
             kontext "Active"
             if ( Active.exists( 1 ) ) then
-                Warnlog( "<imagemap changed> message displayed." )
+                Warnlog( "#i117432#<imagemap changed> message displayed." )
                 printlog( Active.getText )
                 Active.no()
             else

testautomation/writer/required/w_updt.bas

-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' 
-' Copyright 2000, 2010 Oracle and/or its affiliates.
-'
-' OpenOffice.org - a multi-platform office productivity suite
-'
-' This file is part of OpenOffice.org.
-'
-' OpenOffice.org is free software: you can redistribute it and/or modify
-' it under the terms of the GNU Lesser General Public License version 3
-' only, as published by the Free Software Foundation.
-'
-' OpenOffice.org is distributed in the hope that it will be useful,
-' but WITHOUT ANY WARRANTY; without even the implied warranty of
-' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-' GNU Lesser General Public License version 3 for more details
-' (a copy is included in the LICENSE file that accompanied this code).
-'
-' You should have received a copy of the GNU Lesser General Public License
-' version 3 along with OpenOffice.org.  If not, see
-' <http://www.openoffice.org/license.html>
-' for a copy of the LGPLv3 License.
-'
-'/************************************************************************
-'*
-'* owner : helge.delfs@oracle.com
-'*
-'* short description : Ressource-Test Writer Document
-'*
-'\******************************************************************
-
-sub main
-    use "writer\tools\includes\w_tools.inc"                  		' global subroutines for Writer-application
-    use "writer\tools\includes\w_tool1.inc"                  		' global subroutines for Writer-application
-    use "writer\tools\includes\w_tool2.inc"                  		' global subroutines for Writer-application
-
-    use "writer\required\includes\w_001_.inc"
-    use "writer\required\includes\w_001a_.inc"
-    use "writer\required\includes\w_001b_.inc"
-    use "writer\required\includes\w_002_.inc"
-    use "writer\required\includes\w_003_.inc"
-    use "writer\required\includes\w_004_.inc"
-    use "writer\required\includes\w_004b_.inc"
-    use "writer\required\includes\w_005_.inc"
-    use "writer\required\includes\w_005b_.inc"
-    use "writer\required\includes\w_006_.inc"
-    use "writer\required\includes\w_007_.inc"
-    use "writer\required\includes\w_008_.inc"
-    use "writer\required\includes\w_009_.inc"
-    use "writer\required\includes\w_010_.inc"
-    use "writer\required\includes\w_010_1.inc"
-    use "writer\required\includes\w_011_.inc"
-    use "writer\required\includes\w_020_.inc"
-    
-    Printlog "******* Ressource-Test Writer Document *******"
-
-    Call wChangeDefaultView()
-
-    Call hStatusIn ( "writer", "w_updt.bas" )
-    Call w_001_              ' Menu File
-    Call w_001a_             ' Menu File
-    Call w_001b_             ' Menu File
-    Call w_002_              ' Menu Edit
-    Call w_003_              ' Menu View
-    Call w_004_              ' Menu Insert
-    Call w_004b_             ' Menu Insert
-    Call w_005_              ' Menu Format
-    Call w_005b_             ' Menu Format (2)
-    Call w_006_              ' Menu Table
-    Call w_007_              ' Menu Tools
-    Call w_008_              ' Menu Window
-    Call w_009_              ' Menu Help
-    Call w_010_              ' Objectbar
-    Call w_010_1             ' Objectbar. Part 2
-    Call w_011_              ' Rest of Objectbar
-    Call w_020_              ' Toolbar
-    Call hStatusOut
-
-end sub
-
-sub LoadIncludeFiles
-    use "global\system\includes\master.inc"
-    use "global\system\includes\gvariabl.inc"
-    use "global\required\includes\g_001.inc"
-    use "global\required\includes\g_option.inc"                	' global subroutines for Tools / Options
-    use "global\required\includes\g_printing.inc"
-    use "global\required\includes\g_findbar.inc"
-    use "global\tools\includes\optional\t_xml_filter1.inc"       ' global routines for XML-functionality
-    use "global\tools\includes\optional\t_docfuncs.inc"
-    use "global\tools\includes\optional\t_control_objects.inc"
-
-    gApplication   = "WRITER"
-    GetUseFiles ()
-end sub

testautomation/writer/required/w_updt_1.bas

+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+' 
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org.  If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
+'/************************************************************************
+'*
+'* owner : helge.delfs@oracle.com
+'*
+'* short description : Ressource-Test Writer Document Part 1 / 2
+'*
+'\******************************************************************
+
+sub main
+    use "writer\tools\includes\w_tools.inc"                  		' global subroutines for Writer-application
+    use "writer\tools\includes\w_tool1.inc"                  		' global subroutines for Writer-application
+    use "writer\tools\includes\w_tool2.inc"                  		' global subroutines for Writer-application
+
+    use "writer\required\includes\w_001_.inc"
+    use "writer\required\includes\w_001a_.inc"
+    use "writer\required\includes\w_001b_.inc"
+    use "writer\required\includes\w_002_.inc"
+    use "writer\required\includes\w_003_.inc"
+    use "writer\required\includes\w_004_.inc"
+    use "writer\required\includes\w_004b_.inc"
+    use "writer\required\includes\w_005_.inc"
+    use "writer\required\includes\w_005b_.inc"
+    
+    Printlog "******* Ressource-Test Writer Document Part 1 / 2 *******"
+
+    Call wChangeDefaultView()
+
+    Call hStatusIn ( "writer", "w_updt_1.bas" )
+    Call w_001_              ' Menu File
+    Call w_001a_             ' Menu File
+    Call w_001b_             ' Menu File
+    Call w_002_              ' Menu Edit
+    Call w_003_              ' Menu View
+    Call w_004_              ' Menu Insert
+    Call w_004b_             ' Menu Insert
+    Call w_005_              ' Menu Format
+    Call w_005b_             ' Menu Format (2)
+    Call hStatusOut
+
+end sub
+
+sub LoadIncludeFiles
+    use "global\system\includes\master.inc"
+    use "global\system\includes\gvariabl.inc"
+    use "global\required\includes\g_001.inc"
+    use "global\required\includes\g_printing.inc"
+    use "global\tools\includes\optional\t_xml_filter1.inc"       ' global routines for XML-functionality
+    use "global\tools\includes\optional\t_docfuncs.inc"
+    use "global\tools\includes\optional\t_control_objects.inc"
+
+    gApplication   = "WRITER"
+    GetUseFiles ()
+end sub

testautomation/writer/required/w_updt_2.bas

+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+' 
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org.  If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
+'/************************************************************************
+'*
+'* owner : helge.delfs@oracle.com
+'*
+'* short description : Ressource-Test Writer Document Part 2 / 2
+'*
+'\******************************************************************
+
+sub main
+    use "writer\tools\includes\w_tools.inc"                  		' global subroutines for Writer-application
+    use "writer\tools\includes\w_tool1.inc"                  		' global subroutines for Writer-application
+    use "writer\tools\includes\w_tool2.inc"                  		' global subroutines for Writer-application
+
+    use "writer\required\includes\w_006_.inc"
+    use "writer\required\includes\w_007_.inc"
+    use "writer\required\includes\w_008_.inc"
+    use "writer\required\includes\w_009_.inc"
+    use "writer\required\includes\w_010_.inc"
+    use "writer\required\includes\w_010_1.inc"
+    use "writer\required\includes\w_011_.inc"
+    use "writer\required\includes\w_020_.inc"
+    
+    Printlog "******* Ressource-Test Writer Document Part 2 / 2 *******"
+
+    Call wChangeDefaultView()
+
+    Call hStatusIn ( "writer", "w_updt_2.bas" )
+    Call w_006_              ' Menu Table
+    Call w_007_              ' Menu Tools
+    Call w_008_              ' Menu Window
+    Call w_009_              ' Menu Help
+    Call w_010_              ' Objectbar
+    Call w_010_1             ' Objectbar. Part 2
+    Call w_011_              ' Rest of Objectbar
+    Call w_020_              ' Toolbar
+    Call hStatusOut
+
+end sub
+
+sub LoadIncludeFiles
+    use "global\system\includes\master.inc"
+    use "global\system\includes\gvariabl.inc"
+    use "global\required\includes\g_option.inc"                	' global subroutines for Tools / Options
+    use "global\required\includes\g_findbar.inc"
+    use "global\tools\includes\optional\t_docfuncs.inc"
+    use "global\tools\includes\optional\t_control_objects.inc"
+
+    gApplication   = "WRITER"
+    GetUseFiles ()
+end sub