From 99984adc3e38a721268b08c619ac235cf40272cd Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Apr 25 2012 16:35:27 +0000 Subject: Get rid of unusable eclipse plugins to simplify dependencies --- diff --git a/aqute-bnd.spec b/aqute-bnd.spec index a7ab067..0268cec 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -30,7 +30,7 @@ Name: aqute-bnd Version: 0.0.363 -Release: 5%{?dist} +Release: 6%{?dist} Summary: BND Tool License: ASL 2.0 Group: Development/Tools @@ -48,8 +48,6 @@ BuildArch: noarch BuildRequires: jpackage-utils BuildRequires: java-devel BuildRequires: ant -BuildRequires: eclipse-ecj -BuildRequires: eclipse-jdt Requires: java @@ -87,6 +85,12 @@ popd sed -i "s|import aQute.lib.filter.*;||g" src/main/java/aQute/bnd/make/ComponentDef.java sed -i "s|import aQute.lib.filter.*;||g" src/main/java/aQute/bnd/make/ServiceComponent.java +# get rid of eclipse plugins which are not usable anyway and complicate +# things +rm -rf src/main/java/aQute/bnd/annotation/Test.java \ + src/main/java/aQute/bnd/{classpath,jareditor,junit,launch,plugin} \ + aQute/bnd/classpath/messages.properties + # remove bundled stuff for f in $(find aQute/ -type f -name "*.class"); do rm -f $f @@ -99,33 +103,6 @@ sed -i "s|\r||g" LICENSE export LANG=en_US.utf8 export OPT_JAR_LIST=: export CLASSPATH=$(build-classpath ant) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.osgi_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.osgi.services_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jface_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jface.databinding_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jface.text_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.ide_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.commands_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.jobs_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.runtime_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.resources_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.debug.core_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.debug.ui_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.text_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.console_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.editors_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.workbench_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jdt.core_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.launching_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit.core_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.ui_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.equinox.common_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.equinox.registry_*.jar) -CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.swt.*.jar) %{javac} -d target/classes -target 1.5 -source 1.5 $(find src/main/java -type f -name "*.java") %{javadoc} -d target/site/apidocs -sourcepath src/main/java aQute.lib.header aQute.lib.osgi aQute.lib.qtokens aQute.lib.filter @@ -161,6 +138,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Wed Apr 25 2012 Stanislav Ochotnicky - 0.0.363-6 +- Get rid of unusable eclipse plugins to simplify dependencies + * Fri Mar 02 2012 Jaromir Capik - 0.0.363-5 - Fixing build failures on f16 and later