Skip to content

Commit 88aa087

Browse files
xael-fryxael-fry
authored
Merge pull request #1541 from aleksandy/cleanup-build
use property "release" instead of "source" and "target"
2 parents 1220534 + 15c60ca commit 88aa087

File tree

7 files changed

+19
-27
lines changed

7 files changed

+19
-27
lines changed

‎.github/workflows/build-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: Build with Ant
6161
working-directory: ./framework
62-
run: ant test -Dbuild-source=${{ matrix.target }} -Dbuild-target=${{ matrix.target }}
62+
run: ant test -Dbuild-release=${{ matrix.target }}
6363

6464
build:
6565
needs:
@@ -87,7 +87,7 @@ jobs:
8787

8888
- name: Build with Ant
8989
working-directory: ./framework
90-
run: ant artifact -Dbuild-source=${{ env.DEFAULT_JAVA_VERSION }} -Dbuild-target=${{ env.DEFAULT_JAVA_VERSION }}
90+
run: ant artifact -Dbuild-release=${{ env.DEFAULT_JAVA_VERSION }}
9191

9292
- name: Zipping artifact
9393
uses: actions/upload-artifact@v5
@@ -133,4 +133,4 @@ jobs:
133133

134134
- name: Build with Ant
135135
working-directory: ./framework
136-
run: ant build -Dbuild-source=${{ matrix.target }} -Dbuild-target=${{ matrix.target }}
136+
run: ant build -Dbuild-release=${{ matrix.target }}

‎framework/build.xml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<project name="play! framework" default="jar" basedir="." xmlns:if="ant:if" xmlns:unless="ant:unless">
44

55
<property name="baseversion" value="1.11.x" />
6-
<property name="build-source" value="21" />
7-
<property name="build-target" value="${build-source}" />
6+
<property name="build-release" value="21" />
87

98
<path id="project.classpath">
109
<fileset dir=".">
@@ -66,7 +65,7 @@
6665

6766
<target name="compile" description="compile without cleaning">
6867
<mkdir dir="classes"/>
69-
<javac encoding="utf-8" srcdir="src" destdir="classes" debug="true" source="${build-source}" target="${build-target}">
68+
<javac encoding="utf-8" srcdir="src" destdir="classes" debug="true" release="${build-release}">
7069
<classpath refid="project.classpath" />
7170
</javac>
7271
<copy todir="classes">
@@ -114,8 +113,7 @@
114113
<target name="jar" depends="clean,version,compile,modules" description="create play.jar">
115114
<echo message="${version}" file="src/play/version" />
116115
<echo message="${version}" file="classes/play/version" />
117-
<echo message="build-source=${build-source}" />
118-
<echo message="build-target=${build-target}" />
116+
<echo message="build-release=${build-release}" />
119117
<jar destfile="play-${version}.jar" basedir="classes">
120118
<manifest>
121119
<attribute name="Premain-Class" value="play.classloading.HotswapAgent"/>
@@ -137,8 +135,7 @@
137135

138136
<target name="modules">
139137
<property name="play.path" value="../.."/>
140-
<property name="build-target" value="${build-target}"/>
141-
<property name="build-source" value="${build-source}"/>
138+
<property name="build-release" value="${build-release}"/>
142139
<ant antfile="build.xml" target="build" dir="../modules/testrunner" />
143140
<ant antfile="build.xml" target="build" dir="../modules/grizzly" />
144141
<ant antfile="build.xml" target="build" dir="../modules/docviewer" />
@@ -245,7 +242,7 @@
245242
<mkdir dir="test-classes"/>
246243
<javac encoding="utf-8" nowarn="${compile.nowarn}" debug="true"
247244
destdir="test-classes" classpathref="project.classpath" srcdir="test-src"
248-
source="${build-source}" target="${build-target}">
245+
release="${build-release}">
249246
<classpath refid="classpath.test" />
250247
<include name="**/*.java"/>
251248
</javac>
@@ -413,7 +410,7 @@
413410

414411
<target name="compile-unittest" depends="compile">
415412
<mkdir dir="test-classes"/>
416-
<javac encoding="utf-8" srcdir="test-src" destdir="test-classes" debug="true" source="${build-source}" target="${build-target}">
413+
<javac encoding="utf-8" srcdir="test-src" destdir="test-classes" debug="true" release="${build-release}">
417414
<classpath refid="classpath.test" />
418415
</javac>
419416
<copy todir="test-classes">

