Skip to content
This repository was archived by the owner on Oct 11, 2024. It is now read-only.

Commit b1f44b4

Browse files
Simplify build-summary
1 parent cca7cd4 commit b1f44b4

File tree

3 files changed

+23
-43
lines changed

3 files changed

+23
-43
lines changed

build.xml

Lines changed: 21 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -73,47 +73,27 @@
7373
<arg line="rev-parse --abbrev-ref HEAD" />
7474
</exec>
7575

76-
<if>
77-
<or>
78-
<equals arg1="${git.branch}" arg2="master" />
79-
<matches pattern="ee-.*x$" string="${git.branch}" />
80-
</or>
81-
<then>
82-
<delete>
83-
<fileset dir="." includes="**/liferay-releng.changelog" />
84-
<fileset dir="." includes="**/liferay-releng.changelog.md5" />
85-
</delete>
86-
87-
<copy overwrite="true" todir="${sdk.dir}">
88-
<fileset dir="${release.plugins.dir}">
89-
<include name="**/liferay-plugin-package.properties" />
90-
</fileset>
91-
</copy>
92-
</then>
93-
<else>
94-
<java
95-
classname="com.liferay.portal.tools.PluginsSummaryBuilder"
96-
classpathref="portal.classpath"
97-
fork="true"
98-
newenvironment="true"
99-
>
100-
<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
101-
<jvmarg value="-Dplugins.dir=${sdk.dir}" />
102-
</java>
103-
104-
<java
105-
classname="com.liferay.portal.tools.XSLTBuilder"
106-
classpathref="portal.classpath"
107-
fork="true"
108-
newenvironment="true"
109-
>
110-
<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
111-
<arg value="${sdk.dir}/summary.xml" />
112-
<arg value="${sdk.dir}/summary.xsl" />
113-
<arg value="${sdk.dir}/summary.html" />
114-
</java>
115-
</else>
116-
</if>
76+
<java
77+
classname="com.liferay.portal.tools.PluginsSummaryBuilder"
78+
classpathref="portal.classpath"
79+
fork="true"
80+
newenvironment="true"
81+
>
82+
<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
83+
<jvmarg value="-Dplugins.dir=${sdk.dir}" />
84+
</java>
85+
86+
<java
87+
classname="com.liferay.portal.tools.XSLTBuilder"
88+
classpathref="portal.classpath"
89+
fork="true"
90+
newenvironment="true"
91+
>
92+
<jvmarg value="-Dexternal-properties=com/liferay/portal/tools/dependencies/portal-tools.properties" />
93+
<arg value="${sdk.dir}/summary.xml" />
94+
<arg value="${sdk.dir}/summary.xsl" />
95+
<arg value="${sdk.dir}/summary.html" />
96+
</java>
11797
</target>
11898

11999
<target name="format-javadoc">
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0ffa7525c54ac6279b4bab37db8be270
1+
08c198d691337096334fdfd6f19928be

ivy.xml.MD5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c159b4ff77e8928c23b4974436ad4943
1+
69f6c1226797eb035e6ad0275ab13bc6

0 commit comments

Comments
 (0)