Skip to content

Commit 9b139c7

Browse files
robertpatrickjeff5
authored andcommitted
Add the *-built ant targets
Also NEWS updated. This change is cherry-picked from PR 424.
1 parent d29b1ff commit 9b139c7

2 files changed

Lines changed: 37 additions & 6 deletions

File tree

NEWS

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,32 @@ Jython 2.7.5
1616

1717
New Features
1818

19+
- Java 25 is supported when running Jython built for its lowest supported
20+
Java bytecode level. The launchers add the Java 25 native-access options
21+
needed by Jython's native dependencies, and so must some tests. Related
22+
fixes include locale expectations, float repr accuracy, skipping
23+
SecurityManager tests, and other test improvements.
24+
25+
- Windows code page 65001 detection and support as UTF-8.
26+
1927
- Servlet support is updated to use the jakarta namespace. As part of this
2028
change, the classes org.python.util.PyServlet, org.python.util.PyFilter
2129
and org.python.util.PyServletInitializer have been relocated to a new
2230
package org.python.servlet. Users should double-check that this change is
2331
adjusted in their config if necessary.
32+
2433
The relocation allows adding the old classes (with javax.servlet imports)
2534
to the classpath on top of jython.jar without name conflict. In many cases
2635
this should suffice to retain workability of a legacy setup if needed.
2736

2837
- Upgrade of jffi to 1.3.15 eliminates the need for sun.misc.Unsafe, which is
2938
deprecated for removal in Java 26. See https://github.com/jnr/jffi/issues/165
3039

40+
3141
Jython 2.7.5a1 Bugs fixed
32-
- [ GH-388 ] @ExposedType annotation should be @Documented
42+
- [ GH-413 ] Java 25 compatibility regressions.
3343
- [ GH-404 ] Windows code page 65001 (UTF-8) not supported by Jython
44+
- [ GH-388 ] @ExposedType annotation should be @Documented
3445
- [ GH-384 ] Console encoding inferred incorrectly on Java 21
3546
- [ GH-382 ] Java EE Servlet Namespace Has Been Changed From javax.servlet to jakarta.servlet
3647
- [ GH-356 ] _ast.astlist.__add__ leads to Java exception

build.xml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1296,6 +1296,10 @@ The text for an official release would continue like ...
12961296
<target name="test" depends="clean-test, javatest, launchertest, regrtest, modjytest"
12971297
description="run all the tests"/>
12981298

1299+
<target name="test-built"
1300+
depends="init, clean-test, javatest-built, launchertest-built, regrtest-built, modjytest-built"
1301+
description="run all the tests against an existing built dist without rebuilding"/>
1302+
12991303
<target name="singlejavatest" depends="compile-test, expose"
13001304
description="run a single JUnit test (specify with -Dtest=classname)">
13011305
<junit haltonfailure="true" fork="true">
@@ -1341,7 +1345,13 @@ The text for an official release would continue like ...
13411345
description="run all the JUnit tests">
13421346
</target>
13431347

1344-
<target name="javatest-basepath" depends="developer-build">
1348+
<target name="javatest-built" depends="javatest-basepath-built, javatest-import-built"
1349+
description="run all the JUnit tests against an existing built dist">
1350+
</target>
1351+
1352+
<target name="javatest-basepath" depends="developer-build, javatest-basepath-built"/>
1353+
1354+
<target name="javatest-basepath-built" depends="init">
13451355
<mkdir dir="${junit.reports}"/>
13461356
<junit haltonfailure="true" fork="true" printsummary="true">
13471357
<formatter type="xml"/>
@@ -1361,8 +1371,11 @@ The text for an official release would continue like ...
13611371
</junit>
13621372
</target>
13631373

1364-
<target name="javatest-import" depends="developer-build"
1374+
<target name="javatest-import" depends="developer-build, javatest-import-built"
13651375
description="run all the JUnit tests that need tests/python in the path.">
1376+
</target>
1377+
1378+
<target name="javatest-import-built" depends="init">
13661379
<mkdir dir="${junit.reports}"/>
13671380
<junit haltonfailure="true" fork="true" printsummary="true">
13681381
<formatter type="xml"/>
@@ -1444,14 +1457,18 @@ The text for an official release would continue like ...
14441457
</junit>
14451458
</target>
14461459

1447-
<target name="modjytest" depends="developer-build">
1460+
<target name="modjytest" depends="developer-build, modjytest-built"/>
1461+
1462+
<target name="modjytest-built" depends="init">
14481463
<ant dir="tests/modjy">
14491464
<property name="jython_home" value="${dist.dir}"/>
14501465
<property name="mockrunner_home" value="${extlibs.dir}/mockrunner-0.4.1"/>
14511466
</ant>
14521467
</target>
14531468

1454-
<target name="launchertest" depends="developer-build" if="os.family.unix">
1469+
<target name="launchertest" depends="developer-build, launchertest-built" if="os.family.unix"/>
1470+
1471+
<target name="launchertest-built" depends="init" if="os.family.unix">
14551472
<exec executable="${test.shell.dir}/test-jython.sh" failonerror="true">
14561473
<arg value="${dist.dir}"/>
14571474
</exec>
@@ -1476,9 +1493,12 @@ The text for an official release would continue like ...
14761493
</exec>
14771494
</target>
14781495

1479-
<target name="regrtest" depends="developer-build, regrtest-unix, regrtest-windows"
1496+
<target name="regrtest" depends="developer-build, regrtest-built"
14801497
description="run Python tests expected to work on Jython"/>
14811498

1499+
<target name="regrtest-built" depends="init, regrtest-unix, regrtest-windows"
1500+
description="run Python tests against an existing built dist"/>
1501+
14821502
<target name="regrtest-unix" if="os.family.unix">
14831503
<mkdir dir="${junit.reports}"/>
14841504
<exec executable="${dist.dir}/bin/jython" failonerror="true">

0 commit comments

Comments
 (0)