further progress towards self hosting FELIX-1323
* replace require bundle dependency on fragment for local classpath via ivy resolve,
* retrieve versions from parent sigil-defaults.properties
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@800008 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/sigil/eclipse/core/.classpath b/sigil/eclipse/core/.classpath
index d3b9691..de1c4df 100644
--- a/sigil/eclipse/core/.classpath
+++ b/sigil/eclipse/core/.classpath
@@ -2,6 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/org.eclipse.swt.carbon.macosx.jar"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
diff --git a/sigil/eclipse/core/build.xml b/sigil/eclipse/core/build.xml
index 7484926..db7659d 100644
--- a/sigil/eclipse/core/build.xml
+++ b/sigil/eclipse/core/build.xml
@@ -17,6 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="eclipse.core" default="build">
- <import file="../build.xml"/>
+<project name="eclipse.core" default="build"
+ xmlns:ivy="antlib:org.apache.ivy.ant">
+ <import file="../build.xml"/>
+ <target name="init">
+ <ivy:retrieve organisation="org.eclipse" module="org.eclipse.swt.carbon.macosx" revision="3.4.1.v3452b" inline="true" pattern="lib/[artifact].[ext]" transitive="false"/>
+ </target>
</project>
diff --git a/sigil/eclipse/core/sigil.properties b/sigil/eclipse/core/sigil.properties
index 1e0ddac..ed91eef 100644
--- a/sigil/eclipse/core/sigil.properties
+++ b/sigil/eclipse/core/sigil.properties
@@ -1,10 +1,18 @@
# sigil project file, saved by plugin.
-version: 0.0.0
+-activator: org.apache.felix.sigil.eclipse.SigilCore
-bundles: \
org.apache.felix.sigil.eclipse.core, \
+
+-singleton: true
+
+-resources: \
+ plugin.xml, \
+ schema, \
+ schema/org.apache.felix.sigil.installbuilder.exsd, \
+ schema/org.apache.felix.sigil.repositoryprovider.exsd, \
-sourcedirs: \
src, \
@@ -19,8 +27,8 @@
org.apache.felix.sigil.eclipse.preferences, \
-imports: \
- org.apache.commons.lang;version=2.4.0, \
- org.apache.commons.lang.text;version=2.4.0, \
+ org.apache.commons.lang, \
+ org.apache.commons.lang.text, \
org.apache.felix.sigil.bnd, \
org.apache.felix.sigil.config, \
org.apache.felix.sigil.core, \
@@ -37,33 +45,36 @@
org.apache.felix.sigil.model.osgi, \
org.apache.felix.sigil.repository, \
org.apache.felix.sigil.utils, \
- org.eclipse.core.commands.common;version=3.4.0;resolve=compile, \
- org.eclipse.core.expressions;version=3.4.1, \
- org.eclipse.core.resources;version=3.4.1, \
- org.eclipse.core.runtime.content;version=3.3.0, \
- org.eclipse.core.runtime.jobs;version=3.4.0, \
- org.eclipse.core.runtime.preferences;version=3.2.0, \
- org.eclipse.debug.core;version=3.4.0, \
- org.eclipse.jdt.core;version=3.4.2, \
- org.eclipse.jface.dialogs;version=3.4.1, \
- org.eclipse.jface.preference;version=3.4.1, \
- org.eclipse.jface.resource;version=3.4.1, \
- org.eclipse.jface.util;version=3.4.1, \
- org.eclipse.jface.window;version=3.4.1, \
- org.eclipse.ui;version=3.4.1, \
- org.eclipse.ui.console;version=3.3.1, \
- org.eclipse.ui.dialogs;version=3.4.1, \
- org.eclipse.ui.plugin;version=3.4.1, \
- org.osgi.framework;version=1.4.0, \
- org.osgi.service.prefs;version=1.1.0, \
- org.osgi.util.tracker;version=1.3.3, \
+ org.eclipse.core.commands.common;resolve=compile, \
+ org.eclipse.core.expressions, \
+ org.eclipse.core.resources, \
+ org.eclipse.core.runtime.content, \
+ org.eclipse.core.runtime.jobs, \
+ org.eclipse.core.runtime.preferences, \
+ org.eclipse.debug.core, \
+ org.eclipse.jdt.core, \
+ org.eclipse.jface.dialogs, \
+ org.eclipse.jface.preference, \
+ org.eclipse.jface.resource, \
+ org.eclipse.jface.util, \
+ org.eclipse.jface.window, \
+ org.eclipse.ui, \
+ org.eclipse.ui.console, \
+ org.eclipse.ui.dialogs, \
+ org.eclipse.ui.plugin, \
+ org.osgi.framework, \
+ org.osgi.service.prefs, \
+ org.osgi.util.tracker, \
-requires: \
org.eclipse.core.runtime;version=3.4.0, \
org.eclipse.equinox.common;version=3.4.0, \
org.eclipse.equinox.registry;version=3.4.0, \
org.eclipse.swt;version=3.4.2, \
- org.eclipse.swt.carbon.macosx;version=3.4.1, \
org.eclipse.ui.workbench;version=3.4.1, \
+
+header;Bundle-ActivationPolicy: lazy
+
+option;addMissingImports: false
# end