Changeset 63939 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker/convert.py

Timestamp:

Sep 22, 2016 7:58:05 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

110825

Message:

Build/scripts (bugref:6627): Python build scripts updated to generate the same code when used with Python 2 and 3.

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/convert.py (modified) (5 diffs)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/convert.py

@@ -4 +4 @@
 # See the file LICENSE.txt for information on redistributing this software.
 
+from __future__ import print_function
 import sys
 
@@ -17 +18 @@
 apiutil.CopyrightC()
 
-print '''
+print('''
 #include "state/cr_statetypes.h"
 
@@ -28 +29 @@
     return d;
 }
-'''
+''')
 
-for k in gltypes.keys():
+for k in sorted(gltypes.keys()):
         for i in range(1,5):
-                print 'static void __convert_%s%d (GLfloat *dst, const %s *src) {' % (k,i,gltypes[k]['type'])
+                print('static void __convert_%s%d (GLfloat *dst, const %s *src) {' % (k,i,gltypes[k]['type']))
                 if k == 'd':
                   for j in range(i-1):
-                    print '\t*dst++ = (GLfloat) __read_double(src++);'
-                  print '\t*dst = (GLfloat) __read_double(src);'
+                    print('\t*dst++ = (GLfloat) __read_double(src++);')
+                  print('\t*dst = (GLfloat) __read_double(src);')
                 else:
                   for j in range(i-1):
-                    print '\t*dst++ = (GLfloat) *src++;';
-                  print '\t*dst = (GLfloat) *src;';
-                print '}\n';
+                    print('\t*dst++ = (GLfloat) *src++;')
+                  print('\t*dst = (GLfloat) *src;')
+                print('}\n')
 
 scale = {
@@ -54 +55 @@
 }
 
-for k in gltypes.keys():
+for k in sorted(gltypes.keys()):
         if k != 'f' and k != 'd' and k != 'l':
                 if k[0:1] == "N":
@@ -61 +62 @@
                         k2 = k
                 for i in range(1,5):
-                        print 'static void __convert_rescale_%s%d (GLfloat *dst, const %s *src) {' % (k,i,gltypes[k2]['type'])
+                        print('static void __convert_rescale_%s%d (GLfloat *dst, const %s *src) {' % (k,i,gltypes[k2]['type']))
                         for j in range(i-1):
-                                print '\t*dst++ = ((GLfloat) *src++) / %s;' % scale[k2]
-                        print '\t*dst = ((GLfloat) *src) / %s;' % scale[k2]
-                        print '}\n'
+                                print('\t*dst++ = ((GLfloat) *src++) / %s;' % scale[k2])
+                        print('\t*dst = ((GLfloat) *src) / %s;' % scale[k2])
+                        print('}\n')
 
-print '''
+print('''
 
 static void __convert_boolean (GLboolean *dst, const GLboolean *src) {
         *dst = *src;
 }
-'''
+''')