# HG changeset patch
# User Oleg Oshmyan <chortos@inbox.lv>
# Date 1355180888 -7200
# Node ID 478d4217fe0381a1bffc636d7e823dba41cc0f25
# Parent  2798cbebd83a02d849bf00c79420102549740ddd
Created a branch for the 2.04 release

diff -r 2798cbebd83a -r 478d4217fe03 setup-exe.py
--- a/setup-exe.py	Tue Dec 11 02:48:00 2012 +0200
+++ b/setup-exe.py	Tue Dec 11 01:08:08 2012 +0200
@@ -30,7 +30,7 @@
 os.rename('upreckon/unix.py', 'upreckon/unix.py~')
 try:
 	setup(name='Upreckon',
-	      version='2.04.0dev',
+	      version='2.04.0',
 	      author='Oleg Oshmyan',
 	      author_email='chortos@inbox.lv',
 	      url='http://chortos.selfip.net/~astiob/upreckon/',
diff -r 2798cbebd83a -r 478d4217fe03 setup.py
--- a/setup.py	Tue Dec 11 02:48:00 2012 +0200
+++ b/setup.py	Tue Dec 11 01:08:08 2012 +0200
@@ -28,7 +28,7 @@
 	ext_modules = []
 
 setup(name='upreckon',
-      version='2.04.0dev',
+      version='2.04.0',
       author='Oleg Oshmyan',
       author_email='chortos@inbox.lv',
       url='http://chortos.selfip.net/~astiob/upreckon/',
diff -r 2798cbebd83a -r 478d4217fe03 upreckon/upreckon-vcs
--- a/upreckon/upreckon-vcs	Tue Dec 11 02:48:00 2012 +0200
+++ b/upreckon/upreckon-vcs	Tue Dec 11 01:08:08 2012 +0200
@@ -11,10 +11,8 @@
 parser.add_option('-1', dest='legacy', action='store_true', default=False, help='handle configuration files in a way more compatible with test.py 1.x')
 parser.add_option('-p', '--problem', dest='problems', metavar='PROBLEM', action='append', help='test only the PROBLEM (this option can be specified more than once with different problem names, all of which will be tested)')
 parser.add_option('--list-problems', action='store_true', default=False, help='just list all problem names')
-parser.add_option('-c', '--cleanup', dest='cleanup', action='store_true', default=False, help='delete the copies of input/output files and exit')
-parser.add_option('-m', '--copy-io', dest='copyonly', action='store_true', default=False, help='create a copy of the input/output files of the last test case for manual testing and exit')
 parser.add_option('-x', '--auto-exit', dest='pause', action='store_false', default=True, help='do not wait for a key to be pressed after finishing testing')
-parser.add_option('-s', '--save-io', dest='erase', action='store_false', default=True, help='do not delete the copies of input/output files after the last test case; create copies of input files and store output in files even if the solution uses standard I/O; delete the stored input/output files if the solution uses standard I/O and the -c/--cleanup option is specified')
+parser.add_option('-s', '--save-io', dest='erase', action='store_false', default=True, help='do not delete the copies of input/output files after the last test case; create copies of input files and store output in files even if the solution uses standard I/O')
 parser.add_option('-k', '--skim', action='store_true', default=False, help='skip test groups as soon as one test case is failed')
 parser.add_option('--no-time-limits', dest='no_maxtime', action='store_true', default=False, help='disable all time limits')
 
@@ -76,24 +74,16 @@
 	for taskname in options.problems or globalconf.problems:
 		problem = Problem(taskname)
 		
-		if ntasks and not (options.cleanup or options.copyonly): say()
+		if ntasks: say()
 		if shouldprintnames: say(taskname)
 		
-		if options.cleanup:
-			problem.cleanup()
-		elif options.copyonly:
-			problem.copytestdata()
-		else:
-			real, max = problem.test()
+		real, max = problem.test()
 		
 		ntasks += 1
 		nfulltasks += real == max
 		realscore += real
 		maxscore += max
 	
-	if options.cleanup or options.copyonly:
-		sys.exit()
-	
 	if ntasks != 1:
 		say()
 		say('Grand total: %g/%g weighted points; %d/%d problems solved fully' % (realscore, maxscore, nfulltasks, ntasks))