Extract .so files after installation.
- Install .so extraction file. - eclipse-reconciler script now extract .so files if the reconciler is run with -clean
This commit is contained in:
parent
e3d3284e1a
commit
33c0464e31
@ -21,10 +21,19 @@ then
|
||||
echo "Running eclipse reconciler"
|
||||
pushd $1
|
||||
./eclipse --launcher.suppressErrors -nosplash -consolelog -application org.eclipse.equinox.p2.reconciler.application ${@:3}
|
||||
exit_value=$?
|
||||
r_exit_value=$?
|
||||
|
||||
if [ $# -ge 3 ] && [ $3 == "-clean" ]
|
||||
then
|
||||
echo "Running the initializer"
|
||||
./eclipse --launcher.suppressErrors -cosolelog -nosplash -application org.eclipse.equinox.initializer.configInitializer -fileInitializer extract_patterns.txt
|
||||
i_exit_value=$?
|
||||
else
|
||||
i_exit_value=0
|
||||
fi
|
||||
|
||||
# Check exit value
|
||||
if [ ! $exit_value -eq 0 ]
|
||||
if [ ! $i_exit_value -eq 0 ] || [ ! $r_exit_value -eq 0 ]
|
||||
then
|
||||
# Restore files
|
||||
echo "Reconciler failed. Restoring files"
|
||||
@ -49,9 +58,11 @@ echo "Invalid options"
|
||||
echo ""
|
||||
echo "Usage:"
|
||||
echo ""
|
||||
echo " eclipse-reconciler <eclipse dir> <backup location> [reconciler parameters]"
|
||||
echo " eclipse-reconciler <eclipse dir> <backup location> [-clean] [reconciler parameters]"
|
||||
echo " Backsup configuration files in the given location, run the reconciler"
|
||||
echo " and restore the files if there is a problem at the end delete backup files."
|
||||
echo " Any parameters given after the first two are passed directly to the reconciler"
|
||||
echo " If the -clean option is specified -clean is passed to the reoconciler, and the"
|
||||
echo " And the initializer is rerun after reconcilation. Any parameters given after"
|
||||
echo " the first three are passed directly to the reconciler"
|
||||
|
||||
exit 1;
|
||||
|
@ -221,6 +221,9 @@ popd
|
||||
#install the reconciler script
|
||||
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/
|
||||
|
||||
#install .so extaction paterns file
|
||||
cp -p extract_patterns.txt $RPM_BUILD_ROOT/%{_libdir}/%{name}/
|
||||
|
||||
# Symlinks to the SWT JNI shared libraries in %%{_libdir}/eclipse
|
||||
pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
|
||||
for lib in $(find configuration -name libswt\*.so); do
|
||||
@ -404,6 +407,7 @@ rm -rf %{_bindir}/efj/
|
||||
%{_datadir}/icons/*/*/apps/*
|
||||
%{_bindir}/eclipse-reconciler.sh
|
||||
%{_libdir}/%{name}/eclipse
|
||||
%{_libdir}/%{name}/extract_patterns.txt
|
||||
%dir %{_libdir}/%{name}/dropins
|
||||
%dir %{_datadir}/%{name}/dropins
|
||||
%{_libdir}/%{name}/features/org.eclipse.platform_*
|
||||
@ -554,6 +558,10 @@ rm -rf %{_bindir}/efj/
|
||||
%{_libdir}/%{name}/dropins/sdk
|
||||
|
||||
%changelog
|
||||
* Mon Oct 3 2011 Sami Wagiaalla <swagiaal@redhat.com> 1:3.7.0-5
|
||||
- Install .so extraction file.
|
||||
- Extract .so files when the reconciler is run with -clean
|
||||
|
||||
* Mon Oct 3 2011 Sami Wagiaalla <swagiaal@redhat.com> 1:3.7.0-5
|
||||
- Correct verification for files edited by the reconciler.
|
||||
- Do not install state files.
|
||||
|
Loading…
Reference in New Issue
Block a user