Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2006-11-25 03:54:49 -0500
committerslewis2006-11-25 03:54:49 -0500
commit5f53f10c659f56fa395f52398ae020f26ce28872 (patch)
treee773cfef46d77e358893780b5fa25de78ff7ac4b /protocols
parent3e746655016d0f6bf5f4d06ed2866076ea72cfd9 (diff)
downloadorg.eclipse.ecf-5f53f10c659f56fa395f52398ae020f26ce28872.tar.gz
org.eclipse.ecf-5f53f10c659f56fa395f52398ae020f26ce28872.tar.xz
org.eclipse.ecf-5f53f10c659f56fa395f52398ae020f26ce28872.zip
Update to build to remove jar-within-jar problems
Diffstat (limited to 'protocols')
-rw-r--r--protocols/bundles/org.jivesoftware.smack/META-INF/MANIFEST.MF3
-rw-r--r--protocols/bundles/org.jivesoftware.smack/build.properties8
2 files changed, 5 insertions, 6 deletions
diff --git a/protocols/bundles/org.jivesoftware.smack/META-INF/MANIFEST.MF b/protocols/bundles/org.jivesoftware.smack/META-INF/MANIFEST.MF
index 4e5acad55..1a6ba4da7 100644
--- a/protocols/bundles/org.jivesoftware.smack/META-INF/MANIFEST.MF
+++ b/protocols/bundles/org.jivesoftware.smack/META-INF/MANIFEST.MF
@@ -21,8 +21,7 @@ Export-Package: org.jivesoftware.smack,
org.jivesoftware.smackx.search,
org.xmlpull.mxp1,
org.xmlpull.v1
-Bundle-ClassPath: jars/xmlpull.v1.jar,
- smack.jar
+Bundle-ClassPath: ., jars/xmlpull.v1.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.4,
CDC-1.1/Foundation-1.1
Eclipse-ExtensibleAPI: true
diff --git a/protocols/bundles/org.jivesoftware.smack/build.properties b/protocols/bundles/org.jivesoftware.smack/build.properties
index 613a06a5a..24dc502a3 100644
--- a/protocols/bundles/org.jivesoftware.smack/build.properties
+++ b/protocols/bundles/org.jivesoftware.smack/build.properties
@@ -1,11 +1,9 @@
-bin.includes = META-INF/,\
+bin.includes = ., META-INF/,\
plugin.xml,\
schema/,\
jars/,\
- smack.jar,\
about.html,\
asl-v20.txt
-jars.compile.order = smack.jar
src.includes = schema/,\
plugin.xml,\
META-INF/,\
@@ -20,5 +18,7 @@ src.excludes = jars/jsse.jar,\
jars/smack.jar,\
jars/smackx-debug.jar,\
jars/smackx.jar
-source.smack.jar = src/
jre.compilation.profile = J2SE-1.5
+source.. = src/
+output.. = bin/
+source.. = src/

Back to the top