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/ui/.classpath b/sigil/eclipse/ui/.classpath
index 2503159..03621b5 100644
--- a/sigil/eclipse/ui/.classpath
+++ b/sigil/eclipse/ui/.classpath
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.cauldron.sigil.core.classpathContainer"/>
+ <classpathentry kind="lib" path="lib/org.eclipse.swt.carbon.macosx.jar"/>
<classpathentry kind="output" path="build/classes"/>
</classpath>
diff --git a/sigil/eclipse/ui/build.xml b/sigil/eclipse/ui/build.xml
index 7484926..6822885 100644
--- a/sigil/eclipse/ui/build.xml
+++ b/sigil/eclipse/ui/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.ui" 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/ui/sigil.properties b/sigil/eclipse/ui/sigil.properties
index 5c6d362..8a35d51 100644
--- a/sigil/eclipse/ui/sigil.properties
+++ b/sigil/eclipse/ui/sigil.properties
@@ -1,11 +1,17 @@
# sigil project file, saved by plugin.
-version: 0.0.0
+-activator: org.apache.felix.sigil.ui.eclipse.ui.SigilUI
-bundles: \
org.apache.felix.sigil.eclipse.ui, \
+-resources: \
+ plugin.properties, \
+ plugin.xml, \
+ schema, \
+ schema/org.apache.felix.sigil.ui.repositorywizard.exsd, \
+
-sourcedirs: \
src, \
@@ -32,72 +38,69 @@
org.apache.felix.sigil.ui.eclipse.ui.wizard.project, \
org.apache.felix.sigil.ui.eclipse.ui.wizard.repository, \
org.apache.felix.sigil.utils, \
- org.eclipse.core.commands;version=3.4.0, \
- org.eclipse.core.commands.common;version=3.4.0, \
- org.eclipse.core.internal.preferences;version=3.2.201, \
- org.eclipse.core.resources;version=3.4.1, \
- org.eclipse.core.runtime;version=3.4.0, \
- org.eclipse.core.runtime.jobs;version=3.4.0, \
- org.eclipse.debug.core;version=3.4.0, \
- org.eclipse.debug.ui;version=3.4.2, \
- org.eclipse.draw2d;version=3.4.2, \
- org.eclipse.jdt.core;version=3.4.2, \
- org.eclipse.jdt.core.compiler;version=3.4.2, \
- org.eclipse.jdt.core.dom;version=3.4.2, \
- org.eclipse.jdt.core.dom.rewrite;version=3.4.2, \
- org.eclipse.jdt.internal.corext.dom;version=3.4.2, \
- org.eclipse.jdt.internal.corext.util;version=3.4.2, \
- org.eclipse.jdt.internal.ui;version=3.4.2, \
- org.eclipse.jdt.internal.ui.propertiesfileeditor;version=3.4.2, \
- org.eclipse.jdt.ui;version=3.4.2, \
- org.eclipse.jdt.ui.text;version=3.4.2, \
- org.eclipse.jdt.ui.text.java;version=3.4.2, \
- org.eclipse.jdt.ui.wizards;version=3.4.2, \
- org.eclipse.jface.action;version=3.4.1, \
- org.eclipse.jface.dialogs;version=3.4.1, \
- org.eclipse.jface.fieldassist;version=3.4.1, \
- org.eclipse.jface.layout;version=3.4.1, \
- org.eclipse.jface.operation;version=3.4.1, \
- org.eclipse.jface.preference;version=3.4.1, \
- org.eclipse.jface.resource;version=3.4.1, \
- org.eclipse.jface.text;version=3.4.2, \
- org.eclipse.jface.text.contentassist;version=3.4.2, \
- org.eclipse.jface.util;version=3.4.1, \
- org.eclipse.jface.viewers;version=3.4.1, \
- org.eclipse.jface.window;version=3.4.1, \
- org.eclipse.jface.wizard;version=3.4.1, \
- org.eclipse.ltk.core.refactoring;version=3.4.2, \
- org.eclipse.pde.internal.ui.editor;version=3.4.0, \
- org.eclipse.pde.internal.ui.parts;version=3.4.0, \
- org.eclipse.ui;version=3.4.1, \
- org.eclipse.ui.actions;version=3.4.1, \
- org.eclipse.ui.dialogs;version=3.4.1, \
- org.eclipse.ui.editors.text;version=3.4.0, \
- org.eclipse.ui.forms;version=3.3.103, \
- org.eclipse.ui.forms.editor;version=3.3.103, \
- org.eclipse.ui.forms.events;version=3.3.103, \
- org.eclipse.ui.forms.widgets;version=3.3.103, \
- org.eclipse.ui.handlers;version=3.4.1, \
- org.eclipse.ui.ide;version=3.4.2, \
- org.eclipse.ui.part;version=3.4.1, \
- org.eclipse.ui.plugin;version=3.4.1, \
- org.eclipse.ui.progress;version=3.4.1, \
- org.eclipse.ui.texteditor;version=3.4.0, \
- org.eclipse.ui.wizards.newresource;version=3.4.2, \
- org.eclipse.zest.core.viewers;version=1.0.0, \
- org.eclipse.zest.core.widgets;version=1.0.0, \
- org.eclipse.zest.layouts;version=1.0.0, \
- org.eclipse.zest.layouts.algorithms;version=1.0.0, \
- org.osgi.framework;version=1.4.0, \
- org.osgi.service.prefs;version=1.1.0, \
+ org.eclipse.core.commands, \
+ org.eclipse.core.commands.common, \
+ org.eclipse.core.resources, \
+ org.eclipse.core.runtime, \
+ org.eclipse.core.runtime.jobs, \
+ org.eclipse.debug.core, \
+ org.eclipse.debug.ui, \
+ org.eclipse.draw2d, \
+ org.eclipse.jdt.core, \
+ org.eclipse.jdt.core.compiler, \
+ org.eclipse.jdt.core.dom, \
+ org.eclipse.jdt.core.dom.rewrite, \
+ org.eclipse.jdt.internal.corext.dom, \
+ org.eclipse.jdt.internal.corext.util, \
+ org.eclipse.jdt.internal.ui, \
+ org.eclipse.jdt.internal.ui.propertiesfileeditor, \
+ org.eclipse.jdt.ui, \
+ org.eclipse.jdt.ui.text, \
+ org.eclipse.jdt.ui.text.java, \
+ org.eclipse.jdt.ui.wizards, \
+ org.eclipse.jface.action, \
+ org.eclipse.jface.dialogs, \
+ org.eclipse.jface.fieldassist, \
+ org.eclipse.jface.layout, \
+ org.eclipse.jface.operation, \
+ org.eclipse.jface.preference, \
+ org.eclipse.jface.resource, \
+ org.eclipse.jface.util, \
+ org.eclipse.jface.viewers, \
+ org.eclipse.jface.window, \
+ org.eclipse.jface.wizard, \
+ org.eclipse.ltk.core.refactoring, \
+ org.eclipse.pde.internal.ui.editor, \
+ org.eclipse.pde.internal.ui.parts, \
+ org.eclipse.ui.editors.text, \
+ org.eclipse.ui.forms, \
+ org.eclipse.ui.forms.editor, \
+ org.eclipse.ui.forms.events, \
+ org.eclipse.ui.forms.widgets, \
+ org.eclipse.ui.plugin, \
+ org.eclipse.ui.progress, \
+ org.eclipse.ui.texteditor, \
+ org.eclipse.zest.core.viewers, \
+ org.eclipse.zest.core.widgets, \
+ org.eclipse.zest.layouts, \
+ org.eclipse.zest.layouts.algorithms, \
+ org.osgi.framework, \
+ org.osgi.service.prefs, \
-requires: \
org.eclipse.core.runtime;version=3.4.0, \
org.eclipse.equinox.registry;version=3.4.0, \
+ org.eclipse.jface.text;version=3.4.2, \
org.eclipse.swt;version=3.4.2, \
- org.eclipse.swt.carbon.macosx;version=3.4.1, \
org.eclipse.text;version=3.4.0, \
+ org.eclipse.ui.ide;version=3.4.2, \
org.eclipse.ui.workbench;version=3.4.1, \
org.eclipse.ui.workbench.texteditor;version=3.4.1, \
+header;Bundle-ActivationPolicy: lazy
+
+option;addMissingImports: false
+
+-singleton: true
+
# end