Revision: 4523
Author: pekka.klarck
Date: Mon Dec 20 05:21:09 2010
Log: cannot have main block in version.py when running it through execfile
in setup.py
http://code.google.com/p/robotframework/source/detail?r=4523
Modified:
/trunk/package.py
/trunk/src/robot/version.py
=======================================
--- /trunk/package.py Wed Dec 1 23:59:49 2010
+++ /trunk/package.py Mon Dec 20 05:21:09 2010
@@ -1,19 +1,5 @@
#!/usr/bin/env python
-# Copyright 2008-2010 Nokia Siemens Networks Oyj
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
"""Packaging script for Robot Framework
Usage: package.py command version_number [release_tag]
@@ -95,9 +81,6 @@
if sys.platform == 'cli':
return 'IronPython'
return 'Python'
-
-if __name__ == '__main__':
- print get_version(*sys.argv[1:])
"""
def sdist(*version_info):
=======================================
--- /trunk/src/robot/version.py Wed Dec 1 05:22:18 2010
+++ /trunk/src/robot/version.py Mon Dec 20 05:21:09 2010
@@ -3,8 +3,8 @@
import sys
VERSION = 'trunk'
-RELEASE = '20101201'
-TIMESTAMP = '20101201-152028'
+RELEASE = '20101220'
+TIMESTAMP = '20101220-151655'
def get_version(sep=' '):
if RELEASE == 'final':
@@ -23,6 +23,3 @@
if sys.platform == 'cli':
return 'IronPython'
return 'Python'
-
-if __name__ == '__main__':
- print get_version(*sys.argv[1:])
