3 new revisions:
Revision: 4b42aa60f9c6
Author: Mikko Korpela <[email protected]>
Date: Fri Jun 10 01:11:44 2011
Log: Update SpecRunner refs
http://code.google.com/p/robotframework/source/detail?r=4b42aa60f9c6
Revision: 8e22348bb9ca
Author: Mikko Korpela <[email protected]>
Date: Fri Jun 10 03:08:24 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=8e22348bb9ca
Revision: da319daf7696
Author: Mikko Korpela <[email protected]>
Date: Fri Jun 10 03:15:50 2011
Log: versions.txt: added jquery.tml rev + jsxcompressor location
http://code.google.com/p/robotframework/source/detail?r=da319daf7696
==============================================================================
Revision: 4b42aa60f9c6
Author: Mikko Korpela <[email protected]>
Date: Fri Jun 10 01:11:44 2011
Log: Update SpecRunner refs
http://code.google.com/p/robotframework/source/detail?r=4b42aa60f9c6
Modified:
/src/robot/webcontent/SpecRunner.html
=======================================
--- /src/robot/webcontent/SpecRunner.html Tue May 31 11:53:01 2011
+++ /src/robot/webcontent/SpecRunner.html Fri Jun 10 01:11:44 2011
@@ -8,10 +8,10 @@
<script type="text/javascript"
src="lib/jasmine-1.0.2/jasmine-html.js"></script>
<!-- include source files here... -->
- <script type="text/javascript" src="js/jsxcompressor.js"></script>
- <script type="text/javascript" src="js/model.js"></script>
- <script type="text/javascript" src="js/testdata.js"></script>
- <script type="text/javascript" src="js/util.js"></script>
+ <script type="text/javascript" src="lib/jsxcompressor.js"></script>
+ <script type="text/javascript" src="model.js"></script>
+ <script type="text/javascript" src="testdata.js"></script>
+ <script type="text/javascript" src="util.js"></script>
<!-- include spec files here... -->
<script type="text/javascript" src="spec/ParsingSpec.js"></script>
==============================================================================
Revision: 8e22348bb9ca
Author: Mikko Korpela <[email protected]>
Date: Fri Jun 10 03:08:24 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=8e22348bb9ca
==============================================================================
Revision: da319daf7696
Author: Mikko Korpela <[email protected]>
Date: Fri Jun 10 03:15:50 2011
Log: versions.txt: added jquery.tml rev + jsxcompressor location
http://code.google.com/p/robotframework/source/detail?r=da319daf7696
Modified:
/setup.py
/src/robot/webcontent/lib/versions.txt
=======================================
--- /setup.py Sun May 29 22:33:49 2011
+++ /setup.py Fri Jun 10 03:15:50 2011
@@ -28,7 +28,7 @@
PACKAGES = ['robot', 'robot.api', 'robot.common', 'robot.conf',
'robot.libraries', 'robot.output', 'robot.parsing',
'robot.serializing', 'robot.running', 'robot.utils',
- 'robot.variables', 'robot.webcontent', 'robot.webcontent.js']
+ 'robot.variables', 'robot.webcontent', 'robot.webcontent.lib']
SCRIPT_NAMES = ['pybot', 'jybot', 'rebot']
if os.name == 'java':
SCRIPT_NAMES.remove('pybot')
@@ -60,7 +60,7 @@
platforms = 'any',
classifiers = CLASSIFIERS.splitlines(),
package_dir = {'': 'src'},
- package_data = {'robot':
['webcontent/*.html', 'webcontent/js/*.js']},
+ package_data = {'robot':
['webcontent/*.html', 'webcontent/lib/*.js']},
packages = PACKAGES,
scripts = inst_scripts,
)
=======================================
--- /src/robot/webcontent/lib/versions.txt Fri Jun 10 02:13:08 2011
+++ /src/robot/webcontent/lib/versions.txt Fri Jun 10 03:15:50 2011
@@ -5,5 +5,11 @@
jquery.tmpl
-----------
-unreleased version updated latest on 8th June 2011
+unreleased version updated latest on 8th June 2011 (revision
76c379effa656005e595)
https://github.com/jquery/jquery-tmpl
+
+
+jsxcompressor.js
+-----------
+from http://jsxgraph.uni-bayreuth.de/distrib/jsxcompressor.zip
+
