catchup merge.
--- a/clone_packages/clone_all_packages.pl Wed Sep 23 17:41:26 2009 +0100
+++ b/clone_packages/clone_all_packages.pl Mon Oct 05 18:47:45 2009 +0100
@@ -290,6 +290,7 @@
foreach my $line (<PKG_LIST>)
{
chomp($line);
+
$line =~ s/\015//g; # remove CR, in case we are processing Windows text files on Linux
my $revision; # set when processing build-info listings
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clone_packages/parse_clone_all.pl Mon Oct 05 18:47:45 2009 +0100
@@ -0,0 +1,87 @@
+#! perl
+
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "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:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Perl script to summarise output from clone_all_package.pl
+
+
+@all = <>;
+
+my $repo;
+my $newrepo = 0;
+my $errors = 0;
+my $summary = 0;
+my $retries = 0;
+foreach my $line (@all)
+{
+ if($summary)
+ {
+ # if we are in the summary section then just echo all lines out
+ # this should be a list of all the packages with errors
+ print "$line\n";
+ }
+ #save package name
+ # e.g new package "Cloning compatanaapps from sfl/MCL/sftools/ana/compatanaapps..."
+ # e.g. existing package "Updating helix from sfl/MCL/sf/mw/helix..."
+ # e.g. with -exec option "Processing sfl/FCL/interim/auxiliary_tools/AgileBrowser."
+ elsif ($line =~ m/Cloning (.*?)from(.*)$/)
+ {
+ $repo = $2;
+ $newrepo = 1;
+ $retries =0;
+ }
+ elsif ($line =~ m/Updating (.*?)from(.*)$/)
+ {
+ $repo = $2;
+ $newrepo = 0;
+ $retries =0;
+ }
+
+ #
+ # Capture number of changes, should be line like one of the following
+ # e.g. "added 4 changesets with 718 changes to 690 files"
+ # e.g. "no changes found"
+ elsif ($line =~ m/added (.*?)changesets with(.*)$/)
+ {
+ print "\n$repo\t added $1 chamgesets";
+ print "\t retries $retries";
+ print "\t** NEW" if ($newrepo);
+ }
+
+ if($line =~ m/abort:/)
+ {
+ $retries++;
+ }
+
+ # Process the summary section
+ # e.g. "------------"
+ # e.g. "Processed 22 packages, of which 0 reported errors"
+ if ($line =~ m/Processed (.*?)packages, of which(.*?)reported errors/)
+ {
+ print "\n-------------------------------\n";
+ print "\n Summary: Processed $1 : Errors $2\n";
+ $errors= $2;
+ $summary = 1;
+ }
+
+}
+if ($errors > 0)
+{
+ print "\nexit with error\n";
+ exit 1;
+}
+else
+{
+ print "\nexit success\n";
+ exit 0;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clone_packages/patch_hgrc.py Mon Oct 05 18:47:45 2009 +0100
@@ -0,0 +1,93 @@
+#! /usr/bin/python
+# Copyright (c) 2009 Symbian Foundation Ltd
+# This component and the accompanying materials are made available
+# under the terms of the License "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:
+# Symbian Foundation Ltd - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Python script to manipulate the hgrc files
+
+from ConfigParser import *
+import optparse
+import os
+import sys
+import re
+
+verbose = False;
+credentials= re.compile(r"//.*?@")
+
+def strip_credentials(hgrc):
+ """ Remove the user credentials from the default path in hgrc file"""
+ # e.g.
+ # before http://user:pass@prod.foundationhost.org/sfl/MCL/sf/os/boardsupport/
+ # after http://prod.foundationhost.org/sfl/MCL/sf/os/boardsupport/
+ if hgrc.has_section('paths'):
+ if (verbose): print hgrc.items('paths')
+ defpath = hgrc.get('paths', 'default')
+ newpath = credentials.sub(r"//",defpath)
+ #print "new path ", newpath
+ hgrc.set('paths', 'default',newpath)
+ elif (verbose):
+ if (verbose): print "No [paths] section\n"
+
+def add_hooks(hgrc):
+ if (hgrc.has_section('hooks')):
+ # unpdate
+ if (verbose) : print 'updating existing hooks section'
+ else:
+ if (verbose) : print 'adding hooks section'
+ hgrc.add_section('hooks')
+ # add example (windows only) hook to block local commit to the repo
+ hgrc.set('hooks', 'pretxncommit.abort', 'exit /b 1')
+ hgrc.set('hooks', 'pretxncommit.message', 'ERROR: This is a read only repo')
+
+
+def write_hgrcfile(hgrc,fout):
+ fnewini = file(fout,'w')
+ hgrc.write(fnewini)
+ fnewini.close()
+
+def main():
+ global verbose
+ usage = "usage: %prog [options]"
+ try:
+ parser = optparse.OptionParser(usage)
+ parser.set_defaults(filename=".hg/hgrc")
+ parser.add_option("-f","--file", dest="filename", default=".hg/hgrc",metavar="FILE" , help='file to be patched')
+ parser.add_option("-v", action="store_true",dest="verbose",default=False, help='Verbose trace information')
+ (options, args) = parser.parse_args()
+ except:
+ parser.print_help()
+ sys.exit(1)
+
+ f = os.path.abspath(options.filename)
+ if(options.verbose):
+ verbose = True
+ print f
+ if(os.path.isfile(f)):
+ try:
+ #conff = file(f,'w') #open file f for read/write
+ hgrcfile = RawConfigParser()
+ hgrcfile.read(f)
+ if (verbose):
+ print hgrcfile.sections()
+ except:
+ print 'Something failed opening the configuration file'
+ sys.exit(2)
+ else:
+ print "Configuration file does not exist? ",f
+ sys.exit(2)
+
+ strip_credentials(hgrcfile)
+ add_hooks(hgrcfile)
+ write_hgrcfile(hgrcfile,f)
+
+
+if __name__ == "__main__":
+ main()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clone_packages/sf_fcl_packages.txt Mon Oct 05 18:47:45 2009 +0100
@@ -0,0 +1,128 @@
+https://developer.symbian.org/sfl/FCL/sf/adaptation/stubs
+https://developer.symbian.org/sfl/FCL/sf/app/camera
+https://developer.symbian.org/sfl/FCL/sf/app/commonemail
+https://developer.symbian.org/sfl/FCL/sf/app/conntools
+https://developer.symbian.org/sfl/FCL/sf/app/contacts
+https://developer.symbian.org/sfl/FCL/sf/app/contentcontrol
+https://developer.symbian.org/sfl/FCL/sf/app/conversations
+https://developer.symbian.org/sfl/FCL/sf/app/devicecontrol
+https://developer.symbian.org/sfl/FCL/sf/app/dictionary
+https://developer.symbian.org/sfl/FCL/sf/app/files
+https://developer.symbian.org/sfl/FCL/sf/app/gallery
+https://developer.symbian.org/sfl/FCL/sf/app/graphicsuis
+https://developer.symbian.org/sfl/FCL/sf/app/helps
+https://developer.symbian.org/sfl/FCL/sf/app/homescreen
+https://developer.symbian.org/sfl/FCL/sf/app/im
+https://developer.symbian.org/sfl/FCL/sf/app/imgeditor
+https://developer.symbian.org/sfl/FCL/sf/app/imgvieweruis
+https://developer.symbian.org/sfl/FCL/sf/app/iptelephony
+https://developer.symbian.org/sfl/FCL/sf/app/java
+https://developer.symbian.org/sfl/FCL/sf/app/location
+https://developer.symbian.org/sfl/FCL/sf/app/messaging
+https://developer.symbian.org/sfl/FCL/sf/app/mmsharinguis
+https://developer.symbian.org/sfl/FCL/sf/app/musicplayer
+https://developer.symbian.org/sfl/FCL/sf/app/organizer
+https://developer.symbian.org/sfl/FCL/sf/app/phone
+https://developer.symbian.org/sfl/FCL/sf/app/photos
+https://developer.symbian.org/sfl/FCL/sf/app/poc
+https://developer.symbian.org/sfl/FCL/sf/app/printing
+https://developer.symbian.org/sfl/FCL/sf/app/profile
+https://developer.symbian.org/sfl/FCL/sf/app/radio
+https://developer.symbian.org/sfl/FCL/sf/app/screensaver
+https://developer.symbian.org/sfl/FCL/sf/app/settingsuis
+https://developer.symbian.org/sfl/FCL/sf/app/speechsrv
+https://developer.symbian.org/sfl/FCL/sf/app/techview
+https://developer.symbian.org/sfl/FCL/sf/app/utils
+https://developer.symbian.org/sfl/FCL/sf/app/videocenter
+https://developer.symbian.org/sfl/FCL/sf/app/videoeditor
+https://developer.symbian.org/sfl/FCL/sf/app/videoplayer
+https://developer.symbian.org/sfl/FCL/sf/app/videotelephony
+https://developer.symbian.org/sfl/FCL/sf/app/voicerec
+https://developer.symbian.org/sfl/FCL/sf/mw/accesssec
+https://developer.symbian.org/sfl/FCL/sf/mw/appinstall
+https://developer.symbian.org/sfl/FCL/sf/mw/appsupport
+https://developer.symbian.org/sfl/FCL/sf/mw/camerasrv
+https://developer.symbian.org/sfl/FCL/sf/mw/classicui
+https://developer.symbian.org/sfl/FCL/sf/mw/dlnasrv
+https://developer.symbian.org/sfl/FCL/sf/mw/drm
+https://developer.symbian.org/sfl/FCL/sf/mw/hapticsservices
+https://developer.symbian.org/sfl/FCL/sf/mw/helix
+https://developer.symbian.org/sfl/FCL/sf/mw/homescreensrv
+https://developer.symbian.org/sfl/FCL/sf/mw/imghandling
+https://developer.symbian.org/sfl/FCL/sf/mw/imsrv
+https://developer.symbian.org/sfl/FCL/sf/mw/inputmethods
+https://developer.symbian.org/sfl/FCL/sf/mw/ipappprotocols
+https://developer.symbian.org/sfl/FCL/sf/mw/ipappsrv
+https://developer.symbian.org/sfl/FCL/sf/mw/ipconnmgmt
+https://developer.symbian.org/sfl/FCL/sf/mw/legacypresence
+https://developer.symbian.org/sfl/FCL/sf/mw/locationsrv
+https://developer.symbian.org/sfl/FCL/sf/mw/mds
+https://developer.symbian.org/sfl/FCL/sf/mw/messagingmw
+https://developer.symbian.org/sfl/FCL/sf/mw/metadatasrv
+https://developer.symbian.org/sfl/FCL/sf/mw/mmappfw
+https://developer.symbian.org/sfl/FCL/sf/mw/mmmw
+https://developer.symbian.org/sfl/FCL/sf/mw/mmuifw
+https://developer.symbian.org/sfl/FCL/sf/mw/netprotocols
+https://developer.symbian.org/sfl/FCL/sf/mw/networkingdm
+https://developer.symbian.org/sfl/FCL/sf/mw/opensrv
+https://developer.symbian.org/sfl/FCL/sf/mw/phonesrv
+https://developer.symbian.org/sfl/FCL/sf/mw/remoteconn
+https://developer.symbian.org/sfl/FCL/sf/mw/remotemgmt
+https://developer.symbian.org/sfl/FCL/sf/mw/remotestorage
+https://developer.symbian.org/sfl/FCL/sf/mw/securitysrv
+https://developer.symbian.org/sfl/FCL/sf/mw/shortlinkconn
+https://developer.symbian.org/sfl/FCL/sf/mw/svgt
+https://developer.symbian.org/sfl/FCL/sf/mw/uiaccelerator
+https://developer.symbian.org/sfl/FCL/sf/mw/uiresources
+https://developer.symbian.org/sfl/FCL/sf/mw/uitools
+https://developer.symbian.org/sfl/FCL/sf/mw/videoutils
+https://developer.symbian.org/sfl/FCL/sf/mw/vpnclient
+https://developer.symbian.org/sfl/FCL/sf/mw/websrv
+https://developer.symbian.org/sfl/FCL/sf/mw/wirelessacc
+https://developer.symbian.org/sfl/FCL/sf/os/boardsupport
+https://developer.symbian.org/sfl/FCL/sf/os/buildtools
+https://developer.symbian.org/sfl/FCL/sf/os/cellularsrv
+https://developer.symbian.org/sfl/FCL/sf/os/commsfw
+https://developer.symbian.org/sfl/FCL/sf/os/deviceplatformrelease
+https://developer.symbian.org/sfl/FCL/sf/os/devicesrv
+https://developer.symbian.org/sfl/FCL/sf/os/graphics
+https://developer.symbian.org/sfl/FCL/sf/os/imagingext
+https://developer.symbian.org/sfl/FCL/sf/os/kernelhwsrv
+https://developer.symbian.org/sfl/FCL/sf/os/lbs
+https://developer.symbian.org/sfl/FCL/sf/os/mm
+https://developer.symbian.org/sfl/FCL/sf/os/networkingsrv
+https://developer.symbian.org/sfl/FCL/sf/os/ossrv
+https://developer.symbian.org/sfl/FCL/sf/os/persistentdata
+https://developer.symbian.org/sfl/FCL/sf/os/security
+https://developer.symbian.org/sfl/FCL/sf/os/shortlinksrv
+https://developer.symbian.org/sfl/FCL/sf/os/textandloc
+https://developer.symbian.org/sfl/FCL/sf/os/unref
+https://developer.symbian.org/sfl/FCL/sf/os/wlan
+https://developer.symbian.org/sfl/FCL/sf/os/xmlsrv
+https://developer.symbian.org/sfl/FCL/sf/ostools/osrndtools
+https://developer.symbian.org/sfl/FCL/sf/tools/build_s60
+https://developer.symbian.org/sfl/FCL/sf/tools/buildplatforms
+https://developer.symbian.org/sfl/FCL/sf/tools/homescreentools
+https://developer.symbian.org/sfl/FCL/sf/tools/makefile_templates
+https://developer.symbian.org/sfl/FCL/sf/tools/platformtools
+https://developer.symbian.org/sfl/FCL/sf/tools/rndtools
+https://developer.symbian.org/sfl/FCL/sf/tools/swconfigtools
+https://developer.symbian.org/oss/FCL/sf/app/webuis
+https://developer.symbian.org/oss/FCL/sf/mw/serviceapi
+https://developer.symbian.org/oss/FCL/sf/mw/serviceapifw
+https://developer.symbian.org/oss/FCL/sf/mw/web
+https://developer.symbian.org/oss/FCL/sf/os/security
+https://developer.symbian.org/oss/FCL/interim/QEMU
+https://developer.symbian.org/oss/FCL/interim/contrib/QtExamples
+https://developer.symbian.org/oss/FCL/interim/contrib/WidgetExamples
+https://developer.symbian.org/oss/FCL/interim/fbf/bootstrap
+https://developer.symbian.org/oss/FCL/interim/fbf/configs/default
+https://developer.symbian.org/oss/FCL/interim/fbf/configs/pkgbuild
+https://developer.symbian.org/oss/FCL/interim/fbf/projects/deprecated/packages/serviceapi
+https://developer.symbian.org/oss/FCL/interim/fbf/projects/deprecated/packages/serviceapifw
+https://developer.symbian.org/oss/FCL/interim/fbf/projects/deprecated/packages/web
+https://developer.symbian.org/oss/FCL/interim/fbf/projects/deprecated/packages/webuis
+https://developer.symbian.org/oss/FCL/interim/fbf/projects/packages
+https://developer.symbian.org/oss/FCL/interim/fbf/projects/platforms
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/clone_packages/sftools_fcl_packages.txt Mon Oct 05 18:47:45 2009 +0100
@@ -0,0 +1,31 @@
+https://developer.symbian.org/sfl/FCL/sftools/ana/compatanaapps
+https://developer.symbian.org/sfl/FCL/sftools/ana/compatanamdw
+https://developer.symbian.org/sfl/FCL/sftools/ana/dynaanaapps
+https://developer.symbian.org/sfl/FCL/sftools/ana/dynaanactrlandcptr
+https://developer.symbian.org/sfl/FCL/sftools/ana/dynaanamdw/analysistools
+https://developer.symbian.org/sfl/FCL/sftools/ana/dynaanamdw/crashmdw
+https://developer.symbian.org/sfl/FCL/sftools/ana/staticanaapps
+https://developer.symbian.org/sfl/FCL/sftools/ana/staticanamdw
+https://developer.symbian.org/sfl/FCL/sftools/ana/testcreationandmgmt
+https://developer.symbian.org/sfl/FCL/sftools/ana/testexec
+https://developer.symbian.org/sfl/FCL/sftools/ana/testfw
+https://developer.symbian.org/sfl/FCL/sftools/depl/sdkcreationmdw/packaging
+https://developer.symbian.org/sfl/FCL/sftools/depl/swconfigapps/configtools
+https://developer.symbian.org/sfl/FCL/sftools/depl/swconfigapps/swmgnttoolsguides
+https://developer.symbian.org/sfl/FCL/sftools/depl/swconfigapps/sysmodeltools
+https://developer.symbian.org/sfl/FCL/sftools/depl/swconfigmdw
+https://developer.symbian.org/sfl/FCL/sftools/dev/build
+https://developer.symbian.org/sfl/FCL/sftools/dev/dbgsrvsmdw
+https://developer.symbian.org/sfl/FCL/sftools/dev/devicedbgsrvs
+https://developer.symbian.org/sfl/FCL/sftools/dev/ide/carbidecppplugins
+https://developer.symbian.org/sfl/FCL/sftools/dev/iss
+https://developer.symbian.org/sfl/FCL/sftools/dev/ui
+https://developer.symbian.org/oss/FCL/sftools/dev/eclipseenv/buildlayout34
+https://developer.symbian.org/oss/FCL/sftools/dev/eclipseenv/eclipse
+https://developer.symbian.org/oss/FCL/sftools/dev/hostenv/compilationtoolchains
+https://developer.symbian.org/oss/FCL/sftools/dev/hostenv/cpptoolsplat
+https://developer.symbian.org/oss/FCL/sftools/dev/hostenv/dist
+https://developer.symbian.org/oss/FCL/sftools/dev/hostenv/javatoolsplat
+https://developer.symbian.org/oss/FCL/sftools/dev/hostenv/makeng
+https://developer.symbian.org/oss/FCL/sftools/dev/hostenv/pythontoolsplat
+https://developer.symbian.org/oss/FCL/sftools/dev/ide/carbidecpp
--- a/williamr/convert_to_eula.pl Wed Sep 23 17:41:26 2009 +0100
+++ b/williamr/convert_to_eula.pl Mon Oct 05 18:47:45 2009 +0100
@@ -26,7 +26,7 @@
'the URL "http://www.symbianfoundation.org/legal/sfl-v10.html"'
);
my @newtext = (
- 'terms of the License "Symbian Foundation License v1.0" to members and "Symbian Foundation End User License Agreement v1.0" to non-members',
+ 'terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members',
'the URL "http://www.symbianfoundation.org/legal/licencesv10.html"'
);