‎modules/docviewer/build.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<project name="Docviewer" default="build" basedir=".">
4-
<property name="build-source" value="17" />
5-
<property name="build-target" value="${build-source}" />
4+
<property name="build-release" value="17" />
65
<path id="project.classpath">
76
<pathelement path="${play.path}/framework/classes"/>
87
<fileset dir="${play.path}/framework/lib">
@@ -32,7 +31,7 @@
3231

3332
<target name="compile">
3433
<mkdir dir="tmp/classes" />
35-
<javac srcdir="src" destdir="tmp/classes" debug="true" source="${build-source}" target="${build-target}">
34+
<javac srcdir="src" destdir="tmp/classes" debug="true" release="${build-release}">
3635
<classpath refid="project.classpath" />
3736
</javac>
3837
</target>

‎modules/grizzly/build.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<project name="Grizzly" default="build" basedir=".">
4-
<property name="build-source" value="17" />
5-
<property name="build-target" value="${build-source}" />
4+
<property name="build-release" value="17" />
65
<path id="project.classpath">
76
<pathelement path="${play.path}/framework/classes"/>
87
<fileset dir="${play.path}/framework/lib">
@@ -35,7 +34,7 @@
3534

3635
<target name="compile">
3736
<mkdir dir="tmp/classes" />
38-
<javac srcdir="src" destdir="tmp/classes" debug="true" source="${build-source}" target="${build-target}">
37+
<javac srcdir="src" destdir="tmp/classes" debug="true" release="${build-release}">
3938
<classpath refid="project.classpath" />
4039
</javac>
4140
</target>

‎modules/testrunner/build.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<project name="testrunner module" default="build" basedir=".">
4-
<property name="build-source" value="17" />
5-
<property name="build-target" value="${build-source}" />
4+
<property name="build-release" value="17" />
65
<path id="project.classpath">
76
<pathelement path="../../framework/classes"/>
87
<fileset dir="../../framework/lib">
@@ -16,7 +15,7 @@
1615
<target name="build">
1716
<mkdir dir="tmp/classes" />
1817
<mkdir dir="lib" />
19-
<javac srcdir="src" destdir="tmp/classes" source="${build-source}" target="${build-target}">
18+
<javac srcdir="src" destdir="tmp/classes" release="${build-release}">
2019
<classpath refid="project.classpath" />
2120
</javac>
2221
<copy todir="tmp/classes">

‎resources/module-skel/build.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<project name="%MODULE%" default="build" basedir=".">
4-
<property name="build-source" value="17" />
5-
<property name="build-target" value="${build-source}" />
4+
<property name="build-release" value="17" />
65
<target name="check" unless="play.path">
76
<fail message="Please specify Play framework path using -Dplay.path=/path/to/framework/home" />
87
</target>
@@ -42,7 +41,7 @@
4241

4342
<target name="compile" depends="check">
4443
<mkdir dir="tmp/classes" />
45-
<javac srcdir="src" destdir="tmp/classes" source="${build-source}" target="${build-target}" debug="true">
44+
<javac srcdir="src" destdir="tmp/classes" release="${build-release}" debug="true">
4645
<classpath refid="project.classpath" />
4746
</javac>
4847
</target>

‎samples-and-tests/modules/testModule/build.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<project name="testModule" default="build" basedir=".">
4-
<property name="build-source" value="17" />
5-
<property name="build-target" value="${build-source}" />
4+
<property name="build-release" value="17" />
65
<target name="check" unless="play.path">
76
<fail message="Please specify Play framework path using -Dplay.path=/path/to/framework/home" />
87
</target>
@@ -42,7 +41,7 @@
4241
<target name="compile" depends="check">
4342
<mkdir dir="lib" />
4443
<mkdir dir="tmp/classes" />
45-
<javac srcdir="src" destdir="tmp/classes" source="${build-source}" target="${build-target}" debug="true">
44+
<javac srcdir="src" destdir="tmp/classes" release="${build-release}" debug="true">
4645
<classpath refid="project.classpath" />
4746
</javac>
4847
</target>

0 commit comments

Comments
 (0)