diff options
| author | Lars Vogel | 2015-03-17 15:32:07 +0000 |
|---|---|---|
| committer | Lars Vogel | 2015-03-17 15:32:10 +0000 |
| commit | 46f4be8b4980530a40852d23fb002988f250ba71 (patch) | |
| tree | 2550a0b251e23652b98f2bf6f9362d110c0c306c | |
| parent | a6cffee6799de9f92b85f0f3b332558202acc976 (diff) | |
| download | eclipse.platform.ua-46f4be8b4980530a40852d23fb002988f250ba71.tar.gz eclipse.platform.ua-46f4be8b4980530a40852d23fb002988f250ba71.tar.xz eclipse.platform.ua-46f4be8b4980530a40852d23fb002988f250ba71.zip | |
Revert "Bug 461059 - Prevent dirt in workspace"I20150324-0800I20150320-0800I20150320-0030I20150319-1640I20150319-1430I20150318-2000I20150318-1300I20150318-0800I20150317-2000I20150317-1130
This reverts commit cd4c1939d3f8a1052fb4240e22bb5479528d5fc1.
Change-Id: I303e1396486ba332bd60f936ef7a35b8f635b456
| -rw-r--r-- | org.eclipse.ua.tests/META-INF/MANIFEST.MF | 3 | ||||
| -rw-r--r-- | org.eclipse.ua.tests/build.properties | 8 | ||||
| -rw-r--r-- | org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF | 3 | ||||
| -rw-r--r-- | org.eclipse.ui.intro.universal/build.properties | 7 |
4 files changed, 13 insertions, 8 deletions
diff --git a/org.eclipse.ua.tests/META-INF/MANIFEST.MF b/org.eclipse.ua.tests/META-INF/MANIFEST.MF index 153198c9d..a8177c3b2 100644 --- a/org.eclipse.ua.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.ua.tests/META-INF/MANIFEST.MF @@ -22,7 +22,7 @@ Require-Bundle: org.junit, org.eclipse.equinox.jsp.jasper.registry;bundle-version="1.0.100" Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse.org -Bundle-ClassPath: . +Bundle-ClassPath: ua-tests.jar Import-Package: javax.servlet;version="2.4.0", javax.servlet.http;version="2.4.0", org.apache.lucene.index;core=split;version="[3.5.0,4.0.0)", @@ -66,3 +66,4 @@ Export-Package: org.eclipse.ua.tests, org.eclipse.ua.tests.plugin, org.eclipse.ua.tests.util, org.eclipse.ua.tests.browser +Eclipse-BundleShape: dir diff --git a/org.eclipse.ua.tests/build.properties b/org.eclipse.ua.tests/build.properties index 6857a36d6..74abeb4e3 100644 --- a/org.eclipse.ua.tests/build.properties +++ b/org.eclipse.ua.tests/build.properties @@ -11,7 +11,7 @@ bin.includes = plugin.xml,\ icons/,\ test.xml,\ - .,\ + ua-tests.jar,\ data/,\ META-INF/,\ doc.zip,\ @@ -21,10 +21,12 @@ bin.includes = plugin.xml,\ jsp/,\ script/,\ service/ -output.. = bin/ -source.. = base/,\ +jars.compile.order = ua-tests.jar +output.ua-tests.jar = bin/ +source.ua-tests.jar = base/,\ browser/,\ cheatsheet/,\ help/,\ intro/ +javacWarnings.ua-tests.jar=-unavoidableGenericProblems diff --git a/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF b/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF index 069b9573d..e4ca8ac94 100644 --- a/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF +++ b/org.eclipse.ui.intro.universal/META-INF/MANIFEST.MF @@ -15,9 +15,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", org.eclipse.ui.intro;bundle-version="[3.4.0,4.0.0)" Eclipse-LazyStart: true; exceptions="org.eclipse.ui.internal.intro.universal.contentdetect" Bundle-Activator: org.eclipse.ui.internal.intro.universal.UniversalIntroPlugin -Bundle-ClassPath: . +Bundle-ClassPath: universal.jar Bundle-RequiredExecutionEnvironment: J2SE-1.4 Import-Package: javax.xml.parsers, org.w3c.dom, org.xml.sax Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.ui.internal.intro.universal.contentdetect" +Eclipse-BundleShape: dir diff --git a/org.eclipse.ui.intro.universal/build.properties b/org.eclipse.ui.intro.universal/build.properties index 7b7018bab..a45f90336 100644 --- a/org.eclipse.ui.intro.universal/build.properties +++ b/org.eclipse.ui.intro.universal/build.properties @@ -16,7 +16,8 @@ bin.includes = plugin.xml,\ META-INF/,\ .options,\ about.html,\ - . + universal.jar src.includes = about.html -source.. = src/ -output.. = bin/ +jars.compile.order = universal.jar +source.universal.jar = src/ +output.universal.jar = bin/ |