Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2009-10-09 13:44:18 -0400
committerpelder2009-10-09 13:44:18 -0400
commit2d2295cce40b0954e130c85b5b991847caa9df74 (patch)
treefb9b1f811e33ddf396453c8b115a00548f94cd93
parentbd105f6e540891d610ac0b9dbc346996d2b1e52f (diff)
downloadorg.eclipse.jet-2d2295cce40b0954e130c85b5b991847caa9df74.tar.gz
org.eclipse.jet-2d2295cce40b0954e130c85b5b991847caa9df74.tar.xz
org.eclipse.jet-2d2295cce40b0954e130c85b5b991847caa9df74.zip
[291936] jet.compile Ant task does not respect project settings (e.g Java package for output folder)
-rw-r--r--plugins/org.eclipse.jet-feature/feature.xml15
-rwxr-xr-xplugins/org.eclipse.jet.all-feature/feature.xml2
-rw-r--r--plugins/org.eclipse.jet.sdk-feature/feature.xml2
-rw-r--r--plugins/org.eclipse.jet/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.jet/antsrc/org/eclipse/jet/ant/tasks/JETCompileTask.java4
5 files changed, 12 insertions, 13 deletions
diff --git a/plugins/org.eclipse.jet-feature/feature.xml b/plugins/org.eclipse.jet-feature/feature.xml
index 86d6766..9ae0b80 100644
--- a/plugins/org.eclipse.jet-feature/feature.xml
+++ b/plugins/org.eclipse.jet-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jet"
label="%featureName"
- version="1.0.1.qualifier"
+ version="1.1.0.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/modeling/m2t">
@@ -21,6 +21,11 @@
<update label="%updateSiteName" url="http://download.eclipse.org/modeling/m2t/updates/"/>
</url>
+ <includes
+ id="org.eclipse.jet.uml2"
+ version="0.0.0"
+ optional="true"/>
+
<plugin
id="org.eclipse.jet"
download-size="0"
@@ -42,12 +47,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.jet.uml2"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
</feature>
diff --git a/plugins/org.eclipse.jet.all-feature/feature.xml b/plugins/org.eclipse.jet.all-feature/feature.xml
index d00021c..f5bb021 100755
--- a/plugins/org.eclipse.jet.all-feature/feature.xml
+++ b/plugins/org.eclipse.jet.all-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jet.all"
label="%featureName"
- version="1.0.1.qualifier"
+ version="1.1.0.qualifier"
provider-name="%providerName">
<description>
diff --git a/plugins/org.eclipse.jet.sdk-feature/feature.xml b/plugins/org.eclipse.jet.sdk-feature/feature.xml
index 8a05f35..930a4dc 100644
--- a/plugins/org.eclipse.jet.sdk-feature/feature.xml
+++ b/plugins/org.eclipse.jet.sdk-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jet.sdk"
label="%featureName"
- version="1.0.1.qualifier"
+ version="1.1.0.qualifier"
provider-name="%providerName">
<description>
diff --git a/plugins/org.eclipse.jet/META-INF/MANIFEST.MF b/plugins/org.eclipse.jet/META-INF/MANIFEST.MF
index 3b239e3..022cc85 100644
--- a/plugins/org.eclipse.jet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jet/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jet;singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Activator: org.eclipse.jet.internal.InternalJET2Platform
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ant.core;bundle-version="[3.1.100,4.0.0)",
diff --git a/plugins/org.eclipse.jet/antsrc/org/eclipse/jet/ant/tasks/JETCompileTask.java b/plugins/org.eclipse.jet/antsrc/org/eclipse/jet/ant/tasks/JETCompileTask.java
index f038603..206242f 100644
--- a/plugins/org.eclipse.jet/antsrc/org/eclipse/jet/ant/tasks/JETCompileTask.java
+++ b/plugins/org.eclipse.jet/antsrc/org/eclipse/jet/ant/tasks/JETCompileTask.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -32,6 +32,7 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jet.compiler.CompileOptionsManager;
import org.eclipse.jet.core.compiler.JETCompilerOptions;
import org.eclipse.jet.internal.builder.WorkspaceCompiler;
import org.eclipse.jet.internal.core.compiler.IJETCompiler;
@@ -80,6 +81,7 @@ public class JETCompileTask extends Task {
validate();
IProgressMonitor monitor =
(IProgressMonitor) getProject().getReferences().get(AntCorePlugin.ECLIPSE_PROGRESS_MONITOR);
+ jetBuildProperties = CompileOptionsManager.getOptions(eclipseProject);
jetBuildProperties.put(JETCompilerOptions.OPTION_COMPILED_TEMPLATE_SRC_DIR, destdir);
log("destdir: " + destdir);
IJETCompiler compiler = new WorkspaceCompiler(eclipseProject, null, jetBuildProperties, monitor);

Back to the top