WARNING! Access to this system is limited to authorised users only.
Unauthorised users may be subject to prosecution.
Unauthorised access to this system is a criminal offence under Australian law (Federal Crimes Act 1914 Part VIA)
It is a criminal offence to:
(1) Obtain access to data without authority. -Penalty 2 years imprisonment.
(2) Damage, delete, alter or insert data without authority. -Penalty 10 years imprisonment.
User activity is monitored and recorded. Anyone using this system expressly consents to such monitoring and recording.

To protect your data, the CISO officer has suggested users to enable 2FA as soon as possible.
Currently 2.7% of users enabled 2FA.

Commit 367e9dca authored by John Zhang's avatar John Zhang
Browse files

Merge branch 'version-bump-jython'

parents 352c30de fe42f971
......@@ -39,7 +39,7 @@
<property name="harness-classpath" value="harness/dist/harness"/>
<target name="all" depends="source,svn-source,cvs-source,pre-build,build,complete"/>
<target name="all" depends="source,svn-source,cvs-source,hg-source,pre-build,build,complete"/>
<target name="incremental">
<property name="incremental-build" value="true"/>
......@@ -80,6 +80,19 @@
</antcall>
</target>
<target name="hg-source" if="bm-hg-url">
<condition property="fail-on-error" value="no" else="yes">
<isset property="bm-ignore-failure"/>
</condition>
<antcall target="check-hg-source">
<param name="target-dir" value="${bm-downloads}"/>
<param name="hg-url" value="${bm-hg-url}"/>
<param name="hg-revision" value="${bm-hg-revision}"/>
<param name="target-file" value="${bm-src}"/>
<param name="fail-on-error" value="${bm-fail-on-error}"/>
</antcall>
</target>
<target name="pre-build" depends="clean, init, unpack"/>
<target name="clean">
......
......@@ -11,10 +11,10 @@
<property file="dacapo.properties"/>
<property name="bm-name" value="jython"/>
<property name="bm-svn-url" value="https://jython.svn.sourceforge.net/svnroot/jython/tags/Release_2_5_2/jython"/>
<property name="bm-svn-revision" value="7206"/> <!-- 2.5.2 -->
<property name="bm-version" value="svn-${bm-svn-revision}"/>
<property name="bm-ignore-failure" value="yes" />
<property name="bm-hg-url" value="https://bitbucket.org/jython/jython"/>
<property name="bm-hg-revision" value="v2.7.1"/>
<property name="bm-version" value="hg-${bm-hg-revision}"/>
<property name="bm-ignore-failure" value="no" />
<property name="bm-src" value="${bm-name}-src-${bm-version}.tar.gz"/>
<!-- grab the jython from the jython release and benchmarks from the Python release
......@@ -24,9 +24,20 @@
-->
<property name="antlr-version" value="3.1.3"/>
<property name="asm-version" value="3.1"/>
<property name="guava-version" value="r07"/>
<property name="jline-version" value="0.9.95-SNAPSHOT"/>
<property name="asm-version" value="5.2"/>
<property name="guava-version" value="22.0-android"/>
<property name="jline-version" value="2.14.3"/>
<property name="bcpkix-version" value="jdk15on-1.57"/>
<property name="commons-compress-version" value="1.14"/>
<property name="icu4j-version" value="59_1"/>
<property name="netty-version" value="4.1.11.Final"/>
<property name="java-sizeof-version" value="0.0.5"/>
<property name="jffi-version" value="1.2.15"/>
<property name="jnr-ffi-version" value="2.1.5"/>
<property name="jnr-netdb-version" value="1.1.6"/>
<property name="jnr-posix-version" value="3.0.41"/>
<property name="jnr-constants-version" value="0.9.9"/>
<property name="xercesImpl-version" value="2.11.0"/>
<import file="../common.xml"/>
<import file="pybench.xml"/>
......@@ -44,22 +55,40 @@
<copy todir="${bm-build-dir}/src/java">
<fileset file="${bm-build-dir}/build.*"/>
</copy>
<exec executable="${ant.home}/bin/ant" dir="${bm-build-dir}" failonerror="yes">
<env key="JAVA_HOME" value="${jdk16home}"/>
</exec>
<ant dir="${bm-build-dir}"/>
</target>
<target name="jar">
<copy file="${bm-build-dir}/dist/jython-dev.jar" todir="${bm-jars}"/>
<move file="${bm-jars}/jython-dev.jar" tofile="${bm-jars}/jython.jar"/>
<copy file="${bm-build-dir}/dist/javalib/antlr-${antlr-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/asm-${asm-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/asm-commons-${asm-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/constantine.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/asm-util-${asm-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/bcpkix-${bcpkix-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/commons-compress-${commons-compress-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/guava-${guava-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/jaffl.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/icu4j-${icu4j-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/netty-buffer-${netty-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/netty-codec-${netty-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/netty-common-${netty-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/netty-handler-${netty-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/netty-resolver-${netty-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/netty-transport-${netty-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/java-sizeof-${java-sizeof-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/jffi-${jffi-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/jnr-ffi-${jnr-ffi-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/jnr-netdb-${jnr-netdb-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/jnr-posix-${jnr-posix-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/jnr-constants-${jnr-constants-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/xercesImpl-${xercesImpl-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/jline-${jline-version}.jar" todir="${bm-jars}"/>
<copy file="${bm-build-dir}/dist/javalib/jnr-posix.jar" todir="${bm-jars}"/>
</target>
<target name="data" depends="pybench">
......@@ -74,4 +103,4 @@
<fileset dir="${bm-build-dir}/dist/" includes="jython/Lib/**"/>
</zip>
</target>
</project>
</project>
\ No newline at end of file
ed8e553fc6131272547f817e03696f78
\ No newline at end of file
benchmark jython
class org.dacapo.harness.Jython
thread-model single
jars "jython.jar", "antlr-3.1.3.jar", "asm-3.1.jar", "asm-commons-3.1.jar", "constantine.jar", "guava-r07.jar", "jaffl.jar", "jline-0.9.95-SNAPSHOT.jar", "jnr-posix.jar";
jars "jython.jar", "antlr-3.1.3.jar", "asm-5.2.jar", "asm-commons-5.2.jar", "asm-util-5.2.jar", "bcpkix-jdk15on-1.57.jar", "commons-compress-1.14.jar", "guava-22.0-android.jar", "icu4j-59_1.jar", "netty-buffer-4.1.11.Final.jar", "netty-codec-4.1.11.Final.jar", "netty-common-4.1.11.Final.jar", "netty-handler-4.1.11.Final.jar", "netty-resolver-4.1.11.Final.jar", "netty-transport-4.1.11.Final.jar", "java-sizeof-0.0.5.jar", "jffi-1.2.15.jar", "jnr-ffi-2.1.5.jar", "jnr-netdb-1.1.6.jar", "jnr-posix-3.0.41.jar", "jnr-constants-0.9.9.jar", "xercesImpl-2.11.0.jar", "jline-2.14.3.jar";
size small args "${SCRATCH}/jython/sieve.py","50"
output stdout digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
......@@ -22,6 +22,6 @@ description
author "Jim Hugunin and Barry Warsaw",
license "The Jython License.",
url "http://www.jython.org/",
version "2.5.1",
version "2.7.1",
threads "Single-threaded.",
repeats "Single iteration runs a single iteration of the pybench python benchmark";
......@@ -2,7 +2,7 @@ Only in src: java
diff -ur ../clean/src/org/python/core/PySystemState.java src/org/python/core/PySystemState.java
--- ../clean/src/org/python/core/PySystemState.java 2009-06-14 21:51:38.000000000 +1000
+++ src/org/python/core/PySystemState.java 2009-06-16 22:15:24.000000000 +1000
@@ -975,6 +975,11 @@
@@ -1187,6 +1187,11 @@
packageManager = new SysPackageManager(pkgdir, props);
}
......
......@@ -262,6 +262,62 @@
</antcall>
</target>
<!-- get source from mercurial repository -->
<target name="check-hg-source" if="target-filename" depends="scm-init">
<antcall target="check-hg-source.checkandupdate">
<param name="hg-url" value="${hg-url}"/>
<param name="hg-revision" value="${hg-revision}"/>
<param name="target-filename" value="${target-filename}"/>
<param name="fail-on-error" value="${fail-on-error}"/>
</antcall>
<antcall target="check-hg-source.update">
<param name="hg-url" value="${hg-url}"/>
<param name="hg-revision" value="${hg-revision}"/>
<param name="target-filename" value="${target-filename}"/>
<param name="fail-on-error" value="${fail-on-error}"/>
</antcall>
<antcall target="check-source.checksum.update">
<param name="target-filename" value="${target-filename}"/>
</antcall>
<antcall target="check-source.checksum.verify">
<param name="target-filename" value="${target-filename}"/>
</antcall>
</target>
<!-- get the source from hg and tar up if necessary -->
<target name="get-hg-source" unless="target-valid-md5">
<property name="hg-tmp" value="hg-${build.time}"/>
<!-- set the input string to "p" to get around a bug where hg asks about unknown certificates -->
<exec executable="hg" failonerror="${fail-on-error}">
<arg line="clone -u ${hg-revision} ${hg-url} ${hg-tmp}"/>
</exec>
<!-- since timestamps are kept in tar balls we force to a date before the dacapo project start -->
<tar destfile="${target-filename}" basedir="${hg-tmp}" compression="gzip" excludes=".hg/**,**/.hg/**"/>
<delete dir="${hg-tmp}"/>
</target>
<target name="check-hg-source.checkandupdate" if="target-available-for-verify">
<checksum-verify file="${target-filename}" property="target-valid-md5"/>
<antcall target="get-hg-source">
<param name="hg-url" value="${hg-url}"/>
<param name="hg-revision" value="${hg-revision}"/>
<param name="target-filename" value="${target-filename}"/>
<param name="fail-on-error" value="${fail-on-error}"/>
</antcall>
</target>
<target name="check-hg-source.update" unless="target-available">
<antcall target="get-hg-source">
<param name="hg-url" value="${hg-url}"/>
<param name="hg-revision" value="${hg-revision}"/>
<param name="target-filename" value="${target-filename}"/>
<param name="fail-on-error" value="${fail-on-error}"/>
</antcall>
</target>
<!-- utility targets -->
<target name="check-source.checksum.update" unless="target-available-checksum">
<checksum-write file="${target-filename}"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment