Commit ba36cd6b authored by akrherz's avatar akrherz

OF-728 Remove bundled JRE from source tree (finally), set a build.properties entry for

where to find the bundled JRE when building the installer.rpm target.  For example
ant -Djre.bundle.location=/tmp/jre-1.7.0-55.tgz installer.rpm
parent 9a4081f0
...@@ -24,4 +24,9 @@ plugin.dev.dir= ...@@ -24,4 +24,9 @@ plugin.dev.dir=
# This property is set by default in the build.xml file as c:\Program Files\install4j so # This property is set by default in the build.xml file as c:\Program Files\install4j so
# if you used the standard location you won't need to edit the property below. # if you used the standard location you won't need to edit the property below.
# #
# installer.install4j.home= # installer.install4j.home=
\ No newline at end of file
#
# Path to a bundled JRE you wish to use with the installer.rpm ant target
#
jre.bundle.location=
\ No newline at end of file
...@@ -1114,7 +1114,7 @@ ...@@ -1114,7 +1114,7 @@
<equals arg1="${bundle.jre}" arg2="true"/> <equals arg1="${bundle.jre}" arg2="true"/>
<then> <then>
<!-- Include bundled jre --> <!-- Include bundled jre -->
<copy todir="${target.rpm}/SOURCES" file="${basedir}/build/rpm/jre-dist.tar.gz" /> <copy todir="${target.rpm}/SOURCES" file="${jre.bundle.location}" />
</then> </then>
</if> </if>
<copy todir="${target.rpm}/SOURCES" file="${release.dest.dir}/${release.fullname.src}.tar.gz" /> <copy todir="${target.rpm}/SOURCES" file="${release.dest.dir}/${release.fullname.src}.tar.gz" />
...@@ -1125,7 +1125,7 @@ ...@@ -1125,7 +1125,7 @@
<then> <then>
<rpm specFile="openfire.spec" <rpm specFile="openfire.spec"
topDir="${target.rpm}" topDir="${target.rpm}"
command="-ba --target i386 --define 'OPENFIRE_VERSION ${version}' --define 'OPENFIRE_SOURCE ${release.fullname.src}.tar.gz' --define 'OPENFIRE_BUILDDATE ${rpm.builddate}'" command="-ba --target i386 --define 'JRE_BUNDLE ${jre.bundle.location}' --define 'OPENFIRE_VERSION ${version}' --define 'OPENFIRE_SOURCE ${release.fullname.src}.tar.gz' --define 'OPENFIRE_BUILDDATE ${rpm.builddate}'"
failOnError="true" failOnError="true"
/> />
......
...@@ -5,7 +5,7 @@ Release: 1 ...@@ -5,7 +5,7 @@ Release: 1
BuildRoot: %{_builddir}/%{name}-root BuildRoot: %{_builddir}/%{name}-root
Source0: %{OPENFIRE_SOURCE} Source0: %{OPENFIRE_SOURCE}
%ifnarch noarch %ifnarch noarch
Source1: jre-dist.tar.gz Source1: %{JRE_BUNDLE}
%endif %endif
Group: Applications/Communications Group: Applications/Communications
Vendor: Jive Software Vendor: Jive Software
......
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