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/help/.classpath b/sigil/eclipse/help/.classpath
index 94b23e1..df7c8de 100644
--- a/sigil/eclipse/help/.classpath
+++ b/sigil/eclipse/help/.classpath
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <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="src" path="src"/>
<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/help/build.xml b/sigil/eclipse/help/build.xml
index c277db3..01507c3 100644
--- a/sigil/eclipse/help/build.xml
+++ b/sigil/eclipse/help/build.xml
@@ -17,6 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="eclipse.help" default="build">
- <import file="../build.xml"/>
+<project name="eclipse.help" 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/help/sigil.properties b/sigil/eclipse/help/sigil.properties
index f80ff55..14fb860 100644
--- a/sigil/eclipse/help/sigil.properties
+++ b/sigil/eclipse/help/sigil.properties
@@ -1,10 +1,32 @@
# sigil project file, saved by plugin.
-version: 0.0.0
+-activator: org.apache.felix.sigil.eclipse.help.Activator
-bundles: \
org.apache.felix.sigil.eclipse.help, \
+
+-singleton: true
+
+-resources: \
+ cheatsheets, \
+ cheatsheets/HelloWorld.xml, \
+ html, \
+ html/book.html, \
+ html/concepts, \
+ html/images, \
+ html/refs, \
+ html/tasks, \
+ html/tasks/container_log.html, \
+ html/tasks/debug_composite.html, \
+ html/tasks/install_composite.html, \
+ html/tasks/launch_newton.html, \
+ html/tasks/new_composite.html, \
+ html/tasks/new_project.html, \
+ html/tasks/new_system.html, \
+ html/tasks/sigil_config.html, \
+ plugin.xml, \
+ toc.xml, \
-sourcedirs: \
src, \
@@ -14,19 +36,19 @@
org.apache.felix.sigil.eclipse.model.project, \
org.apache.felix.sigil.ui.eclipse.actions, \
org.apache.felix.sigil.ui.eclipse.ui.wizard.project, \
- org.eclipse.core.resources;version=3.4.1, \
- org.eclipse.core.runtime.jobs;version=3.4.0, \
- org.eclipse.jface.action;version=3.4.1, \
- org.eclipse.jface.dialogs;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.ui;version=3.4.1, \
- org.eclipse.ui.actions;version=3.4.1, \
- org.eclipse.ui.cheatsheets;version=3.3.101, \
- org.eclipse.ui.part;version=3.4.1, \
- org.eclipse.ui.plugin;version=3.4.1, \
- org.osgi.framework;version=1.4.0, \
+ org.eclipse.core.resources, \
+ org.eclipse.core.runtime.jobs, \
+ org.eclipse.jface.action, \
+ org.eclipse.jface.dialogs, \
+ org.eclipse.jface.viewers, \
+ org.eclipse.jface.window, \
+ org.eclipse.jface.wizard, \
+ org.eclipse.ui, \
+ org.eclipse.ui.actions, \
+ org.eclipse.ui.cheatsheets, \
+ org.eclipse.ui.part, \
+ org.eclipse.ui.plugin, \
+ org.osgi.framework, \
-requires: \
org.eclipse.core.commands;version=3.4.0, \
@@ -34,7 +56,8 @@
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
# end