rpms/ant
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rearrange how BC-compiled stuff is built and installed

Browse Source
This commit is contained in:
gbenson 2005-05-25 15:11:24 +00:00
parent e81e80606f
commit 59dde641d1
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ant.spec
View File

@ -26,6 +26,7 @@ Requires: java-devel
BuildRequires: jaxp_parser_impl BuildRequires: jaxp_parser_impl
BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: coreutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Obsoletes: ant-optional ant-optional-full Obsoletes: ant-optional ant-optional-full
# RHEL3 and FC2 # RHEL3 and FC2
@ -355,11 +356,16 @@ export JAVA_HOME
sh build.sh --noconfig jars javadocs sh build.sh --noconfig jars javadocs
# BC-compile the two core jars # BC-compile the two core jars
gcj-dbtool -n build/lib/%{name}-%{version}.db
for jar in %{name} %{name}-launcher; do for jar in %{name} %{name}-launcher; do
aot-compile \ aot-compile \
build/lib/$jar.jar \ build/lib/$jar.jar \
build/lib/lib$jar.jar.so \ build/lib/lib$jar-%{version}.jar.so \
"$RPM_OPT_FLAGS -fPIC" "$RPM_OPT_FLAGS -fPIC"
gcj-dbtool -f \
build/lib/%{name}-%{version}.db \
build/lib/$jar.jar \
%{_libdir}/lib$jar-%{version}.jar.so
done done
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -403,8 +409,8 @@ cp -p build/lib/%{name}-trax.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-trax
# solibs # solibs
mkdir -p $RPM_BUILD_ROOT%{_libdir} mkdir -p $RPM_BUILD_ROOT%{_libdir}
cp -p build/lib/lib%{name}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}-%{version}.jar.so cp -p build/lib/lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
cp -p build/lib/lib%{name}-launcher.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}-launcher-%{version}.jar.so cp -p build/lib/lib%{name}-launcher-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
# solib aliases # solib aliases
(cd $RPM_BUILD_ROOT%{_libdir} && for so in lib*-%{version}.jar.so; do ln -sf ${so} `echo $so| sed "s|-%{version}||g"`; done) (cd $RPM_BUILD_ROOT%{_libdir} && for so in lib*-%{version}.jar.so; do ln -sf ${so} `echo $so| sed "s|-%{version}||g"`; done)
@ -412,13 +418,7 @@ cp -p build/lib/lib%{name}-launcher.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}-
# gcjdb # gcjdb
gcjdbdir=`gcj-dbtool -p %{_libdir}`.d gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
mkdir -p $RPM_BUILD_ROOT$gcjdbdir mkdir -p $RPM_BUILD_ROOT$gcjdbdir
gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000 cp -a build/lib/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \
%{_libdir}/lib%{name}-%{version}.jar.so
gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \
$RPM_BUILD_ROOT%{_javadir}/%{name}-launcher-%{version}.jar \
%{_libdir}/lib%{name}-launcher-%{version}.jar.so
# scripts: remove dos and os/2 scripts # scripts: remove dos and os/2 scripts
rm -f src/script/*.bat rm -f src/script/*.bat
@ -630,6 +630,9 @@ fi
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Tue May 25 2005 Gary Benson <gbenson at redhat.com>
- Rearrange how BC-compiled stuff is built and installed.
* Mon May 23 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_8fc * Mon May 23 2005 Gary Benson <gbenson at redhat.com> 0:1.6.2-3jpp_8fc
- Use absolute paths for rebuild-gcj-db. - Use absolute paths for rebuild-gcj-db.