Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2006-11-25 03:54:49 -0500
committerslewis2006-11-25 03:54:49 -0500
commit3e746655016d0f6bf5f4d06ed2866076ea72cfd9 (patch)
tree6b2c95624dcc3d664bf7da3510cb9358487ff5fc
parent4d2fca21bc0193dbec339cc4f8de0905f6c67f12 (diff)
downloadorg.eclipse.ecf-3e746655016d0f6bf5f4d06ed2866076ea72cfd9.tar.gz
org.eclipse.ecf-3e746655016d0f6bf5f4d06ed2866076ea72cfd9.tar.xz
org.eclipse.ecf-3e746655016d0f6bf5f4d06ed2866076ea72cfd9.zip
Update to build to remove jar-within-jar problems
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF1
-rw-r--r--examples/bundles/org.eclipse.ecf.example.collab/build.properties11
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
index 7cc10483b..b089adbc6 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.example.collab/META-INF/MANIFEST.MF
@@ -2,7 +2,6 @@ Manifest-Version: 1.0
Bundle-Name: ECF Collaboration Example
Bundle-SymbolicName: org.eclipse.ecf.example.collab;singleton:=true
Bundle-Version: 0.9.4
-Bundle-ClassPath: examplecollab.jar
Bundle-Activator: org.eclipse.ecf.example.collab.ClientPlugin
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/build.properties b/examples/bundles/org.eclipse.ecf.example.collab/build.properties
index 53b133b04..1c2bf5725 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/build.properties
+++ b/examples/bundles/org.eclipse.ecf.example.collab/build.properties
@@ -8,15 +8,16 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-bin.includes = plugin.xml,\
+bin.includes = ., plugin.xml,\
META-INF/,\
icons/,\
- about.html,\
- examplecollab.jar
-jars.compile.order = client.jar
+ about.html
+jars.compile.order = client.jar,\
+ .
output.client.jar = bin/
src.includes = META-INF/,\
icons/,\
plugin.xml,\
about.html
-source.examplecollab.jar = src/
+source.. = src/
+output.. = bin/

Back to the top