Skip to content

Commit d3fe11e

Browse files
authored
Ant build - TopLink integration change (#1910)
Signed-off-by: Radek Felcman <[email protected]>
1 parent ee22c9c commit d3fe11e

File tree

2 files changed

+31
-1
lines changed

2 files changed

+31
-1
lines changed

antbuild.properties

+1
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ package-rename.jar=package-rename.jar
184184
package-rename.properties=package-rename.properties
185185
coretest.framework.jar=eclipselink-coretest-framework.jar
186186
jpatest.framework.jar=eclipselink-jpatest-framework.jar
187+
eclipselink.toplink.install.prefix=eclipselink-toplink
187188

188189
# should pull in component properties instead of redefining
189190
persistence22.jar=jakarta.persistence_2.2.3.jar

antbuild.xml

+30-1
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@
415415
<!-- ================================================================================= -->
416416

417417
<!-- "top-level" target for creating the distribution archives. -->
418-
<target name="package-all" depends="package-eclipselink-bundles, package-src-jar, package-tst-src-zip, package-tst-jar-zip, package-javadoc-zip, package-installer-zip, package-eclipselink-nosql-install"/>
418+
<target name="package-all" depends="package-eclipselink-bundles, package-src-jar, package-tst-src-zip, package-tst-jar-zip, package-javadoc-zip, package-installer-zip, package-eclipselink-nosql-install, package-eclipselink-toplink"/>
419419

420420
<!-- Compiles all components except tests, builds eclipselink.jar. -->
421421
<target name="build-eclipselink-jar" depends="build-core, package-eclipselink-jar" description="build all EclipseLink distribution files except docs and tests"/>
@@ -1720,6 +1720,35 @@
17201720
</zip>
17211721
</target>
17221722

1723+
<target name="package-eclipselink-toplink">
1724+
<!-- Prepare eclipselink-toplink.zip file content -->
1725+
<delete dir="${build.dir}/${eclipselink.toplink.install.prefix}" failonerror="false"/>
1726+
<copy file="${eclipselink.install.prefix}${eclipselink.zip.suffix}" tofile="${build.dir}/${eclipselink.toplink.install.prefix}/${eclipselink.install.prefix}-${version.string}${eclipselink.zip.suffix}"/>
1727+
<copy file="${eclipselink.plugins.install.prefix}${eclipselink.zip.suffix}" tofile="${build.dir}/${eclipselink.toplink.install.prefix}/${eclipselink.plugins.install.prefix}-${version.string}${eclipselink.zip.suffix}"/>
1728+
<copy file="${eclipselink.nosql.install.prefix}${eclipselink.zip.suffix}" tofile="${build.dir}/${eclipselink.toplink.install.prefix}/${eclipselink.nosql.install.prefix}-${version.string}${eclipselink.zip.suffix}"/>
1729+
<copy file="${eclipselink.tst.jar.prefix}${eclipselink.zip.suffix}" tofile="${build.dir}/${eclipselink.toplink.install.prefix}/${eclipselink.tst.jar.prefix}-${version.string}${eclipselink.zip.suffix}"/>
1730+
<copy file="${eclipselink.tst.src.prefix}${eclipselink.zip.suffix}" tofile="${build.dir}/${eclipselink.toplink.install.prefix}/${eclipselink.tst.src.prefix}-${version.string}${eclipselink.zip.suffix}"/>
1731+
1732+
<delete failonerror="false" dir="target/promote_artifacts"/>
1733+
<zip destfile="target/promote_artifacts/com/oracle/toplink/${eclipselink.toplink.install.prefix}/${release.version}-${build.date}.${build.time}/${eclipselink.toplink.install.prefix}-${release.version}-${build.date}.${build.time}${eclipselink.zip.suffix}">
1734+
<zipfileset dir="${build.dir}/${eclipselink.toplink.install.prefix}">
1735+
<include name="${eclipselink.install.prefix}-${version.string}${eclipselink.zip.suffix}"/>
1736+
<include name="${eclipselink.plugins.install.prefix}-${version.string}${eclipselink.zip.suffix}"/>
1737+
<include name="${eclipselink.nosql.install.prefix}-${version.string}${eclipselink.zip.suffix}"/>
1738+
<include name="${eclipselink.tst.jar.prefix}-${version.string}${eclipselink.zip.suffix}"/>
1739+
<include name="${eclipselink.tst.src.prefix}-${version.string}${eclipselink.zip.suffix}"/>
1740+
</zipfileset>
1741+
</zip>
1742+
<echo file="target/promote_artifacts/com/oracle/toplink/${eclipselink.toplink.install.prefix}/${release.version}-${build.date}.${build.time}/${eclipselink.toplink.install.prefix}-${release.version}-${build.date}.${build.time}.pom">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
1743+
&lt;project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
1744+
&lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
1745+
&lt;groupId&gt;com.oracle.toplink&lt;/groupId&gt;
1746+
&lt;artifactId&gt;eclipselink-toplink&lt;/artifactId&gt;
1747+
&lt;version&gt;${release.version}-${build.date}.${build.time}&lt;/version&gt;
1748+
&lt;packaging&gt;zip&lt;/packaging&gt;
1749+
&lt;/project&gt;</echo>
1750+
</target>
1751+
17231752
<!-- Build Infrastructure targets -->
17241753
<target name="refresh-plugins" description="populate plugins with dependent jars from specified Orbit repository">
17251754
<ant antfile="antbuild.xml" dir="${eclipselink.bldplugins}" target="build"/>

0 commit comments

Comments
 (0)