007bed30d1
* ant-python3.patch - Update to 1.9.10: * Various fixes for java10 * Small fixes all around - Remove merged patch reproducible.patch - Add patch to run scripts with python3 if applicable bsc#1082202: * ant-python3.patch - Update to 1.9.10: * Various fixes for java10 * Small fixes all around - Remove merged patch reproducible.patch - Add patch to run scripts with python3 if applicable bsc#1082202: * ant-python3.patch - Update to 1.9.10: * Various fixes for java10 * Small fixes all around - Remove merged patch reproducible.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=108
87 lines
3.0 KiB
Diff
87 lines
3.0 KiB
Diff
Index: apache-ant-1.9.10/src/script/runant.py
|
|
===================================================================
|
|
--- apache-ant-1.9.10.orig/src/script/runant.py
|
|
+++ apache-ant-1.9.10/src/script/runant.py
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/python
|
|
+#!/usr/bin/python3
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed with
|
|
# this work for additional information regarding copyright ownership.
|
|
@@ -36,7 +36,7 @@ debug = 0
|
|
#######################################################################
|
|
|
|
# If ANT_HOME is not set default to script's parent directory
|
|
-if os.environ.has_key('ANT_HOME'):
|
|
+if 'ANT_HOME' in os.environ:
|
|
ANT_HOME = os.environ['ANT_HOME']
|
|
else:
|
|
ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
|
|
@@ -46,17 +46,17 @@ ANT_LIB = os.path.join(ANT_HOME, 'lib')
|
|
|
|
# set JAVACMD (check variables JAVACMD and JAVA_HOME)
|
|
JAVACMD = None
|
|
-if not os.environ.has_key('JAVACMD'):
|
|
- if os.environ.has_key('JAVA_HOME'):
|
|
+if 'JAVACMD' not in os.environ:
|
|
+ if 'JAVA_HOME' in os.environ:
|
|
if not os.path.exists(os.environ['JAVA_HOME']):
|
|
- print "Warning: JAVA_HOME is not defined correctly."
|
|
+ print("Warning: JAVA_HOME is not defined correctly.")
|
|
else:
|
|
JAVA_HOME = os.environ['JAVA_HOME']
|
|
while JAVA_HOME[0] == JAVA_HOME[-1] == "\"":
|
|
JAVA_HOME = JAVA_HOME[1:-1]
|
|
JAVACMD = os.path.join(JAVA_HOME, 'bin', 'java')
|
|
else:
|
|
- print "Warning: JAVA_HOME not set."
|
|
+ print("Warning: JAVA_HOME not set.")
|
|
else:
|
|
JAVACMD = os.environ['JAVACMD']
|
|
if not JAVACMD:
|
|
@@ -64,28 +64,28 @@ if not JAVACMD:
|
|
|
|
launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar')
|
|
if not os.path.exists(launcher_jar):
|
|
- print 'Warning: Unable to locate ant-launcher.jar. Expected to find it in %s' % \
|
|
- ANT_LIB
|
|
+ print('Warning: Unable to locate ant-launcher.jar. Expected to find it in %s' % \
|
|
+ ANT_LIB)
|
|
|
|
# Build up standard classpath (LOCALCLASSPATH)
|
|
LOCALCLASSPATH = launcher_jar
|
|
-if os.environ.has_key('LOCALCLASSPATH'):
|
|
+if 'LOCALCLASSPATH' in os.environ:
|
|
LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH']
|
|
|
|
ANT_OPTS = ""
|
|
-if os.environ.has_key('ANT_OPTS'):
|
|
+if 'ANT_OPTS' in os.environ:
|
|
ANT_OPTS = os.environ['ANT_OPTS']
|
|
|
|
OPTS = ""
|
|
-if os.environ.has_key('JIKESPATH'):
|
|
+if 'JIKESPATH' in os.environ:
|
|
OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH']
|
|
|
|
ANT_ARGS = ""
|
|
-if os.environ.has_key('ANT_ARGS'):
|
|
+if 'ANT_ARGS' in os.environ:
|
|
ANT_ARGS = os.environ['ANT_ARGS']
|
|
|
|
CLASSPATH = ""
|
|
-if os.environ.has_key('CLASSPATH'):
|
|
+if 'CLASSPATH' in os.environ:
|
|
CLASSPATH = "-lib " + os.environ['CLASSPATH']
|
|
|
|
while JAVACMD[0] == JAVACMD[-1] == "\"":
|
|
@@ -98,7 +98,7 @@ cmdline = ('"%s" %s -classpath %s -Dant.
|
|
CLASSPATH, string.join(sys.argv[1:], ' '))
|
|
|
|
if debug:
|
|
- print '\n%s\n\n' % (cmdline)
|
|
+ print('\n%s\n\n' % (cmdline))
|
|
sys.stdout.flush()
|
|
|
|
# Run the biniou!
|