--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/extension_makefiles/group/bld.inf Mon May 03 14:14:40 2010 +0300
@@ -0,0 +1,29 @@
+// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Exports Template Extension Makefiles (TEMs) to the epoc tree.
+
+
+PRJ_PLATFORMS
+
+PRJ_EXPORTS
+../test/xml_sitestfiledist.meta /epoc32/tools/makefile_templates/syslibs/test/xml_sitestfiledist.meta
+../test/xml_sitestfiledist.mk /epoc32/tools/makefile_templates/syslibs/test/xml_sitestfiledist.mk
+../test/xml_stringdictionary00tagtable.meta /epoc32/tools/makefile_templates/syslibs/test/xml_stringdictionary00tagtable.meta
+../test/xml_stringdictionary00tagtable.mk /epoc32/tools/makefile_templates/syslibs/test/xml_stringdictionary00tagtable.mk
+../test/xml_syncmltestfiledist.meta /epoc32/tools/makefile_templates/syslibs/test/xml_syncmltestfiledist.meta
+../test/xml_syncmltestfiledist.mk /epoc32/tools/makefile_templates/syslibs/test/xml_syncmltestfiledist.mk
+../test/xml_wmltestfiledist.meta /epoc32/tools/makefile_templates/syslibs/test/xml_wmltestfiledist.meta
+../test/xml_wmltestfiledist.mk /epoc32/tools/makefile_templates/syslibs/test/xml_wmltestfiledist.mk
+../test/xml_xmlcmatchdatapostbuild.meta /epoc32/tools/makefile_templates/syslibs/test/xml_xmlcmatchdatapostbuild.meta
+../test/xml_xmlcmatchdatapostbuild.mk /epoc32/tools/makefile_templates/syslibs/test/xml_xmlcmatchdatapostbuild.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/extension_makefiles/test/xml_sitestfiledist.meta Mon May 03 14:14:40 2010 +0300
@@ -0,0 +1,19 @@
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Meta information for xml_sitestfiledist
+#
+
+platform win32
+makefile gnumake
+techstream syslibs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/extension_makefiles/test/xml_sitestfiledist.mk Mon May 03 14:14:40 2010 +0300
@@ -0,0 +1,131 @@
+# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+TMPROOT:=$(subst \,/,$(EPOCROOT))
+EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
+
+
+include $(EPOCROOT)epoc32/tools/shell/$(notdir $(basename $(SHELL))).mk
+
+ifeq ($(OS), "Windows_NT")
+RMDIR := @rmdir 2>>nul
+else
+RMDIR := @rmdir
+endif
+
+ifeq ($(findstring WINS,$(PLATFORM)),WINS)
+ DEST_DIR = $(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/z/system/xmltest/serviceindication
+else
+ DEST_DIR = $(EPOCROOT)epoc32/data/z/system/xmltest/serviceindication
+endif
+
+SOURCE_DIR = $(EXTENSION_ROOT)/../test/rtest/data/serviceindication
+
+# Ensure we have a clean canvas - this also avoids us having to specify
+# switches to commands that are not recognised across platforms.
+CLEAN_DEST :
+ $(call createdir,$(DEST_DIR))
+
+MAKE_DIRS :
+ $(call createdir,$(DEST_DIR)/1.0)
+ $(call createdir,$(DEST_DIR)/corrupt)
+
+COPYFILES : CLEAN_DEST MAKE_DIRS
+ $(call forcecopy, $(SOURCE_DIR)/1.0/*.bdy, $(DEST_DIR)/1.0/.)
+ $(call forcecopy, $(SOURCE_DIR)/corrupt/*.bdy, $(DEST_DIR)/corrupt/.)
+
+DO_NOTHING:
+ @echo do nothing
+
+#
+# The targets invoked by bld...
+#
+
+MAKMAKE : DO_NOTHING
+
+RESOURCE : COPYFILES
+
+CLEAN :
+ $(call createdir,$(DEST_DIR))
+
+BLD : DO_NOTHING
+
+SAVESPACE : DO_NOTHING
+
+FREEZE : DO_NOTHING
+
+LIB : DO_NOTHING
+
+CLEANLIB : DO_NOTHING
+
+RESOURCE : DO_NOTHING
+
+FINAL : DO_NOTHING
+
+RELEASABLES :
+ @echo $(DEST_DIR)/1.0/si_invalid_cdate.bdy
+ @echo $(DEST_DIR)/1.0/si_inv_act_multiple.bdy
+ @echo $(DEST_DIR)/1.0/si_inv_act_multiple2.bdy
+ @echo $(DEST_DIR)/1.0/si_inv_cd_day.bdy
+ @echo $(DEST_DIR)/1.0/si_inv_cd_hour.bdy
+ @echo $(DEST_DIR)/1.0/si_inv_cd_len.bdy
+ @echo $(DEST_DIR)/1.0/si_inv_cd_min.bdy
+ @echo $(DEST_DIR)/1.0/si_inv_cd_sec.bdy
+ @echo $(DEST_DIR)/1.0/si_inv_cd_year.bdy
+ @echo $(DEST_DIR)/1.0/si_inv_ind.bdy
+ @echo $(DEST_DIR)/1.0/si_inv_msg_emp.bdy
+ @echo $(DEST_DIR)/1.0/si_valid.bdy
+ @echo $(DEST_DIR)/1.0/si_valid_chi.bdy
+ @echo $(DEST_DIR)/1.0/si_val_act_de.bdy
+ @echo $(DEST_DIR)/1.0/si_val_act_no.bdy
+ @echo $(DEST_DIR)/1.0/si_val_act_sh.bdy
+ @echo $(DEST_DIR)/1.0/si_val_act_sl.bdy
+ @echo $(DEST_DIR)/1.0/si_val_act_sm.bdy
+ @echo $(DEST_DIR)/1.0/si_val_act_sn.bdy
+ @echo $(DEST_DIR)/1.0/si_val_char_iso_8859_1.bdy
+ @echo $(DEST_DIR)/1.0/si_val_char_iso_8859_2.bdy
+ @echo $(DEST_DIR)/1.0/si_val_char_iso_8859_3.bdy
+ @echo $(DEST_DIR)/1.0/si_val_char_iso_8859_4.bdy
+ @echo $(DEST_DIR)/1.0/si_val_char_iso_8859_5.bdy
+ @echo $(DEST_DIR)/1.0/si_val_char_iso_8859_6.bdy
+ @echo $(DEST_DIR)/1.0/si_val_char_iso_8859_7.bdy
+ @echo $(DEST_DIR)/1.0/si_val_char_iso_8859_8.bdy
+ @echo $(DEST_DIR)/1.0/si_val_char_iso_8859_9.bdy
+ @echo $(DEST_DIR)/1.0/si_val_char_shift_JIS.bdy
+ @echo $(DEST_DIR)/1.0/si_val_char_us_ascii.bdy
+ @echo $(DEST_DIR)/1.0/si_val_char_utf_8.bdy
+ @echo $(DEST_DIR)/1.0/si_val_expired.bdy
+ @echo $(DEST_DIR)/1.0/si_val_exp_null.bdy
+ @echo $(DEST_DIR)/1.0/si_val_ind_opq.bdy
+ @echo $(DEST_DIR)/1.0/si_val_msg_emp_indatt.bdy
+ @echo $(DEST_DIR)/1.0/si_val_no_cd.bdy
+ @echo $(DEST_DIR)/1.0/si_val_no_exp.bdy
+ @echo $(DEST_DIR)/1.0/si_val_only_href.bdy
+ @echo $(DEST_DIR)/1.0/si_val_sender_encoding.bdy
+ @echo $(DEST_DIR)/1.0/si_val_wbx_ver_10.bdy
+ @echo $(DEST_DIR)/1.0/si_val_wbx_ver_11.bdy
+ @echo $(DEST_DIR)/1.0/si_val_wbx_ver_12.bdy
+ @echo $(DEST_DIR)/1.0/si_val_wbx_ver_13.bdy
+ @echo $(DEST_DIR)/corrupt/si_inv_act_undf.bdy
+ @echo $(DEST_DIR)/corrupt/si_inv_cd_token.bdy
+ @echo $(DEST_DIR)/corrupt/si_inv_cd_type.bdy
+ @echo $(DEST_DIR)/corrupt/si_inv_char.bdy
+ @echo $(DEST_DIR)/corrupt/si_inv_hrf_ter.bdy
+ @echo $(DEST_DIR)/corrupt/si_inv_msg_emp2.bdy
+ @echo $(DEST_DIR)/corrupt/si_inv_msg_ter.bdy
+ @echo $(DEST_DIR)/corrupt/si_inv_msg_ter2.bdy
+ @echo $(DEST_DIR)/corrupt/si_val_wbx_ver_14.bdy
+ @echo $(DEST_DIR)/corrupt/si_val_wbx_ver_30.bdy
+ @echo $(DEST_DIR)/corrupt/si_val_wbx_ver_FF.bdy
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/extension_makefiles/test/xml_stringdictionary00tagtable.meta Mon May 03 14:14:40 2010 +0300
@@ -0,0 +1,19 @@
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Meta information for xml_stringdictionary00tagtable use
+#
+
+platform win32
+makefile gnumake
+techstream syslibs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/extension_makefiles/test/xml_stringdictionary00tagtable.mk Mon May 03 14:14:40 2010 +0300
@@ -0,0 +1,57 @@
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+TMPROOT:=$(subst \,/,$(EPOCROOT))
+EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
+
+include $(EPOCROOT)epoc32/tools/shell/$(notdir $(basename $(SHELL))).mk
+
+BUILD_DIR = $(EPOCROOT)epoc32/build/generated/xml
+
+GENERATED_FILES = $(BUILD_DIR)/t_stringdictionary00tagtable.cpp
+
+$(BUILD_DIR)/t_stringdictionary00tagtable.cpp : $(EXTENSION_ROOT)/../test/rtest/tsrc/t_stringdictionary00tagtable.st
+ $(call createdir,$(BUILD_DIR))
+ @perl $(EPOCROOT)epoc32/tools/ecopyfile.pl $(EXTENSION_ROOT)/../test/rtest/tsrc/t_stringdictionary00tagtable.st $(BUILD_DIR)$/t_stringdictionary00tagtable.st
+ @perl $(EPOCROOT)epoc32/tools/stringtable.pl $(BUILD_DIR)/t_stringdictionary00tagtable.st
+
+DO_NOTHING:
+ @echo do nothing
+
+#
+# The targets invoked by bld...
+#
+
+MAKMAKE : $(GENERATED_FILES)
+
+BLD : MAKMAKE
+
+SAVESPACE : MAKMAKE
+
+CLEAN :
+ $(call createdir,$(BUILD_DIR))
+
+FREEZE : DO_NOTHING
+
+LIB : DO_NOTHING
+
+CLEANLIB : DO_NOTHING
+
+RESOURCE : DO_NOTHING
+
+FINAL : DO_NOTHING
+
+RELEASABLES :
+ @echo $(GENERATED_FILES)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/extension_makefiles/test/xml_syncmltestfiledist.meta Mon May 03 14:14:40 2010 +0300
@@ -0,0 +1,19 @@
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Meta information for xml_syncmltestfiledist
+#
+
+platform win32
+makefile gnumake
+techstream syslibs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/extension_makefiles/test/xml_syncmltestfiledist.mk Mon May 03 14:14:40 2010 +0300
@@ -0,0 +1,357 @@
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+TMPROOT:=$(subst \,/,$(EPOCROOT))
+EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
+
+
+include $(EPOCROOT)epoc32/tools/shell/$(notdir $(basename $(SHELL))).mk
+
+ifeq ($(OS), "Windows_NT")
+RMDIR := @rmdir 2>>nul
+else
+RMDIR := @rmdir
+endif
+
+ifeq ($(findstring WINS,$(PLATFORM)),WINS)
+ DEST_DIR = $(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/z/system/xmltest/syncml
+else
+ DEST_DIR = $(EPOCROOT)epoc32/data/z/system/xmltest/syncml
+endif
+
+SOURCE_DIR = $(EXTENSION_ROOT)/../test/rtest/data/syncml
+
+# Ensure we have a clean canvas - this also avoids us having to specify
+# switches to commands that are not recognised across platforms.
+CLEAN_DEST :
+ $(call createdir,$(DEST_DIR))
+
+MAKE_DIRS :
+ $(call createdir,$(DEST_DIR)/1.1/add-to-client)
+ $(call createdir,$(DEST_DIR)/1.1/add-to-server)
+ $(call createdir,$(DEST_DIR)/1.1/Atomic)
+ $(call createdir,$(DEST_DIR)/1.1/AuthBasicFail)
+ $(call createdir,$(DEST_DIR)/1.1/AuthBasicFailFirst)
+ $(call createdir,$(DEST_DIR)/1.1/AuthMD5Fail)
+ $(call createdir,$(DEST_DIR)/1.1/AuthMD5FailFirst)
+ $(call createdir,$(DEST_DIR)/1.1/client-large)
+ $(call createdir,$(DEST_DIR)/1.1/client-large-multiple)
+ $(call createdir,$(DEST_DIR)/1.1/DevManAdd)
+ $(call createdir,$(DEST_DIR)/1.1/DevManAlertDisplay)
+ $(call createdir,$(DEST_DIR)/1.1/DevManAlertMultiChoice)
+ $(call createdir,$(DEST_DIR)/1.1/DevManAlertSingleChoice)
+ $(call createdir,$(DEST_DIR)/1.1/DevManAlertTextInput)
+ $(call createdir,$(DEST_DIR)/1.1/DevManAlertUserAccept)
+ $(call createdir,$(DEST_DIR)/1.1/DevManAlertUserReject)
+ $(call createdir,$(DEST_DIR)/1.1/DevManAtomic)
+ $(call createdir,$(DEST_DIR)/1.1/DevManAtomicAlertUserAccept)
+ $(call createdir,$(DEST_DIR)/1.1/DevManAtomicAlertUserReject)
+ $(call createdir,$(DEST_DIR)/1.1/DevManAtomicFail)
+ $(call createdir,$(DEST_DIR)/1.1/DevManDelete)
+ $(call createdir,$(DEST_DIR)/1.1/DevManGet)
+ $(call createdir,$(DEST_DIR)/1.1/DevManLargeObjectAdd)
+ $(call createdir,$(DEST_DIR)/1.1/DevManLargeObjectGet)
+ $(call createdir,$(DEST_DIR)/1.1/DevManReplace)
+ $(call createdir,$(DEST_DIR)/1.1/DevManSequence)
+ $(call createdir,$(DEST_DIR)/1.1/DevManSequenceAlertUserAccept)
+ $(call createdir,$(DEST_DIR)/1.1/DevManSequenceAlertUserReject)
+ $(call createdir,$(DEST_DIR)/1.1/DevManSequenceFail)
+ $(call createdir,$(DEST_DIR)/1.1/DevManSimple)
+ $(call createdir,$(DEST_DIR)/1.1/Large-object-from-client)
+ $(call createdir,$(DEST_DIR)/1.1/Large-object-from-server)
+ $(call createdir,$(DEST_DIR)/1.1/Large-object-from-server2)
+ $(call createdir,$(DEST_DIR)/1.1/Multiple-Db-Sync)
+ $(call createdir,$(DEST_DIR)/1.1/One-way-client-refresh-sync)
+ $(call createdir,$(DEST_DIR)/1.1/One-way-client-sync)
+ $(call createdir,$(DEST_DIR)/1.1/One-way-server-refresh-sync)
+ $(call createdir,$(DEST_DIR)/1.1/One-way-server-sync)
+ $(call createdir,$(DEST_DIR)/1.1/Pref-Tx-Rx)
+ $(call createdir,$(DEST_DIR)/1.1/server-busy)
+ $(call createdir,$(DEST_DIR)/1.1/server-large)
+ $(call createdir,$(DEST_DIR)/1.1/server-large-multiple)
+ $(call createdir,$(DEST_DIR)/1.1/slow-sync)
+ $(call createdir,$(DEST_DIR)/1.1/two-way-add)
+ $(call createdir,$(DEST_DIR)/1.1/two-way-delete)
+ $(call createdir,$(DEST_DIR)/1.1/two-way-replace)
+ $(call createdir,$(DEST_DIR)/1.1/two-way-sync)
+ $(call createdir,$(DEST_DIR)/1.2/defects)
+ $(call createdir,$(DEST_DIR)/unknown)
+
+
+COPYFILES : CLEAN_DEST MAKE_DIRS
+ $(call forcecopy, $(SOURCE_DIR)/1.1/add-to-client/*.xml, $(DEST_DIR)/1.1/add-to-client/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/add-to-server/*.xml, $(DEST_DIR)/1.1/add-to-server/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/atomic/*.xml, $(DEST_DIR)/1.1/Atomic/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/authbasicfail/*.xml, $(DEST_DIR)/1.1/AuthBasicFail/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/authbasicfailfirst/*.xml, $(DEST_DIR)/1.1/AuthBasicFailFirst/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/authmd5fail/*.xml, $(DEST_DIR)/1.1/AuthMD5Fail/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/authmd5failfirst/*.xml, $(DEST_DIR)/1.1/AuthMD5FailFirst/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/client-large/*.xml, $(DEST_DIR)/1.1/client-large/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/client-large-multiple/*.xml, $(DEST_DIR)/1.1/client-large-multiple/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanadd/*.xml, $(DEST_DIR)/1.1/DevManAdd/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanalertdisplay/*.xml, $(DEST_DIR)/1.1/DevManAlertDisplay/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanalertmultichoice/*.xml, $(DEST_DIR)/1.1/DevManAlertMultiChoice/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanalertsinglechoice/*.xml, $(DEST_DIR)/1.1/DevManAlertSingleChoice/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanalerttextinput/*.xml, $(DEST_DIR)/1.1/DevManAlertTextInput/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanalertuseraccept/*.xml, $(DEST_DIR)/1.1/DevManAlertUserAccept/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanalertuserreject/*.xml, $(DEST_DIR)/1.1/DevManAlertUserReject/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanatomic/*.xml, $(DEST_DIR)/1.1/DevManAtomic/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanatomicalertuseraccept/*.xml, $(DEST_DIR)/1.1/DevManAtomicAlertUserAccept/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanatomicalertuserreject/*.xml, $(DEST_DIR)/1.1/DevManAtomicAlertUserReject/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanatomicfail/*.xml, $(DEST_DIR)/1.1/DevManAtomicFail/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmandelete/*.xml, $(DEST_DIR)/1.1/DevManDelete/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanget/*.xml, $(DEST_DIR)/1.1/DevManGet/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanlargeobjectadd/*.xml, $(DEST_DIR)/1.1/DevManLargeObjectAdd/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanlargeobjectget/*.xml, $(DEST_DIR)/1.1/DevManLargeObjectGet/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanreplace/*.xml, $(DEST_DIR)/1.1/DevManReplace/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmansequence/*.xml, $(DEST_DIR)/1.1/DevManSequence/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmansequencealertuseraccept/*.xml, $(DEST_DIR)/1.1/DevManSequenceAlertUserAccept/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmansequencealertuserreject/*.xml, $(DEST_DIR)/1.1/DevManSequenceAlertUserReject/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmansequencefail/*.xml, $(DEST_DIR)/1.1/DevManSequenceFail/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmansimple/*.xml, $(DEST_DIR)/1.1/DevManSimple/.)
+ #$(call forcecopy, $(SOURCE_DIR)/1.1/large-object-from-client/*.xml, $(DEST_DIR)/1.1/Large-object-from-client/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/large-object-from-server/*.xml, $(DEST_DIR)/1.1/Large-object-from-server/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/large-object-from-server2/*.xml, $(DEST_DIR)/1.1/Large-object-from-server2/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/multiple-db-sync/*.xml, $(DEST_DIR)/1.1/Multiple-Db-Sync/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/one-way-client-refresh-sync/*.xml, $(DEST_DIR)/1.1/One-way-client-refresh-sync/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/one-way-client-sync/*.xml, $(DEST_DIR)/1.1/One-way-client-sync/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/one-way-server-refresh-sync/*.xml, $(DEST_DIR)/1.1/One-way-server-refresh-sync/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/one-way-server-sync/*.xml, $(DEST_DIR)/1.1/One-way-server-sync/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/pref-tx-rx/*.xml, $(DEST_DIR)/1.1/Pref-Tx-Rx/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/server-busy/*.xml, $(DEST_DIR)/1.1/server-busy/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/server-large/*.xml, $(DEST_DIR)/1.1/server-large/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/server-large-multiple/*.xml, $(DEST_DIR)/1.1/server-large-multiple/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/slow-sync/*.xml, $(DEST_DIR)/1.1/slow-sync/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/two-way-add/*.xml, $(DEST_DIR)/1.1/two-way-add/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/two-way-delete/*.xml, $(DEST_DIR)/1.1/two-way-delete/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/two-way-replace/*.xml, $(DEST_DIR)/1.1/two-way-replace/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/two-way-sync/*.xml, $(DEST_DIR)/1.1/two-way-sync/.)
+
+ $(call forcecopy, $(SOURCE_DIR)/1.1/add-to-client/*.wbxml, $(DEST_DIR)/1.1/add-to-client/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/add-to-server/*.wbxml, $(DEST_DIR)/1.1/add-to-server/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/atomic/*.wbxml, $(DEST_DIR)/1.1/Atomic/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/authbasicfail/*.wbxml, $(DEST_DIR)/1.1/AuthBasicFail/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/authbasicfailfirst/*.wbxml, $(DEST_DIR)/1.1/AuthBasicFailFirst/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/authmd5fail/*.wbxml, $(DEST_DIR)/1.1/AuthMD5Fail/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/authmd5failfirst/*.wbxml, $(DEST_DIR)/1.1/AuthMD5FailFirst/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/client-large/*.wbxml, $(DEST_DIR)/1.1/client-large/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/client-large-multiple/*.wbxml, $(DEST_DIR)/1.1/client-large-multiple/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanadd/*.wbxml, $(DEST_DIR)/1.1/DevManAdd/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanalertdisplay/*.wbxml, $(DEST_DIR)/1.1/DevManAlertDisplay/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanalertmultichoice/*.wbxml, $(DEST_DIR)/1.1/DevManAlertMultiChoice/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanalertsinglechoice/*.wbxml, $(DEST_DIR)/1.1/DevManAlertSingleChoice/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanalerttextinput/*.wbxml, $(DEST_DIR)/1.1/DevManAlertTextInput/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanalertuseraccept/*.wbxml, $(DEST_DIR)/1.1/DevManAlertUserAccept/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanalertuserreject/*.wbxml, $(DEST_DIR)/1.1/DevManAlertUserReject/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanatomic/*.wbxml, $(DEST_DIR)/1.1/DevManAtomic/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanatomicalertuseraccept/*.wbxml, $(DEST_DIR)/1.1/DevManAtomicAlertUserAccept/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanatomicalertuserreject/*.wbxml, $(DEST_DIR)/1.1/DevManAtomicAlertUserReject/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanatomicfail/*.wbxml, $(DEST_DIR)/1.1/DevManAtomicFail/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmandelete/*.wbxml, $(DEST_DIR)/1.1/DevManDelete/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanget/*.wbxml, $(DEST_DIR)/1.1/DevManGet/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanlargeobjectadd/*.wbxml, $(DEST_DIR)/1.1/DevManLargeObjectAdd/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanlargeobjectget/*.wbxml, $(DEST_DIR)/1.1/DevManLargeObjectGet/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmanreplace/*.wbxml, $(DEST_DIR)/1.1/DevManReplace/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmansequence/*.wbxml, $(DEST_DIR)/1.1/DevManSequence/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmansequencealertuseraccept/*.wbxml, $(DEST_DIR)/1.1/DevManSequenceAlertUserAccept/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmansequencealertuserreject/*.wbxml, $(DEST_DIR)/1.1/DevManSequenceAlertUserReject/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmansequencefail/*.wbxml, $(DEST_DIR)/1.1/DevManSequenceFail/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/devmansimple/*.wbxml, $(DEST_DIR)/1.1/DevManSimple/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/large-object-from-client/*.wbxml, $(DEST_DIR)/1.1/Large-object-from-client/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/large-object-from-server/*.wbxml, $(DEST_DIR)/1.1/Large-object-from-server/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/large-object-from-server2/*.wbxml, $(DEST_DIR)/1.1/Large-object-from-server2/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/multiple-db-sync/*.wbxml, $(DEST_DIR)/1.1/Multiple-Db-Sync/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/one-way-client-refresh-sync/*.wbxml, $(DEST_DIR)/1.1/One-way-client-refresh-sync/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/one-way-client-sync/*.wbxml, $(DEST_DIR)/1.1/One-way-client-sync/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/one-way-server-refresh-sync/*.wbxml, $(DEST_DIR)/1.1/One-way-server-refresh-sync/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/one-way-server-sync/*.wbxml, $(DEST_DIR)/1.1/One-way-server-sync/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/pref-tx-rx/*.wbxml, $(DEST_DIR)/1.1/Pref-Tx-Rx/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/server-busy/*.wbxml, $(DEST_DIR)/1.1/server-busy/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/server-large/*.wbxml, $(DEST_DIR)/1.1/server-large/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/server-large-multiple/*.wbxml, $(DEST_DIR)/1.1/server-large-multiple/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/slow-sync/*.wbxml, $(DEST_DIR)/1.1/slow-sync/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/two-way-add/*.wbxml, $(DEST_DIR)/1.1/two-way-add/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/two-way-delete/*.wbxml, $(DEST_DIR)/1.1/two-way-delete/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/two-way-replace/*.wbxml, $(DEST_DIR)/1.1/two-way-replace/.)
+ $(call forcecopy, $(SOURCE_DIR)/1.1/two-way-sync/*.wbxml, $(DEST_DIR)/1.1/two-way-sync/.)
+
+ $(call forcecopy, $(SOURCE_DIR)/1.2/defects/*.wbxml, $(DEST_DIR)/1.2/defects/.)
+
+ $(call forcecopy, $(SOURCE_DIR)/unknown/*.wbxml, $(DEST_DIR)/unknown/.)
+
+DO_NOTHING:
+ @echo do nothing
+
+#
+# The targets invoked by bld...
+#
+
+MAKMAKE : DO_NOTHING
+
+RESOURCE : COPYFILES
+
+CLEAN :
+ $(call createdir,$(DEST_DIR))
+
+BLD : DO_NOTHING
+
+SAVESPACE : DO_NOTHING
+
+FREEZE : DO_NOTHING
+
+LIB : DO_NOTHING
+
+CLEANLIB : DO_NOTHING
+
+RESOURCE : DO_NOTHING
+
+FINAL : DO_NOTHING
+
+RELEASABLES :
+ @echo $(DEST_DIR)/1.1/add-to-client/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/add-to-client/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/add-to-client/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/add-to-server/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/add-to-server/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/add-to-server/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/atomic/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/atomic/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/atomic/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/authbasicfail/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/authbasicfail/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/authbasicfail/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/authbasicfailfirst/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/authbasicfailfirst/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/authbasicfailfirst/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/authmd5fail/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/authmd5fail/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/authmd5fail/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/authmd5failfirst/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/authmd5failfirst/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/authmd5failfirst/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/client-large/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/client-large/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/client-large/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/client-large/FromServer4.wbxml
+ @echo $(DEST_DIR)/1.1/client-large-multiple/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/client-large-multiple/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/client-large-multiple/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/client-large-multiple/FromServer4.wbxml
+ @echo $(DEST_DIR)/1.1/devmanadd/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanadd/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanalertdisplay/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanalertdisplay/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanalertmultichoice/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanalertmultichoice/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanalertsinglechoice/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanalertsinglechoice/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanalerttextinput/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanalerttextinput/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanalertuseraccept/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanalertuseraccept/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanalertuserreject/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanalertuserreject/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanatomic/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanatomic/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanatomicAlertUserAccept/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanatomicAlertUserAccept/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanatomicAlertUserReject/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanatomicAlertUserReject/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanatomicFail/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanatomicFail/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmandelete/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmandelete/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanget/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanget/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanlargeobjectadd/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanlargeobjectadd/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanlargeobjectadd/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/devmanlargeobjectadd/FromServer4.wbxml
+ @echo $(DEST_DIR)/1.1/devmanlargeobjectget/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanlargeobjectget/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmanlargeobjectget/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/devmanlargeobjectget/FromServer4.wbxml
+ @echo $(DEST_DIR)/1.1/devmanlargeobjectget/FromServer5.wbxml
+ @echo $(DEST_DIR)/1.1/devmanreplace/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmanreplace/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmansequence/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmansequence/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmansequencealertuseraccept/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmansequencealertuseraccept/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmansequencealertuserreject/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmansequencealertuserreject/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmansequencefail/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/devmansequencefail/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/devmansimple/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/large-object-from-client/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/large-object-from-client/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/large-object-from-client/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/large-object-from-client/FromServer4.wbxml
+ @echo $(DEST_DIR)/1.1/large-object-from-server/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/large-object-from-server/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/large-object-from-server/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/large-object-from-server/FromServer4.wbxml
+ @echo $(DEST_DIR)/1.1/large-object-from-server2/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/large-object-from-server2/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/large-object-from-server2/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/large-object-from-server2/FromServer4.wbxml
+ @echo $(DEST_DIR)/1.1/multiple-db-sync/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/multiple-db-sync/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/multiple-db-sync/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/one-way-client-refresh-sync/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/one-way-client-refresh-sync/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/one-way-client-refresh-sync/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/one-way-client-sync/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/one-way-client-sync/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/one-way-client-sync/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/one-way-server-refresh-sync/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/one-way-server-refresh-sync/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/one-way-server-refresh-sync/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/one-way-server-sync/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/one-way-server-sync/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/one-way-server-sync/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/pref-tx-rx/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/pref-tx-rx/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/pref-tx-rx/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/server-busy/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/server-large/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/server-large/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/server-large/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/server-large/FromServer4.wbxml
+ @echo $(DEST_DIR)/1.1/server-large-multiple/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/server-large-multiple/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/server-large-multiple/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/server-large-multiple/FromServer4.wbxml
+ @echo $(DEST_DIR)/1.1/server-large-multiple/FromServer5.wbxml
+ @echo $(DEST_DIR)/1.1/slow-sync/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/slow-sync/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/slow-sync/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/two-way-add/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/two-way-add/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/two-way-add/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/two-way-delete/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/two-way-delete/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/two-way-delete/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/two-way-replace/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/two-way-replace/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.1/two-way-replace/FromServer3.wbxml
+ @echo $(DEST_DIR)/1.1/two-way-sync/FromServer1.wbxml
+ @echo $(DEST_DIR)/1.1/two-way-sync/FromServer2.wbxml
+ @echo $(DEST_DIR)/1.2/defects/DEF063979.wbxml
+ @echo $(DEST_DIR)/1.2/defects/DEF066185.wbxml
+ @echo $(DEST_DIR)/1.2/defects/DEF078987_1.wbxml
+ @echo $(DEST_DIR)/1.2/defects/DEF078987_2.wbxml
+ @echo $(DEST_DIR)/1.2/defects/DEF078668.wbxml
+ @echo $(DEST_DIR)/unknown/DEF078987_3.wbxml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/extension_makefiles/test/xml_wmltestfiledist.meta Mon May 03 14:14:40 2010 +0300
@@ -0,0 +1,19 @@
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Meta information for xml_wmltestfiledist
+#
+
+platform win32
+makefile gnumake
+techstream syslibs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/extension_makefiles/test/xml_wmltestfiledist.mk Mon May 03 14:14:40 2010 +0300
@@ -0,0 +1,94 @@
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+TMPROOT:=$(subst \,/,$(EPOCROOT))
+EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
+
+
+include $(EPOCROOT)epoc32/tools/shell/$(notdir $(basename $(SHELL))).mk
+
+ifeq ($(OS), "Windows_NT")
+RMDIR := @rmdir 2>>nul
+else
+RMDIR := @rmdir
+endif
+
+ifeq ($(findstring WINS,$(PLATFORM)),WINS)
+ DEST_DIR = $(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/z/system/xmltest/wml
+else
+ DEST_DIR = $(EPOCROOT)epoc32/data/z/system/xmltest/wml
+endif
+
+SOURCE_DIR = $(EXTENSION_ROOT)/../test/rtest/data/Wml
+
+# Ensure we have a clean canvas - this also avoids us having to specify
+# switches to commands that are not recognised across platforms.
+CLEAN_DEST :
+ $(call createdir,$(DEST_DIR))
+
+MAKE_DIRS :
+ $(call createdir,$(DEST_DIR)/1.1)
+ $(call createdir,$(DEST_DIR)/codepage)
+ $(call createdir,$(DEST_DIR)/corrupt)
+ $(call createdir,$(DEST_DIR)/unknown)
+
+COPYFILES : CLEAN_DEST MAKE_DIRS
+ $(call forcecopy, $(SOURCE_DIR)/1.1/*.wmlc, $(DEST_DIR)/1.1/.)
+ $(call forcecopy, $(SOURCE_DIR)/codepage/*.wmlc, $(DEST_DIR)/codepage/.)
+ $(call forcecopy, $(SOURCE_DIR)/corrupt/*.wmlc, $(DEST_DIR)/corrupt/.)
+ $(call forcecopy, $(SOURCE_DIR)/unknown/*.wmlc, $(DEST_DIR)/unknown/.)
+
+DO_NOTHING:
+ @echo do nothing
+
+#
+# The targets invoked by bld...
+#
+
+MAKMAKE : DO_NOTHING
+
+RESOURCE : COPYFILES
+
+CLEAN :
+ $(call createdir,$(DEST_DIR))
+
+BLD : DO_NOTHING
+
+SAVESPACE : DO_NOTHING
+
+FREEZE : DO_NOTHING
+
+LIB : DO_NOTHING
+
+CLEANLIB : DO_NOTHING
+
+RESOURCE : DO_NOTHING
+
+FINAL : DO_NOTHING
+
+RELEASABLES :
+ @echo $(DEST_DIR)/1.1/AllElements.wmlc
+ @echo $(DEST_DIR)/1.1/CharEntities.wmlc
+ @echo $(DEST_DIR)/1.1/data.wmlc
+ @echo $(DEST_DIR)/1.1/http___www.bbc.co.uk_mobile_sportheads1.wmlc
+ @echo $(DEST_DIR)/1.1/mob.wmlc
+ @echo $(DEST_DIR)/1.1/Variables.wmlc
+ @echo $(DEST_DIR)/1.1/wireless_char.wmlc
+ @echo $(DEST_DIR)/codepage/wml_data_attr_copepage_255.wmlc
+ @echo $(DEST_DIR)/corrupt/CorruptAttrVal_mob.wmlc
+ @echo $(DEST_DIR)/corrupt/CorruptAttr_mob.wmlc
+ @echo $(DEST_DIR)/corrupt/CorruptTag_AllElements.wmlc
+ @echo $(DEST_DIR)/corrupt/NonNullTermInlineStr.wmlc
+ @echo $(DEST_DIR)/unknown/UnknownPubId_AllElements.wmlc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/extension_makefiles/test/xml_xmlcmatchdatapostbuild.meta Mon May 03 14:14:40 2010 +0300
@@ -0,0 +1,19 @@
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Meta information for xml_xmlcmatchdatapostbuild use
+#
+
+platform win32
+makefile gnumake
+techstream syslibs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/extension_makefiles/test/xml_xmlcmatchdatapostbuild.mk Mon May 03 14:14:40 2010 +0300
@@ -0,0 +1,85 @@
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+TMPROOT:=$(subst \,/,$(EPOCROOT))
+EPOCROOT:=$(patsubst %/,%,$(TMPROOT))/
+
+include $(EPOCROOT)epoc32/tools/shell/$(notdir $(basename $(SHELL))).mk
+
+ifeq ($(OS), "Windows_NT")
+ RMDIR := @rmdir 2>>nul
+ @echo $(OS))
+else
+ RMDIR := @rmdir
+endif
+ifeq ($(findstring WINS,$(PLATFORM)),WINS)
+ TARGETDIR = $(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/z/xmlramonly
+ SOURCEDIR = $(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)
+ SOURCEDIR2 = $(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/z/resource/plugins
+else
+ TARGETDIR = $(EPOCROOT)epoc32/data/z/xmlramonly
+ SOURCEDIR = $(EPOCROOT)epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)
+ SOURCEDIR2 = $(EPOCROOT)epoc32/data/z/resource/plugins
+endif
+
+# Ensure we have a clean canvas - this also avoids us having to specify
+# switches to commands that are not recognised across platforms.
+CLEAN_DEST :
+ $(call createdir,$(TARGETDIR))
+
+$(TARGETDIR) :
+ $(call createdir,"$@")
+
+COPYFILES : CLEAN_DEST $(TARGETDIR)
+ $(call forcecopy,$(SOURCEDIR)/tu_xmlramparserplugins.dll, $(TARGETDIR)/tu_xmlramparserplugins.dll)
+ $(call forcecopy,$(SOURCEDIR2)/tu_xmlramparserplugins.RSC, $(TARGETDIR)/tu_xmlramparserplugins.rsc)
+
+DO_NOTHING:
+ @echo do nothing
+
+#
+# The targets invoked by bld...
+#
+
+MAKMAKE : DO_NOTHING
+
+RESOURCE : DO_NOTHING
+
+CLEAN :
+ $(call createdir,$(TARGETDIR))
+ -$(ERASE) $(call slash2generic,$(SOURCEDIR)/tu_xmlramparserplugins.dll)
+ -$(ERASE) $(call slash2generic,$(SOURCEDIR2)/tu_xmlramparserplugins.rsc)
+
+BLD : DO_NOTHING
+
+SAVESPACE : DO_NOTHING
+
+FREEZE : DO_NOTHING
+
+LIB : DO_NOTHING
+
+CLEANLIB : DO_NOTHING
+
+RESOURCE : DO_NOTHING
+
+ifeq ($(PLATFORM), GCCXML)
+FINAL : DO_NOTHING
+else
+FINAL : COPYFILES
+endif
+
+RELEASABLES :
+ @echo $(TARGETDIR)/tu_xmlramparserplugins.dll
+ @echo $(TARGETDIR)/tu_xmlramparserplugins.rsc
--- a/group/bld.inf Fri Apr 16 16:57:34 2010 +0300
+++ b/group/bld.inf Mon May 03 14:14:40 2010 +0300
@@ -19,4 +19,6 @@
#include "../inc/xmlsrv.hrh"
#include "../xmlsrv_plat/group/bld.inf"
-#include "../xmlsecurityengine/group/bld.inf"
\ No newline at end of file
+#include "../xmlsecurityengine/group/bld.inf"
+
+#include "../extension_makefiles/group/bld.inf"
--- a/package_definition.xml Fri Apr 16 16:57:34 2010 +0300
+++ b/package_definition.xml Mon May 03 14:14:40 2010 +0300
@@ -53,7 +53,7 @@
<component id="libxml2libs" name="Libxml2 Libraries" introduced="^3" purpose="optional">
<unit bldFile="xml/libxml2libs/group" mrp="xml/libxml2libs/group/syslibs_libxml2.mrp"/>
</component>
- <component id="legacyminidomparser" name="legacyminidomparser" introduced="7.0s" purpose="optional">
+ <component id="legacyminidomparser" name="Legacy Mini-DOM Parser" introduced="7.0s" purpose="optional">
<unit bldFile="xml/legacyminidomparser/GROUP" mrp="xml/legacyminidomparser/GROUP/syslibs_legacyminidomparser.mrp" />
</component>
<component id="xmldomandxpath" name="XML DOM and XPath" introduced="^3" purpose="optional">
--- a/xml/libxml2libs/test/common/src/XML_flagsStep.h Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/common/src/XML_flagsStep.h Mon May 03 14:14:40 2010 +0300
@@ -27,7 +27,7 @@
#include "Te_XML_FTmgrSuiteStepBase.h"
#include <featmgr/featmgr.h>
#include <featmgr/featurecontrol.h>
-#include "Symbian_OS.hrh"
+
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/group/xmlengtester.mmp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/group/xmlengtester.mmp Mon May 03 14:14:40 2010 +0300
@@ -16,7 +16,7 @@
-//#include <domain/osextensions/platform_paths.hrh>
+//#include <platform_paths.hrh>
TARGET xmlengtester.dll
TARGETTYPE dll
@@ -54,7 +54,7 @@
SOURCE testbuffermanager.cpp
USERINCLUDE ../inc
-USERINCLUDE /epoc32/include/domain/osextensions
+
//USERINCLUDE ../../../../../../../unref/orphan/comgen/syslibs/xml/inc
//USERINCLUDE ../../../../../../../unref/orphan/comgen/syslibs/inc
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/inc/xmlengtester.h Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/inc/xmlengtester.h Mon May 03 14:14:40 2010 +0300
@@ -20,9 +20,9 @@
#define XML_TEST_H
// INCLUDES
-#include <domain/osextensions/StifLogger.h>
-#include <domain/osextensions/TestScripterInternal.h>
-#include <domain/osextensions/StifTestModule.h>
+#include <StifLogger.h>
+#include <TestScripterInternal.h>
+#include <StifTestModule.h>
#include <f32file.h>
#include <Xml\XmlParserErrors.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtester.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtester.cpp Mon May 03 14:14:40 2010 +0300
@@ -18,7 +18,7 @@
#include "xmlengtester.h"
#include "xmlengtesterdef.h"
#include <XmlEngxestd.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <Stiftestinterface.h>
#include <sys/reent.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocks.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocks.cpp Mon May 03 14:14:40 2010 +0300
@@ -22,8 +22,8 @@
#include <e32svr.h>
#include <e32math.h>
#include <f32file.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include "xmlengtesterdef.h"
#include <Xml\Parser.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksaddfun.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksaddfun.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include <e32math.h>
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngBinaryContainer.h>
#include "xmlengtesterdef.h"
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksbincont.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksbincont.cpp Mon May 03 14:14:40 2010 +0300
@@ -19,8 +19,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngBinaryContainer.h>
#include <XmlEngFileContainer.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblockschunkcont.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblockschunkcont.cpp Mon May 03 14:14:40 2010 +0300
@@ -23,8 +23,8 @@
#include "XmlEngFileContainer.h"
#include "XmlEngNode.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <Xml\Parser.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksdeserialize.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksdeserialize.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include <e32svr.h>
#include <e32std.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngDeserializer.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksdeserializedom.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksdeserializedom.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include <e32svr.h>
#include <e32std.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngDeserializer.h>
#include <XmlEngDeserializerDOM.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksdesinfoset.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksdesinfoset.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include <e32svr.h>
#include <e32std.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngDeserializer.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksdom.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksdom.cpp Mon May 03 14:14:40 2010 +0300
@@ -19,8 +19,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <Xml\Parser.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksfilecont.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksfilecont.cpp Mon May 03 14:14:40 2010 +0300
@@ -22,8 +22,8 @@
#include "XmlEngBinaryContainer.h"
#include "XmlEngNode.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <Xml\Parser.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblockssax.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblockssax.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <Xml\Parser.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksserdefault.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksserdefault.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include <e32svr.h>
#include <e32std.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include "XmlEngBinaryContainer.h"
#include "XmlEngChunkContainer.h"
#include "xmlengtesterdef.h"
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblockssergzip.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblockssergzip.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngSerializer.h>
#include <XmlEngBinaryContainer.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksserializer.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksserializer.cpp Mon May 03 14:14:40 2010 +0300
@@ -19,8 +19,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngSerializer.h>
#include <XmlEngBinaryContainer.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksserxop.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksserxop.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include <e32svr.h>
#include <e32std.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include "XmlEngBinaryContainer.h"
#include "XmlEngChunkContainer.h"
#include "XmlEngFileContainer.h"
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksutils.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksutils.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <Xml\Parser.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksxpath.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_emulator/src/xmlengtesterblocksxpath.cpp Mon May 03 14:14:40 2010 +0300
@@ -19,8 +19,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngXPathExtensionFunction.h>
#include <XmlEngXPathEvaluationContext.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/inc/xmlengtester.h Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/inc/xmlengtester.h Mon May 03 14:14:40 2010 +0300
@@ -19,9 +19,9 @@
#define XML_TEST_H
// INCLUDES
-#include <domain/osextensions/StifLogger.h>
-#include <domain/osextensions/TestScripterInternal.h>
-#include <domain/osextensions/StifTestModule.h>
+#include <StifLogger.h>
+#include <TestScripterInternal.h>
+#include <StifTestModule.h>
#include <f32file.h>
#include <Xml\XmlParserErrors.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtester.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtester.cpp Mon May 03 14:14:40 2010 +0300
@@ -18,7 +18,7 @@
#include "xmlengtester.h"
#include "xmlengtesterdef.h"
#include <XmlEngxestd.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <Stiftestinterface.h>
#include <sys/reent.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocks.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocks.cpp Mon May 03 14:14:40 2010 +0300
@@ -22,8 +22,8 @@
#include <e32svr.h>
#include <e32math.h>
#include <f32file.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include "xmlengtesterdef.h"
#include <Xml\Parser.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksaddfun.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksaddfun.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include <e32math.h>
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngBinaryContainer.h>
#include "xmlengtesterdef.h"
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksbincont.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksbincont.cpp Mon May 03 14:14:40 2010 +0300
@@ -19,8 +19,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngBinaryContainer.h>
#include <XmlEngFileContainer.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblockschunkcont.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblockschunkcont.cpp Mon May 03 14:14:40 2010 +0300
@@ -23,8 +23,8 @@
#include "XmlEngFileContainer.h"
#include "XmlEngNode.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <Xml\Parser.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksdeserialize.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksdeserialize.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include <e32svr.h>
#include <e32std.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngDeserializer.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksdeserializedom.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksdeserializedom.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include <e32svr.h>
#include <e32std.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngDeserializer.h>
#include <XmlEngDeserializerDOM.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksdesinfoset.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksdesinfoset.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include <e32svr.h>
#include <e32std.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngDeserializer.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksdom.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksdom.cpp Mon May 03 14:14:40 2010 +0300
@@ -19,8 +19,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <Xml\Parser.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksfilecont.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksfilecont.cpp Mon May 03 14:14:40 2010 +0300
@@ -22,8 +22,8 @@
#include "XmlEngBinaryContainer.h"
#include "XmlEngNode.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <Xml\Parser.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblockssax.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblockssax.cpp Mon May 03 14:14:40 2010 +0300
@@ -19,8 +19,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <Xml\Parser.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksserdefault.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksserdefault.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include <e32svr.h>
#include <e32std.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include "XmlEngBinaryContainer.h"
#include "XmlEngChunkContainer.h"
#include "xmlengtesterdef.h"
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblockssergzip.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblockssergzip.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngSerializer.h>
#include <XmlEngBinaryContainer.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksserializer.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksserializer.cpp Mon May 03 14:14:40 2010 +0300
@@ -19,8 +19,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngSerializer.h>
#include <XmlEngBinaryContainer.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksserxop.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksserxop.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include <e32svr.h>
#include <e32std.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include "XmlEngBinaryContainer.h"
#include "XmlEngChunkContainer.h"
#include "XmlEngFileContainer.h"
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksutils.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksutils.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <Xml\Parser.h>
#include <Xml\ParserFeature.h>
--- a/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksxpath.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/libxml2libs/test/xmlengtester/xmlengtester_target/src/xmlengtesterblocksxpath.cpp Mon May 03 14:14:40 2010 +0300
@@ -20,8 +20,8 @@
#include "xmlengtester.h"
#include <e32svr.h>
-#include <domain/osextensions/StifParser.h>
-#include <domain/osextensions/Stiftestinterface.h>
+#include <StifParser.h>
+#include <Stiftestinterface.h>
#include <XmlEngXPathExtensionFunction.h>
#include <XmlEngXPathEvaluationContext.h>
--- a/xml/xmldomandxpath/inc/xmlenginedom/xmlengbinarycontainer.h Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/xmldomandxpath/inc/xmlenginedom/xmlengbinarycontainer.h Mon May 03 14:14:40 2010 +0300
@@ -69,7 +69,7 @@
@leave KXmlEngErrNullNode Node is NULL
@leave - One of the system-wide error codes
*/
- EXPORT_C void AppendContentsL( const TDesC8& aData );
+ IMPORT_C void AppendContentsL( const TDesC8& aData );
/** Default constructor */
inline TXmlEngBinaryContainer();
--- a/xml/xmlfw/src/xmlframework/matchdata.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xml/xmlfw/src/xmlframework/matchdata.cpp Mon May 03 14:14:40 2010 +0300
@@ -800,6 +800,13 @@
CMatchData& CMatchData::operator=(const CMatchData & aMatchData)
{
+ /*If pointing to same. Then return itself*/
+ if ( &aMatchData == this )
+ {
+ return *this;
+ }
+
+
/*
* SYMBIAN DEF132492 FIX : Added TRAP statements to handle the case wherein the functions
* called here leave.
--- a/xmlsecurityengine/xmlsec/src/xmlsec_bn.c Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlsec/src/xmlsec_bn.c Mon May 03 14:14:40 2010 +0300
@@ -263,7 +263,7 @@
continue;
}
- xmlSecAssert2(ch <= sizeof(xmlSecBnLookupTable), -1);
+ xmlSecAssert2(ch <(sizeof(xmlSecBnLookupTable)/sizeof(xmlSecBnLookupTable[0])), -1);
nn = xmlSecBnLookupTable[ch];
if((nn < 0) || ((xmlSecSize)nn > base)) {
xmlSecError(XMLSEC_ERRORS_HERE,
@@ -426,9 +426,10 @@
return (NULL);
}
memset(res, 0, len + 1);
-
- for(i = 0; (xmlSecBufferGetSize(&bn2) > 0) && (i < len); i++) {
- if(xmlSecBnDiv(&bn2, base, &nn) < 0) {
+ for(i = 0; (xmlSecBufferGetSize(&bn2) > 0) && (i < len); i++)
+ {
+ if(xmlSecBnDiv(&bn2, base, &nn) < 0)
+ {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"xmlSecBnDiv",
@@ -437,11 +438,19 @@
xmlFree(res);
xmlSecBnFinalize(&bn2);
return (NULL);
- }
- xmlSecAssert2((size_t)nn < sizeof(xmlSecBnRevLookupTable), NULL);
+ }
+ if(nn >=(sizeof(xmlSecBnRevLookupTable)/sizeof(xmlSecBnRevLookupTable[0])))
+ {
+ xmlFree(res);
+ return (NULL);
+ }
res[i] = xmlSecBnRevLookupTable[nn];
- }
- xmlSecAssert2(i < len, NULL);
+ }
+ if(i >=len)
+ {
+ xmlFree(res);
+ return (NULL);
+ }
/* we might have '0' at the beggining, remove it but keep one zero */
for(len = i; (len > 1) && (res[len - 1] == '0'); len--)
--- a/xmlsecurityengine/xmlsec/src/xmlsec_errors.c Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlsec/src/xmlsec_errors.c Mon May 03 14:14:40 2010 +0300
@@ -242,8 +242,9 @@
if(msg != NULL) {
va_list va;
-
- va_start(va, msg);
+
+ //va points to the first argument in the list of variable arguments
+ va_start(va, msg);
xmlSecStrVPrintf(error_msg, sizeof(error_msg), BAD_CAST msg, va);
error_msg[sizeof(error_msg) - 1] = '\0';
va_end(va);
--- a/xmlsecurityengine/xmlsec/src/xmlsec_keyinfo.c Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlsec/src/xmlsec_keyinfo.c Mon May 03 14:14:40 2010 +0300
@@ -770,9 +770,14 @@
}
/* finally set key name if it is not there */
- if(xmlSecKeyGetName(key) == NULL) {
- xmlSecKeySetName(key, newName);
- }
+ if(xmlSecKeyGetName(key) == NULL)
+ {
+ if(xmlSecKeySetName(key, newName)<0)
+ {
+ xmlFree(newName);
+ return(-1);
+ }
+ }
xmlFree(newName);
return(0);
}
--- a/xmlsecurityengine/xmlsec/src/xmlsec_keys.c Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlsec/src/xmlsec_keys.c Mon May 03 14:14:40 2010 +0300
@@ -169,25 +169,28 @@
xmlSecAssert2(keyUseWith != NULL, NULL);
newKeyUseWith = xmlSecKeyUseWithCreate(NULL, NULL);
- if(newKeyUseWith == NULL) {
- xmlSecError(XMLSEC_ERRORS_HERE,
+ if(newKeyUseWith == NULL)
+ {
+ xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"xmlSecKeyUseWithCreate",
XMLSEC_ERRORS_R_XMLSEC_FAILED,
XMLSEC_ERRORS_NO_MESSAGE);
return(NULL);
- }
+ }
ret = xmlSecKeyUseWithCopy(newKeyUseWith, keyUseWith);
- if(ret < 0) {
+ if(ret < 0)
+ {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"xmlSecKeyUseWithCopy",
XMLSEC_ERRORS_R_XMLSEC_FAILED,
XMLSEC_ERRORS_NO_MESSAGE);
- xmlSecKeyUseWithDestroy(keyUseWith);
+ xmlSecKeyUseWithDestroy(keyUseWith);
+ xmlSecKeyUseWithDestroy( newKeyUseWith);
return(NULL);
- }
+ }
return(newKeyUseWith);
}
@@ -1384,8 +1387,9 @@
if(keyInfoNode != NULL) {
ret = xmlSecKeyInfoNodeRead(keyInfoNode, key, keyInfoCtx);
- if(ret < 0) {
- xmlSecError(XMLSEC_ERRORS_HERE,
+ if(ret < 0)
+ {
+ xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"xmlSecKeyInfoNodeRead",
XMLSEC_ERRORS_R_XMLSEC_FAILED,
@@ -1403,39 +1407,45 @@
tempkey=xmlSecKeyDuplicate(key);
if(tempkey == NULL)
{
- xmlSecError(XMLSEC_ERRORS_HERE,
- NULL,
- "xmlSecKeysMngrFindKey",
- XMLSEC_ERRORS_R_XMLSEC_FAILED,
- XMLSEC_ERRORS_NO_MESSAGE);
- return(NULL);
+ xmlSecError(XMLSEC_ERRORS_HERE,
+ NULL,
+ "xmlSecKeysMngrFindKey",
+ XMLSEC_ERRORS_R_XMLSEC_FAILED,
+ XMLSEC_ERRORS_NO_MESSAGE);
+ xmlSecKeyDestroy(key);
+ return(NULL);
}
- keyname=xmlSecKeyGetName(tempkey);
+ keyname=xmlSecKeyGetName(tempkey);
xmlSecKeyDestroy(key);
/* if we have keys manager, try it */
- if(keyInfoCtx->keysMngr != NULL) {
- key = xmlSecKeysMngrFindKey(keyInfoCtx->keysMngr, keyname /*NULL*/, keyInfoCtx);
- xmlSecKeyDestroy(tempkey);
- if(key == NULL) {
- xmlSecError(XMLSEC_ERRORS_HERE,
- NULL,
- "xmlSecKeysMngrFindKey",
- XMLSEC_ERRORS_R_XMLSEC_FAILED,
- XMLSEC_ERRORS_NO_MESSAGE);
- return(NULL);
- }
- if(xmlSecKeyGetValue(key) != NULL) {
- return(key);
- }
- xmlSecKeyDestroy(key);
- }
+ if(keyInfoCtx->keysMngr != NULL)
+ {
+ key = xmlSecKeysMngrFindKey(keyInfoCtx->keysMngr, keyname /*NULL*/, keyInfoCtx);
+ if(key == NULL)
+ {
+ xmlSecError(XMLSEC_ERRORS_HERE,
+ NULL,
+ "xmlSecKeysMngrFindKey",
+ XMLSEC_ERRORS_R_XMLSEC_FAILED,
+ XMLSEC_ERRORS_NO_MESSAGE);
+ xmlSecKeyDestroy(tempkey);
+ return(NULL);
+ }
+ if(xmlSecKeyGetValue(key) != NULL)
+ {
+ xmlSecKeyDestroy(tempkey);
+ return(key);
+ }
+ xmlSecKeyDestroy(key);
+ }
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
NULL,
XMLSEC_ERRORS_R_KEY_NOT_FOUND,
- XMLSEC_ERRORS_NO_MESSAGE);
+ XMLSEC_ERRORS_NO_MESSAGE);
+ xmlSecKeyDestroy(tempkey);
return(NULL);
}
--- a/xmlsecurityengine/xmlsec/src/xmlsec_keysmngr.c Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlsec/src/xmlsec_keysmngr.c Mon May 03 14:14:40 2010 +0300
@@ -63,14 +63,16 @@
memset(mngr, 0, sizeof(xmlSecKeysMngr));
ret = xmlSecPtrListInitialize(&(mngr->storesList), xmlSecKeyDataStorePtrListId);
- if(ret < 0) {
- xmlSecError(XMLSEC_ERRORS_HERE,
+ if(ret < 0)
+ {
+ xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"xmlSecPtrListInitialize",
XMLSEC_ERRORS_R_XMLSEC_FAILED,
"xmlSecKeyDataStorePtrListId");
- return(NULL);
- }
+ xmlFree(mngr);
+ return(NULL);
+ }
return(mngr);
}
--- a/xmlsecurityengine/xmlsec/src/xmlsec_transforms.c Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlsec/src/xmlsec_transforms.c Mon May 03 14:14:40 2010 +0300
@@ -588,15 +588,17 @@
xmlSecAssert2(id != xmlSecTransformIdUnknown, NULL);
transform = xmlSecTransformCreate(id);
- if(!xmlSecTransformIsValid(transform)) {
- xmlSecError(XMLSEC_ERRORS_HERE,
+ if(!xmlSecTransformIsValid(transform))
+ {
+ xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"xmlSecTransformCreate",
XMLSEC_ERRORS_R_XMLSEC_FAILED,
"transform=%s",
xmlSecErrorsSafeString(xmlSecTransformKlassGetName(id)));
- return(NULL);
- }
+ xmlSecTransformDestroy(transform);
+ return(NULL);
+ }
ret = xmlSecTransformCtxAppend(ctx, transform);
if(ret < 0) {
@@ -634,27 +636,30 @@
xmlSecAssert2(id != xmlSecTransformIdUnknown, NULL);
transform = xmlSecTransformCreate(id);
- if(!xmlSecTransformIsValid(transform)) {
- xmlSecError(XMLSEC_ERRORS_HERE,
+ if(!xmlSecTransformIsValid(transform))
+ {
+ xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"xmlSecTransformCreate",
XMLSEC_ERRORS_R_XMLSEC_FAILED,
"transform=%s",
xmlSecErrorsSafeString(xmlSecTransformKlassGetName(id)));
- return(NULL);
- }
+ xmlSecTransformDestroy(transform);
+ return(NULL);
+ }
ret = xmlSecTransformCtxPrepend(ctx, transform);
- if(ret < 0) {
- xmlSecError(XMLSEC_ERRORS_HERE,
+ if(ret < 0)
+ {
+ xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
"xmlSecTransformCtxPrepend",
XMLSEC_ERRORS_R_XMLSEC_FAILED,
"name=%s",
xmlSecErrorsSafeString(xmlSecTransformGetName(transform)));
- xmlSecTransformDestroy(transform);
- return(NULL);
- }
+ xmlSecTransformDestroy(transform);
+ return(NULL);
+ }
return(transform);
}
@@ -1570,6 +1575,7 @@
"transform=%s",
xmlSecErrorsSafeString(xmlSecTransformKlassGetName(id)));
xmlFree(href);
+ xmlSecTransformDestroy(transform);
return(NULL);
}
--- a/xmlsecurityengine/xmlsec/src/xmlsec_xmldsig.c Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlsec/src/xmlsec_xmldsig.c Mon May 03 14:14:40 2010 +0300
@@ -122,7 +122,7 @@
EXPORT_C
int
xmlSecDSigCtxInitialize(xmlSecDSigCtxPtr dsigCtx, xmlSecKeysMngrPtr keysMngr) {
- int ret;
+ int ret,ret1;
xmlSecAssert2(dsigCtx != NULL, -1);
@@ -165,10 +165,19 @@
}
/* references lists from SignedInfo and Manifest elements */
- xmlSecPtrListInitialize(&(dsigCtx->signedInfoReferences),
+ ret=xmlSecPtrListInitialize(&(dsigCtx->signedInfoReferences),
xmlSecDSigReferenceCtxListId);
- xmlSecPtrListInitialize(&(dsigCtx->manifestReferences),
+ ret1=xmlSecPtrListInitialize(&(dsigCtx->manifestReferences),
xmlSecDSigReferenceCtxListId);
+ if(ret<0 ||ret1<0)
+ {
+ xmlSecError(XMLSEC_ERRORS_HERE,
+ NULL,
+ "xmlSecTransformCtxInitialize",
+ XMLSEC_ERRORS_R_XMLSEC_FAILED,
+ XMLSEC_ERRORS_NO_MESSAGE);
+ return(-1);
+ }
dsigCtx->enabledReferenceUris = xmlSecTransformUriTypeAny;
return(0);
--- a/xmlsecurityengine/xmlsec/src/xmlsec_xmltree.c Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlsec/src/xmlsec_xmltree.c Mon May 03 14:14:40 2010 +0300
@@ -1640,7 +1640,7 @@
xmlFree(content);
return(-1);
}
- xmlFree(content);
+
if((stopOnUnknown != 0) && (tmp == 0)) {
xmlSecError(XMLSEC_ERRORS_HERE,
@@ -1649,9 +1649,12 @@
XMLSEC_ERRORS_R_XMLSEC_FAILED,
"value=%s",
xmlSecErrorsSafeString(content));
+ xmlFree(content);
return(-1);
}
+ xmlFree(content);
+
(*mask) |= tmp;
cur = xmlSecGetNextElementNode(cur->next);
}
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_bio.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_bio.cpp Mon May 03 14:14:40 2010 +0300
@@ -91,6 +91,7 @@
if(fileLen < 0)
{
xmlSecSetErrorFlag( KErrGeneral );
+ fclose(fp);
return(NULL);
}
fseek ( fp , 0L , SEEK_SET );
@@ -98,12 +99,14 @@
buf = (char *)malloc(sizeof(char)*(fileLen+1));
if(!buf) {
xmlSecSetErrorFlag( KErrNoMemory );
+ fclose(fp);
return(NULL);
}
byteRead = fread(buf, sizeof(char), fileLen, fp);
if(byteRead != fileLen) {
free(buf);
+ fclose(fp);
return(NULL);
}
@@ -114,6 +117,7 @@
{
xmlSecSetErrorFlag( KErrNoMemory );
free(buf);
+ fclose(fp);
return (NULL);
}
strcpy(tmpname, name);
@@ -128,13 +132,14 @@
free(tmpname);
}
free(buf);
+ fclose(fp);
return(NULL);
}
bio->mem = buf;
bio->len = fileLen;
bio->name = tmpname;
-
+ fclose(fp);
return bio;
}
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_evp.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_evp.cpp Mon May 03 14:14:40 2010 +0300
@@ -135,19 +135,21 @@
ctxSrc = xmlSecSymbianCryptoEvpKeyDataGetCtx(src);
xmlSecAssert2(ctxSrc, -1);
- if(ctxSrc->pKey) {
+ if(ctxSrc->pKey)
+ {
ctxDst->pKey = xmlSecSymbianCryptoEvpKeyDup(ctxSrc->pKey);
- ctxDst->pKey->duplicate=0;
- ctxSrc->pKey->duplicate=1;
- if(!ctxDst->pKey) {
- xmlSecError(XMLSEC_ERRORS_HERE,
- xmlSecErrorsSafeString(xmlSecKeyDataGetName(dst)),
- "xmlSecSymbianCryptoEvpKeyDup",
- XMLSEC_ERRORS_R_XMLSEC_FAILED,
- XMLSEC_ERRORS_NO_MESSAGE);
- return(-1);
- }
- }
+ if(!ctxDst->pKey)
+ {
+ xmlSecError(XMLSEC_ERRORS_HERE,
+ xmlSecErrorsSafeString(xmlSecKeyDataGetName(dst)),
+ "xmlSecSymbianCryptoEvpKeyDup",
+ XMLSEC_ERRORS_R_XMLSEC_FAILED,
+ XMLSEC_ERRORS_NO_MESSAGE);
+ return(-1);
+ }
+ ctxDst->pKey->duplicate=0;
+ ctxSrc->pKey->duplicate=1;
+ }
return(0);
}
@@ -1401,6 +1403,7 @@
return(-1);
}
+ /*
if(!rsa) {
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecKeyDataKlassGetName(id)),
@@ -1409,7 +1412,7 @@
XMLSEC_ERRORS_NO_MESSAGE);
return(-1);
}
-
+ */
cur = xmlSecGetNextElementNode(node->children);
/* first is Modulus node. It is REQUIRED because we do not support Seed and PgenCounter*/
@@ -1652,6 +1655,7 @@
"sc_load_key",
XMLSEC_ERRORS_R_CRYPTO_FAILED,
"sizeBits=%d", sizeBits);
+ sc_pkey_free(pKey);
return(-1);
}
@@ -1667,17 +1671,22 @@
"sc_generate_key",
XMLSEC_ERRORS_R_CRYPTO_FAILED,
"sizeBits=%d", sizeBits);
- return(-1);
+ sc_pkey_free(pKey);
+ return(-1);
}
}
- if (!pKey->load) {
- xmlSecError(XMLSEC_ERRORS_HERE,
+ if (!pKey->load)
+ {
+
+ xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
"sc_generate_key",
XMLSEC_ERRORS_R_CRYPTO_FAILED,
"sizeBits=%d", sizeBits);
- return(-1);
- }
+
+ sc_pkey_free(pKey);
+ return(-1);
+ }
ret = xmlSecSymbianCryptoKeyDataRsaAdoptEvp(data, pKey);
if(ret < 0) {
@@ -1705,6 +1714,7 @@
return(-1);
}
*/
+ sc_pkey_free(pKey);
return(0);
}
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_md.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_md.cpp Mon May 03 14:14:40 2010 +0300
@@ -190,7 +190,7 @@
/* Set key for HMAC */
int sc_md_setkey(sc_md_hd_t hd, unsigned char *buffer, size_t length)
{
- TInt err;
+ TInt err =KErrNone;
if (!hd || !buffer || length <=0)
return KErrArgument;
--- a/xmlsecurityengine/xmlseccrypto/src/xmlsecc_x509.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlseccrypto/src/xmlsecc_x509.cpp Mon May 03 14:14:40 2010 +0300
@@ -577,6 +577,7 @@
size = xmlSecSymbianCryptoKeyDataX509GetCertsSize(src);
for(pos = 0; pos < size; ++pos) {
certSrc = xmlSecSymbianCryptoKeyDataX509GetCert(src, pos);
+ certDst = xmlSecSymbianCryptoKeyDataX509GetCert(dst, pos);
if(!certSrc) {
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecKeyDataGetName(src)),
@@ -610,6 +611,7 @@
size = xmlSecSymbianCryptoKeyDataX509GetCrlsSize(src);
for(pos = 0; pos < size; ++pos) {
crlSrc = xmlSecSymbianCryptoKeyDataX509GetCrl(src, pos);
+ crlDst =xmlSecSymbianCryptoKeyDataX509GetCrl(dst, pos);
if(!crlSrc) {
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecKeyDataGetName(src)),
@@ -618,7 +620,6 @@
"pos=%d", pos);
return(-1);
}
-
if(!crlDst) {
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecKeyDataGetName(dst)),
@@ -1106,8 +1107,7 @@
xmlSecKeyDataStorePtr x509Store;
xmlChar* subject;
X509* cert;
- X509* cert2 = NULL;
- int ret;
+ //X509* cert2 = NULL;
xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecSymbianCryptoKeyDataX509Id), -1);
xmlSecAssert2(node, -1);
@@ -1142,8 +1142,6 @@
cert = xmlSecSymbianCryptoX509StoreFindCert(x509Store, subject, NULL, NULL, NULL, keyInfoCtx);
if(!cert){
- xmlFree(subject);
-
if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT) != 0) {
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
@@ -1151,11 +1149,15 @@
XMLSEC_ERRORS_R_CERT_NOT_FOUND,
"subject=%s",
xmlSecErrorsSafeString(subject));
+ xmlFree(subject);
return(-1);
}
+ xmlFree(subject);
return(0);
}
-
+
+ //dead error condition
+ /*
if(!cert2) {
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
@@ -1176,7 +1178,7 @@
xmlFree(subject);
return(-1);
}
-
+ */
xmlFree(subject);
return(0);
}
@@ -1225,8 +1227,7 @@
xmlChar *issuerName;
xmlChar *issuerSerial;
X509* cert;
- X509* cert2 = NULL;
- int ret;
+ //X509* cert2 = NULL;
xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecSymbianCryptoKeyDataX509Id), -1);
xmlSecAssert2(node, -1);
@@ -1320,23 +1321,27 @@
issuerSerial,
NULL,
keyInfoCtx);
- if(!cert){
- xmlFree(issuerSerial);
- xmlFree(issuerName);
-
- if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT) != 0) {
- xmlSecError(XMLSEC_ERRORS_HERE,
+ if(!cert)
+ {
+ if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT) != 0)
+ {
+ xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
NULL,
XMLSEC_ERRORS_R_CERT_NOT_FOUND,
"issuerName=%s;issuerSerial=%s",
xmlSecErrorsSafeString(issuerName),
xmlSecErrorsSafeString(issuerSerial));
- return(-1);
- }
- return(0);
- }
+ xmlFree(issuerSerial);
+ xmlFree(issuerName);
+ return(-1);
+ }
+ xmlFree(issuerSerial);
+ xmlFree(issuerName);
+ return(0);
+ }
+ /*
if(!cert2) {
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
@@ -1359,7 +1364,7 @@
xmlFree(issuerName);
return(-1);
}
-
+ */
xmlFree(issuerSerial);
xmlFree(issuerName);
return(0);
@@ -1410,8 +1415,8 @@
xmlSecErrorsSafeString(xmlSecNodeX509SerialNumber));
return(-1);
}
-
- /* write data */
+ /*
+ //write data
if(!buf) {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
@@ -1420,9 +1425,7 @@
XMLSEC_ERRORS_NO_MESSAGE);
return(-1);
}
- xmlNodeSetContent(issuerNameNode, buf);
- xmlFree(buf);
-
+
if(!buf) {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,
@@ -1431,6 +1434,8 @@
XMLSEC_ERRORS_NO_MESSAGE);
return(-1);
}
+ */
+ xmlNodeSetContent(issuerNameNode, buf);
xmlNodeSetContent(issuerNumberNode, buf);
xmlFree(buf);
@@ -1445,8 +1450,6 @@
xmlSecKeyDataStorePtr x509Store;
xmlChar* ski;
X509* cert;
- X509* cert2 = NULL;
- int ret;
xmlSecAssert2(xmlSecKeyDataCheckId(data, xmlSecSymbianCryptoKeyDataX509Id), -1);
xmlSecAssert2(node, -1);
@@ -1482,8 +1485,6 @@
cert = xmlSecSymbianCryptoX509StoreFindCert(x509Store, NULL, NULL, NULL, ski, keyInfoCtx);
if(!cert){
- xmlFree(ski);
-
if((keyInfoCtx->flags & XMLSEC_KEYINFO_FLAGS_X509DATA_STOP_ON_UNKNOWN_CERT) != 0) {
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
@@ -1491,11 +1492,15 @@
XMLSEC_ERRORS_R_CERT_NOT_FOUND,
"ski=%s",
xmlSecErrorsSafeString(ski));
+ xmlFree(ski);
return(-1);
}
+ xmlFree(ski);
return(0);
}
-
+
+//dead error condition
+/*
if(!cert2) {
xmlSecError(XMLSEC_ERRORS_HERE,
xmlSecErrorsSafeString(xmlSecKeyDataGetName(data)),
@@ -1505,7 +1510,7 @@
xmlFree(ski);
return(-1);
}
-
+
ret = xmlSecSymbianCryptoKeyDataX509AdoptCert(data, cert2);
if(ret < 0) {
xmlSecError(XMLSEC_ERRORS_HERE,
@@ -1516,6 +1521,7 @@
xmlFree(ski);
return(-1);
}
+ */
xmlFree(ski);
return(0);
@@ -2440,8 +2446,10 @@
"xmlSecSymbianCryptoKeyDataX509VerifyAndExtractKey",
XMLSEC_ERRORS_R_XMLSEC_FAILED,
XMLSEC_ERRORS_NO_MESSAGE);
+ X509_free(cert);
return(-1);
}
+ X509_free(cert);
return(0);
}
--- a/xmlsecurityengine/xmlsecwrapper/src/xmlsecwinit.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlsecwrapper/src/xmlsecwinit.cpp Mon May 03 14:14:40 2010 +0300
@@ -59,9 +59,10 @@
// UnSet global state for dll
// ---------------------------------------------------------------------------
//
-void XmlSecUnsetTlsD( void* aGlobalState )
+void XmlSecUnsetTlsDL( void* aGlobalState )
{
- delete aGlobalState;
+ CleanupStack::PushL(aGlobalState);
+ CleanupStack::PopAndDestroy(aGlobalState);
Dll::SetTls( NULL );
}
@@ -79,7 +80,7 @@
}
if(gs->iUserCount == 0)
{
- CleanupStack::PushL( TCleanupItem( XmlSecUnsetTlsD, gs ) );
+ CleanupStack::PushL( TCleanupItem( XmlSecUnsetTlsDL, gs ) );
XmlEngineAttachL();
RXmlEngDOMImplementation dom;
--- a/xmlsecurityengine/xmlsecwrapper/src/xmlsecwsign.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsecurityengine/xmlsecwrapper/src/xmlsecwsign.cpp Mon May 03 14:14:40 2010 +0300
@@ -214,11 +214,13 @@
// Reset template settings
// ---------------------------------------------------------------------------
//
-void TemplateCleanup(TAny* aPref)
+void TemplateCleanupL(TAny* aPref)
{
+
if(aPref)
{
- delete aPref;
+ CleanupStack::PushL(aPref);
+ CleanupStack::PopAndDestroy(aPref);
xmlSetPrefix(NULL);
}
xmlSetNewLineFlag(1);
@@ -625,7 +627,7 @@
pref = (unsigned char*) XmlEngXmlCharFromDes8L(aPref);
xmlSetPrefix(pref);
}
- CleanupStack::PushL(TCleanupItem(Sign::TemplateCleanup,(TAny*)pref));
+ CleanupStack::PushL(TCleanupItem(Sign::TemplateCleanupL,(TAny*)pref));
xmlNodePtr signNode = NULL;
xmlNodePtr refNode = NULL;
--- a/xmlsrv_plat/xml_signature_api/tsrc/src/xmlsecsigntesterblocks.cpp Fri Apr 16 16:57:34 2010 +0300
+++ b/xmlsrv_plat/xml_signature_api/tsrc/src/xmlsecsigntesterblocks.cpp Mon May 03 14:14:40 2010 +0300
@@ -965,7 +965,7 @@
//
TInt CXmlSecSignTester::CXmlSecSign_CreateTemplateL_2L( )
{
- _LIT8(t8,"ex:outer");
+
_LIT8(t9,"dsig:Signature");
_LIT8(pIdName,"id");
_LIT8(pIdVal,"http://exem.com");