java-gobject-introspection r87 - trunk/src

[walters svn gnome org]

Author: walters
Date: Sat Oct 18 21:46:03 2008
New Revision: 87
URL: http://svn.gnome.org/viewvc/java-gobject-introspection?rev=87&view=rev

Log:
Handle JAVA_OPTS environment variable


Modified:
   trunk/src/jgir-compile-all.in
   trunk/src/jgir-compile.in

Modified: trunk/src/jgir-compile-all.in
==============================================================================
--- trunk/src/jgir-compile-all.in	(original)
+++ trunk/src/jgir-compile-all.in	Sat Oct 18 21:46:03 2008
@@ -2,6 +2,11 @@
 import os,sys,subprocess
 
 classpath="@CLASSPATH@"
+java_opts=os.environ.get('JAVA_OPTS', None)
+if java_opts:
+    java_opts = java_opts.split(' ')
+else:
+    java_opts = []
 datadirs = os.environ.get('XDG_DATA_DIRS', '/usr/share')
 nsversions = []
 for dirname in datadirs.split(':'):
@@ -15,7 +20,10 @@
         nsversions.append(base)
         print "%r" % (base, )
         ns,version = base.rsplit('-', 1)
-        subprocess.check_call(['java', '-cp', classpath, 'org.gnome.gir.compiler.CodeFactory', ns, version],
+        args = ['java']
+        args.extend(java_opts)
+        args.extend(['-cp', classpath, 'org.gnome.gir.compiler.CodeFactory', ns, version])
+        subprocess.check_call(args,
                               stdout=sys.stdout,
                               stderr=sys.stderr,
                               close_fds=True)

Modified: trunk/src/jgir-compile.in
==============================================================================
--- trunk/src/jgir-compile.in	(original)
+++ trunk/src/jgir-compile.in	Sat Oct 18 21:46:03 2008
@@ -2,7 +2,14 @@
 import os,sys,subprocess
 
 classpath="@CLASSPATH@"
-args = ['java', '-cp', classpath, 'org.gnome.gir.compiler.CodeFactory']
+java_opts=os.environ.get('JAVA_OPTS', None)
+if java_opts:
+    java_opts = java_opts.split(' ')
+else:
+    java_opts = []
+args = ['java']
+args.extend(java_opts)
+args.extend(['-cp', classpath, 'org.gnome.gir.compiler.CodeFactory'])
 args.extend(sys.argv[1:])
 subprocess.check_call(args,
                       stdout=sys.stdout,