[robotframework] 2 new revisions pushed by pekka.klarck on 2012-03-07 10:48 GMT

[robotframework]

2 new revisions:

Revision: 67b17a040f24
Author:   Pekka Klärck
Date:     Wed Mar  7 02:47:27 2012
Log:      package.py: support craeting jar on windows
http://code.google.com/p/robotframework/source/detail?r=67b17a040f24
Revision: 11068c0aa19b
Author:   Pekka Klärck
Date:     Wed Mar  7 02:48:03 2012
Log:      Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=11068c0aa19b

==============================================================================
Revision: 67b17a040f24
Author:   Pekka Klärck
Date:     Wed Mar  7 02:47:27 2012
Log:      package.py: support craeting jar on windows
http://code.google.com/p/robotframework/source/detail?r=67b17a040f24

Modified:
 /package.py

=======================================
--- /package.py Tue Mar  6 04:19:36 2012
+++ /package.py Wed Mar  7 02:47:27 2012
@@ -217,7 +217,7 @@
                     for f in os.listdir(JAVA_SRC) if f.endswith('.java')]
     print 'Compiling %d source files' % len(source_files)
     subprocess.call(['javac', '-d',  
tmpdir, '-target', '1.5', '-source', '1.5',
-                     '-cp', jython_jar] + source_files)
+                     '-cp', jython_jar] + source_files,  
shell=os.name=='nt')

 def _create_tmpdir():
     tmpdir = join(ROOT_PATH, 'tmp-jar-dir')
@@ -259,7 +259,8 @@
     return path

 def _fill_jar(sourcedir, jarpath):
-    subprocess.call(['jar', 'cvfM', jarpath, '.'], cwd=sourcedir)
+    subprocess.call(['jar', 'cvfM', jarpath, '.'], cwd=sourcedir,
+                    shell=os.name=='nt')


 if __name__ == '__main__':

==============================================================================
Revision: 11068c0aa19b
Author:   Pekka Klärck
Date:     Wed Mar  7 02:48:03 2012
Log:      Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=11068c0aa19b