avoid nested jars on bundle classpath

darcs-hash:20080405220712-34f1c-34e64ba82cc68259e3bd00b67ed868bd14724a47.gz
JPMoresmau · Apr 5, 2008 · b926ea4 · b926ea4
1 parent c9ea0c5
commit b926ea4
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 21 deletions.
diff --git a/net.sf.eclipsefp.haskell.core.jparser/META-INF/MANIFEST.MF b/net.sf.eclipsefp.haskell.core.jparser/META-INF/MANIFEST.MF
@@ -15,6 +15,5 @@ Export-Package: net.sf.eclipsefp.haskell.core.jparser,
  net.sf.eclipsefp.haskell.core.jparser.ast;x-friends:="net.sf.eclipsefp.haskell.core.jparser.test,net.sf.eclipsefp.haskell.core.test"
 Eclipse-LazyStart: true
 Eclipse-AutoStop: true
-Bundle-ClassPath: jparser.jar
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 
diff --git a/net.sf.eclipsefp.haskell.core.jparser/build.properties b/net.sf.eclipsefp.haskell.core.jparser/build.properties
@@ -1,8 +1,8 @@
-source.jparser.jar = src/
-output.jparser.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = META-INF/,\
                plugin.xml,\
-               jparser.jar,\
+               .,\
                antlr-src/,\
                plugin.properties
 
diff --git a/net.sf.eclipsefp.haskell.core/META-INF/MANIFEST.MF b/net.sf.eclipsefp.haskell.core/META-INF/MANIFEST.MF
@@ -2,7 +2,6 @@ Manifest-Version: 1.0
 Bundle-Name: %bundleName
 Bundle-SymbolicName: net.sf.eclipsefp.haskell.core;singleton:=true
 Bundle-Version: 1.105.0
-Bundle-ClassPath: haskellcore.jar
 Bundle-Activator: net.sf.eclipsefp.haskell.core.HaskellCorePlugin
 Bundle-Vendor: %bundleVendor
 Bundle-Localization: plugin

diff --git a/net.sf.eclipsefp.haskell.core/build.properties b/net.sf.eclipsefp.haskell.core/build.properties
@@ -1,6 +1,7 @@
-source.haskellcore.jar = src/
+source.. = src/
+output.. = bin/
 bin.includes = plugin.xml,\
-               haskellcore.jar,\
+               .,\
                .options,\
                META-INF/,\
                plugin.properties

diff --git a/net.sf.eclipsefp.haskell.ghccompiler/META-INF/MANIFEST.MF b/net.sf.eclipsefp.haskell.ghccompiler/META-INF/MANIFEST.MF
@@ -2,7 +2,6 @@ Manifest-Version: 1.0
 Bundle-Name: %bundleName
 Bundle-SymbolicName: net.sf.eclipsefp.haskell.ghccompiler;singleton:=true
 Bundle-Version: 1.105.0
-Bundle-ClassPath: ghccompiler.jar
 Bundle-Activator: net.sf.eclipsefp.haskell.ghccompiler.GhcCompilerPlugin
 Bundle-Vendor: %bundleVendor
 Bundle-Localization: plugin

diff --git a/net.sf.eclipsefp.haskell.ghccompiler/build.properties b/net.sf.eclipsefp.haskell.ghccompiler/build.properties
@@ -1,6 +1,7 @@
-source.ghccompiler.jar = src/
+output.. = bin/
+source.. = src/
 bin.includes = plugin.xml,\
-               ghccompiler.jar,\
+               .,\
                .options,\
                META-INF/,\
                icons/,\

diff --git a/net.sf.eclipsefp.haskell.haddock/META-INF/MANIFEST.MF b/net.sf.eclipsefp.haskell.haddock/META-INF/MANIFEST.MF
@@ -2,7 +2,6 @@ Manifest-Version: 1.0
 Bundle-Name: %bundleName
 Bundle-SymbolicName: net.sf.eclipsefp.haskell.haddock;singleton:=true
 Bundle-Version: 1.105.0
-Bundle-ClassPath: haddock.jar
 Bundle-Activator: net.sf.eclipsefp.haskell.haddock.HaddockPlugin
 Bundle-Vendor: %bundleVendor
 Bundle-Localization: plugin

diff --git a/net.sf.eclipsefp.haskell.haddock/build.properties b/net.sf.eclipsefp.haskell.haddock/build.properties
@@ -1,8 +1,8 @@
-source.haddock.jar = src/
-output.haddock.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               haddock.jar,\
+               .,\
                icons/,\
                .options,\
                plugin.properties
diff --git a/net.sf.eclipsefp.haskell.hugs/META-INF/MANIFEST.MF b/net.sf.eclipsefp.haskell.hugs/META-INF/MANIFEST.MF
@@ -2,7 +2,6 @@ Manifest-Version: 1.0
 Bundle-Name: %bundleName
 Bundle-SymbolicName: net.sf.eclipsefp.haskell.hugs;singleton:=true
 Bundle-Version: 1.105.0
-Bundle-ClassPath: hugs.jar
 Bundle-Activator: net.sf.eclipsefp.haskell.hugs.HugsPlugin
 Bundle-Vendor: %bundleVendor
 Bundle-Localization: plugin

diff --git a/net.sf.eclipsefp.haskell.hugs/build.properties b/net.sf.eclipsefp.haskell.hugs/build.properties
@@ -1,8 +1,8 @@
-source.hugs.jar = src/
-output.hugs.jar = bin/
+source.. = src/
+output.. = bin/
 bin.includes = plugin.xml,\
                META-INF/,\
-               hugs.jar,\
+               .,\
                icons/,\
                .options,\
                plugin.properties
diff --git a/net.sf.eclipsefp.haskell.ui/META-INF/MANIFEST.MF b/net.sf.eclipsefp.haskell.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,6 @@ Manifest-Version: 1.0
 Bundle-Name: %bundleName
 Bundle-SymbolicName: net.sf.eclipsefp.haskell.ui;singleton:=true
 Bundle-Version: 1.105.0
-Bundle-ClassPath: haskellui.jar
 Bundle-Activator: net.sf.eclipsefp.haskell.ui.HaskellUIPlugin
 Bundle-Vendor: %bundleVendor
 Bundle-Localization: plugin

diff --git a/net.sf.eclipsefp.haskell.ui/build.properties b/net.sf.eclipsefp.haskell.ui/build.properties
@@ -1,8 +1,10 @@
-source.haskellui.jar = src/
+output.. = bin/
+source.. = src/
 bin.includes = plugin.xml,\
-               haskellui.jar,\
+               .,\
                META-INF/,\
                icons/,\
                plugin.properties,\
                templates/
+src.includes = hs-src/