Rearrange how BC-compiled stuff is built and installed

This commit is contained in:
gbenson 2005-05-27 13:11:38 +00:00
parent 30a91548cc
commit 24abe7dc30

View File

@ -100,10 +100,15 @@ ant \
samples \
servlet
gcj-dbtool -n build/%{name}-%{version}.db 2048
aot-compile \
build/xalan-interpretive.jar \
build/lib%{name}.jar.so \
build/lib%{name}-%{version}.jar.so \
"$RPM_OPT_FLAGS -fPIC"
gcj-dbtool -f \
build/%{name}-%{version}.db \
build/xalan-interpretive.jar \
%{_libdir}/lib%{name}-%{version}.jar.so
%install
@ -118,17 +123,14 @@ install -p -m 644 build/xsltc.jar \
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# solibs
mkdir -p $RPM_BUILD_ROOT%{_libdir}
cp -p build/lib%{name}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}-%{version}.jar.so
(cd $RPM_BUILD_ROOT%{_libdir} && for so in lib*-%{version}.jar.so; do ln -sf ${so} `echo $so| sed "s|-%{version}||g"`; done)
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}
install -m 755 build/lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}
ln -sf lib%{name}-%{version}.jar.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.jar.so
# gcjdb
gcjdbdir=`gcj-dbtool -p %{_libdir}`.d
mkdir -p $RPM_BUILD_ROOT$gcjdbdir
gcj-dbtool -n $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db 80000
gcj-dbtool -f $RPM_BUILD_ROOT$gcjdbdir/%{name}-%{version}.db \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar \
%{_libdir}/lib%{name}-%{version}.jar.so
install -d -m 755 $RPM_BUILD_ROOT$gcjdbdir
install -m 644 build/%{name}-%{version}.db $RPM_BUILD_ROOT$gcjdbdir
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@ -217,6 +219,7 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name}
%changelog
* Fri May 27 2005 Gary Benson <gbenson@redhat.com>
- Remove now-unnecessary workaround for #130162.
- Rearrange how BC-compiled stuff is built and installed.
* Tue May 24 2005 Gary Benson <gbenson@redhat.com> 0:2.6.0-2jpp_2fc
- Add DOM3 stubs to classes that need them (#152255).