summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2007-05-22 13:55:24 (EDT)
committer pelder2007-05-22 13:55:24 (EDT)
commit666056fb9c0162586ddf3772b36ef2b572d91f66 (patch)
treeb3671fda32a8aa8f5dd1bc2b4806a729a1b9d4ae
parentc4e23ac44cfdf7fdba234776ef1e398a722a4664 (diff)
downloadorg.eclipse.jet-666056fb9c0162586ddf3772b36ef2b572d91f66.zip
org.eclipse.jet-666056fb9c0162586ddf3772b36ef2b572d91f66.tar.gz
org.eclipse.jet-666056fb9c0162586ddf3772b36ef2b572d91f66.tar.bz2
[188350] [Regression] jet.compile task invalid Java code on windows
-rw-r--r--plugins/org.eclipse.jet/antsrc/org/eclipse/jet/ant/tasks/JETCompileTask.java8
-rw-r--r--plugins/org.eclipse.jet/build.xml406
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/JET2Compiler.java2
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/builder/WorkspaceCompiler.java8
4 files changed, 418 insertions, 6 deletions
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 d1e49d9..f038603 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
@@ -31,6 +31,7 @@ import org.eclipse.ant.core.AntCorePlugin;
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.core.compiler.JETCompilerOptions;
import org.eclipse.jet.internal.builder.WorkspaceCompiler;
import org.eclipse.jet.internal.core.compiler.IJETCompiler;
@@ -81,14 +82,15 @@ public class JETCompileTask extends Task {
(IProgressMonitor) getProject().getReferences().get(AntCorePlugin.ECLIPSE_PROGRESS_MONITOR);
jetBuildProperties.put(JETCompilerOptions.OPTION_COMPILED_TEMPLATE_SRC_DIR, destdir);
log("destdir: " + destdir);
- IJETCompiler compiler = new WorkspaceCompiler(eclipseProject, null, monitor);
+ IJETCompiler compiler = new WorkspaceCompiler(eclipseProject, null, jetBuildProperties, monitor);
for (Iterator i = srcFilesets.iterator(); i.hasNext();) {
FileSet fileset = (FileSet) i.next();
final DirectoryScanner ds = fileset.getDirectoryScanner(getProject());
final String[] includedFiles = ds.getIncludedFiles();
for (int j = 0; j < includedFiles.length; j++) {
- log("Compiling: " + includedFiles[j], Project.MSG_INFO);
- compiler.compile(includedFiles[j]);
+ String templatePath = new Path(includedFiles[j]).toString();
+ log("Compiling: " + templatePath, Project.MSG_INFO);
+ compiler.compile(templatePath);
}
}
compiler.finish();
diff --git a/plugins/org.eclipse.jet/build.xml b/plugins/org.eclipse.jet/build.xml
new file mode 100644
index 0000000..4c3a575
--- /dev/null
+++ b/plugins/org.eclipse.jet/build.xml
@@ -0,0 +1,406 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.jet" default="build.jars" basedir=".">
+
+ <property name="basews" value="${ws}"/>
+ <property name="baseos" value="${os}"/>
+ <property name="basearch" value="${arch}"/>
+ <property name="basenl" value="${nl}"/>
+
+ <!-- Compiler settings. -->
+ <property name="javacFailOnError" value="false"/>
+ <property name="javacDebugInfo" value="on"/>
+ <property name="javacVerbose" value="false"/>
+ <property name="logExtension" value=".log"/>
+ <property name="compilerArg" value=""/>
+ <property name="javacSource" value="1.3"/>
+ <property name="javacTarget" value="1.2"/>
+ <condition property="dir_bootclasspath" value="${java.home}/../Classes">
+ <os family="mac"/>
+ </condition>
+ <property name="dir_bootclasspath" value="${java.home}/lib"/>
+ <path id="path_bootclasspath">
+ <fileset dir="${dir_bootclasspath}">
+ <include name="*.jar"/>
+ </fileset>
+ </path>
+ <property name="bootclasspath" refid="path_bootclasspath"/>
+ <condition property="bundleBootClasspath" value="${J2SE-1.4}">
+ <isset property="J2SE-1.4"/>
+ </condition>
+ <condition property="bundleJavacSource" value="1.3">
+ <isset property="J2SE-1.4"/>
+ </condition>
+ <condition property="bundleJavacTarget" value="1.2">
+ <isset property="J2SE-1.4"/>
+ </condition>
+ <property name="bundleJavacSource" value="${javacSource}"/>
+ <property name="bundleJavacTarget" value="${javacTarget}"/>
+ <property name="bundleBootClasspath" value="${bootclasspath}"/>
+
+ <target name="init" depends="properties">
+ <condition property="pluginTemp" value="${buildTempFolder}/plugins">
+ <isset property="buildTempFolder"/>
+ </condition>
+ <property name="pluginTemp" value="${basedir}"/>
+ <condition property="build.result.folder" value="${pluginTemp}/org.eclipse.jet_0.8.0.200705221113">
+ <isset property="buildTempFolder"/>
+ </condition>
+ <property name="build.result.folder" value="${basedir}"/>
+ <property name="temp.folder" value="${basedir}/temp.folder"/>
+ <property name="plugin.destination" value="${basedir}"/>
+ </target>
+
+ <target name="properties" if="eclipse.running">
+ <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+
+ </target>
+
+ <target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.jet for an update site.">
+ <delete dir="${temp.folder}"/>
+ <mkdir dir="${temp.folder}"/>
+ <antcall target="build.jars"/>
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${temp.folder}/"/>
+ </antcall>
+ <jar destfile="${plugin.destination}/org.eclipse.jet_0.8.0.200705221113.jar" basedir="${temp.folder}/org.eclipse.jet_0.8.0.200705221113" filesetmanifest="merge"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
+ <target name="@dot" depends="init" unless="@dot" description="Create jar: org.eclipse.jet @dot.">
+ <delete dir="${temp.folder}/@dot.bin"/>
+ <mkdir dir="${temp.folder}/@dot.bin"/>
+ <path id="@dot.classpath">
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.ant.core_3.1.200.v20070426.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.variables_3.2.0.v20070426.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.runtime_3.3.100.v20070409.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.osgi_3.3.0.v20070430.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.equinox.common_3.3.0.v20070426.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.jobs_3.3.0.v20070423.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/runtime_registry_compatibility.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.equinox.registry_3.3.0.v20070416.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.equinox.preferences_3.2.100.v20070409.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/@dot"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.contenttype_3.2.100.v20070319.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.100.v20070502.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.equinox.app_1.0.0.v20070423.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.osgi.services_3.1.100.v20060918.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/javax.servlet_2.4.0.v200704241052.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.resources_3.3.0.v20070430.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.resources.compatibility_3.2.100.v20070502.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.resources.win32_3.3.0.v20070226.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.expressions_3.3.0.v20070503-0800.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.filesystem_1.1.0.v20070430.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.filesystem.win32.x86_1.0.0.v20060603.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.debug.core_3.3.0.v20070502.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/com.ibm.icu_3.6.1.v20070417.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.emf.common_2.3.0.v200705020200.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.emf.codegen_2.3.0.v200705020200.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.core_3.3.0.v_755.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.compiler.apt_1.0.0.v20070502-1700.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.compiler.tool_1.0.0.v_755.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.text_3.3.0.v20070503-0800.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.commands_3.3.0.I20070502-1300a.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.team.core_3.2.100.I20070502.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.launching_3.3.0.v20070502.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.debug_3.3.0.v20070501/jdi.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.debug_3.3.0.v20070501/jdimodel.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.debug_3.3.0.v20070501/tools.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.emf.ecore_2.3.0.v200705020200.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.emf.ecore.xmi_2.3.0.v200705020200.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.filebuffers_3.3.0.v20070503-0800.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-antlr.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-bcel.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-bsf.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-log4j.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-oro.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-regexp.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-resolver.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-commons-logging.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-commons-net.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jai.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-javamail.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jdepend.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jmf.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jsch.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-junit.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-launcher.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-netrexx.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-nodeps.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-starteam.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-stylebook.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-swing.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-trax.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-weblogic.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.ui_3.3.0.I20070503-0010.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.swt_3.3.0.v3339b.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.swt.win32.win32.x86_3.3.0.v3339.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jface_3.3.0.I20070503-0010.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.ui.workbench_3.3.0.I20070503-0010.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010/@dot"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010/compatibility.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.help_3.3.0.v20070426.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jface.databinding_1.1.0.I20070501-0010.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.databinding_1.0.0.I20070501-0010.jar"/>
+ <pathelement path="../org.eclipse.jet.core/bin/"/>
+ <pathelement path="../org.eclipse.jet.core/@dot"/>
+ </path>
+ <!-- compile the source code -->
+ <javac destdir="${temp.folder}/@dot.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" >
+ <compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
+ <classpath refid="@dot.classpath" />
+ <src path="src/" />
+ <compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+ <compilerarg line="-log '${temp.folder}/@dot.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+ </javac>
+ <!-- Copy necessary resources -->
+ <copy todir="${temp.folder}/@dot.bin" failonerror="true" overwrite="false">
+ <fileset dir="src/">
+ <exclude name="**/*.java"/>
+ <exclude name="**/package.htm*"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${build.result.folder}"/>
+ <copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
+ <fileset dir="${temp.folder}/@dot.bin">
+ </fileset>
+ </copy>
+ <delete dir="${temp.folder}/@dot.bin"/>
+ </target>
+
+ <target name="src.zip" depends="init" unless="src.zip">
+ <mkdir dir="${build.result.folder}"/>
+ <zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
+ <fileset dir="src/">
+ <include name="**/*.java"/>
+ </fileset>
+ </zip>
+ </target>
+
+ <target name="jetant.jar" depends="init" unless="jetant.jar" description="Create jar: org.eclipse.jet jetant.jar.">
+ <delete dir="${temp.folder}/jetant.jar.bin"/>
+ <mkdir dir="${temp.folder}/jetant.jar.bin"/>
+ <path id="jetant.jar.classpath">
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.ant.core_3.1.200.v20070426.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.variables_3.2.0.v20070426.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.runtime_3.3.100.v20070409.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.osgi_3.3.0.v20070430.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.equinox.common_3.3.0.v20070426.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.jobs_3.3.0.v20070423.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/runtime_registry_compatibility.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316/@dot"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.equinox.registry_3.3.0.v20070416.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.equinox.preferences_3.2.100.v20070409.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.contenttype_3.2.100.v20070319.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.runtime.compatibility.auth_3.2.100.v20070502.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.equinox.app_1.0.0.v20070423.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.osgi.services_3.1.100.v20060918.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/javax.servlet_2.4.0.v200704241052.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.resources_3.3.0.v20070430.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.resources.compatibility_3.2.100.v20070502.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.resources.win32_3.3.0.v20070226.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.expressions_3.3.0.v20070503-0800.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.filesystem_1.1.0.v20070430.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.filesystem.win32.x86_1.0.0.v20060603.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.debug.core_3.3.0.v20070502.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/com.ibm.icu_3.6.1.v20070417.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.emf.common_2.3.0.v200705020200.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.emf.codegen_2.3.0.v200705020200.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.core_3.3.0.v_755.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.compiler.apt_1.0.0.v20070502-1700.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.compiler.tool_1.0.0.v_755.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.text_3.3.0.v20070503-0800.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.commands_3.3.0.I20070502-1300a.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.team.core_3.2.100.I20070502.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.launching_3.3.0.v20070502.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.debug_3.3.0.v20070501/jdi.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.debug_3.3.0.v20070501/jdimodel.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jdt.debug_3.3.0.v20070501/tools.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.emf.ecore_2.3.0.v200705020200.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.emf.ecore.xmi_2.3.0.v200705020200.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.filebuffers_3.3.0.v20070503-0800.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-antlr.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-bcel.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-bsf.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-log4j.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-oro.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-regexp.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-apache-resolver.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-commons-logging.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-commons-net.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jai.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-javamail.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jdepend.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jmf.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-jsch.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-junit.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-launcher.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-netrexx.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-nodeps.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-starteam.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-stylebook.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-swing.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-trax.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.apache.ant_1.7.0.v200704241635/lib/ant-weblogic.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.ui_3.3.0.I20070503-0010.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.swt_3.3.0.v3339b.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.swt.win32.win32.x86_3.3.0.v3339.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jface_3.3.0.I20070503-0010.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.ui.workbench_3.3.0.I20070503-0010.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010/@dot"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010/compatibility.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.help_3.3.0.v20070426.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.jface.databinding_1.1.0.I20070501-0010.jar"/>
+ <pathelement path="../../../testenv/smoke/ies0503/eclipse/plugins/org.eclipse.core.databinding_1.0.0.I20070501-0010.jar"/>
+ <pathelement path="../org.eclipse.jet.core/bin/"/>
+ <pathelement path="../org.eclipse.jet.core/@dot"/>
+ <pathelement path="${build.result.folder}/bin/"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.jet_0.8.0.200705221113/bin/"/>
+ <pathelement path="${build.result.folder}/@dot"/>
+ <pathelement path="${build.result.folder}/../org.eclipse.jet_0.8.0.200705221113/@dot"/>
+ </path>
+ <!-- compile the source code -->
+ <javac destdir="${temp.folder}/jetant.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" >
+ <compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
+ <classpath refid="jetant.jar.classpath" />
+ <src path="antsrc/" />
+ <compilerarg value="@${basedir}/javaCompiler.jetant.jar.args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+ <compilerarg line="-log '${temp.folder}/jetant.jar.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
+ </javac>
+ <!-- Copy necessary resources -->
+ <copy todir="${temp.folder}/jetant.jar.bin" failonerror="true" overwrite="false">
+ <fileset dir="antsrc/">
+ <exclude name="**/*.java"/>
+ <exclude name="**/package.htm*"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${build.result.folder}"/>
+ <jar destfile="${build.result.folder}/jetant.jar" basedir="${temp.folder}/jetant.jar.bin"/>
+ <delete dir="${temp.folder}/jetant.jar.bin"/>
+ </target>
+
+ <target name="jetantsrc.zip" depends="init" unless="jetantsrc.zip">
+ <mkdir dir="${build.result.folder}"/>
+ <zip destfile="${build.result.folder}/jetantsrc.zip" filesonly="false" whenempty="skip" update="false">
+ <fileset dir="antsrc/">
+ <include name="**/*.java"/>
+ </fileset>
+ </zip>
+ </target>
+
+ <target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.jet.">
+ <available property="@dot" file="${build.result.folder}/@dot"/>
+ <antcall target="@dot"/>
+ <available property="jetant.jar" file="${build.result.folder}/jetant.jar"/>
+ <antcall target="jetant.jar"/>
+ </target>
+
+ <target name="build.sources" depends="init">
+ <available property="src.zip" file="${build.result.folder}/src.zip"/>
+ <antcall target="src.zip"/>
+ <available property="jetantsrc.zip" file="${build.result.folder}/jetantsrc.zip"/>
+ <antcall target="jetantsrc.zip"/>
+ </target>
+
+ <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/org.eclipse.jet_0.8.0.200705221113"/>
+ <copy todir="${destination.temp.folder}/org.eclipse.jet_0.8.0.200705221113" failonerror="true" overwrite="false">
+ <fileset dir="${build.result.folder}">
+ <include name="jetant.jar"/>
+ </fileset>
+ </copy>
+ <copy todir="${destination.temp.folder}/org.eclipse.jet_0.8.0.200705221113" failonerror="true" overwrite="false">
+ <fileset dir="${build.result.folder}/@dot">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ <copy todir="${destination.temp.folder}/org.eclipse.jet_0.8.0.200705221113" failonerror="true" overwrite="false">
+ <fileset dir="${basedir}">
+ <include name="META-INF/"/>
+ <include name="plugin.xml"/>
+ <include name="schema/"/>
+ <include name="transforms/"/>
+ <include name="plugin.properties"/>
+ <include name="about.html"/>
+ <include name=".options"/>
+ <include name=".deprecations/"/>
+ <include name=".jetproperties"/>
+ <include name="jetant.jar"/>
+ <include name="about.ini"/>
+ <include name="about.mappings"/>
+ <include name="about.properties"/>
+ <include name="ModelingFeature.png"/>
+ </fileset>
+ </copy>
+ <eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.jet_0.8.0.200705221113" version="0.8.0.200705221113"/>
+ </target>
+
+ <target name="build.zips" depends="init">
+ </target>
+
+ <target name="gather.sources" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/org.eclipse.jet_0.8.0.200705221113"/>
+ <copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.jet_0.8.0.200705221113" failonerror="false" overwrite="false"/>
+ <copy file="${build.result.folder}/jetantsrc.zip" todir="${destination.temp.folder}/org.eclipse.jet_0.8.0.200705221113" failonerror="false" overwrite="false"/>
+ <copy todir="${destination.temp.folder}/org.eclipse.jet_0.8.0.200705221113" failonerror="false" overwrite="false">
+ <fileset dir="${basedir}">
+ <include name="templates/"/>
+ <include name="about.html"/>
+ <include name=".options"/>
+ <include name="META-INF/"/>
+ <include name="plugin.properties"/>
+ <include name="plugin.xml"/>
+ <include name="schema/"/>
+ <include name=".jetproperties"/>
+ <include name="build.properties"/>
+ <include name=".project"/>
+ <include name=".settings/"/>
+ <include name="antsrc/"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="gather.logs" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/org.eclipse.jet_0.8.0.200705221113"/>
+ <copy file="${temp.folder}/@dot.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.jet_0.8.0.200705221113" failonerror="false" overwrite="false"/>
+ <copy file="${temp.folder}/jetant.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.jet_0.8.0.200705221113" failonerror="false" overwrite="false"/>
+ </target>
+
+ <target name="clean" depends="init" description="Clean the plug-in: org.eclipse.jet of all the zips, jars and logs created.">
+ <delete dir="${build.result.folder}/@dot"/>
+ <delete file="${build.result.folder}/src.zip"/>
+ <delete file="${build.result.folder}/jetant.jar"/>
+ <delete file="${build.result.folder}/jetantsrc.zip"/>
+ <delete file="${plugin.destination}/org.eclipse.jet_0.8.0.200705221113.jar"/>
+ <delete file="${plugin.destination}/org.eclipse.jet_0.8.0.200705221113.zip"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
+ <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
+ <eclipse.convertPath fileSystemPath="C:/usr/workspaces/ws-m2t-jet-head/org.eclipse.jet" property="resourcePath"/>
+ <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
+ </target>
+
+ <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.jet.">
+ <delete dir="${temp.folder}"/>
+ <mkdir dir="${temp.folder}"/>
+ <antcall target="build.jars"/>
+ <antcall target="build.sources"/>
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${temp.folder}/"/>
+ </antcall>
+ <antcall target="gather.sources">
+ <param name="destination.temp.folder" value="${temp.folder}/"/>
+ </antcall>
+ <delete>
+ <fileset dir="${temp.folder}">
+ <include name="**/*.bin${logExtension}"/>
+ </fileset>
+ </delete>
+ <zip destfile="${plugin.destination}/org.eclipse.jet_0.8.0.200705221113.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
+</project>
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/JET2Compiler.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/JET2Compiler.java
index 8442380..c9b97bd 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/JET2Compiler.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/compiler/JET2Compiler.java
@@ -118,7 +118,7 @@ public class JET2Compiler
*/
public JET2Compiler(IProject project, Map options, IJETCompilerState compilerState, IProgressMonitor monitor)
{
- this.workspaceCompiler = new WorkspaceCompiler(project, null, monitor);
+ this.workspaceCompiler = new WorkspaceCompiler(project, null, options, monitor);
this.options = options == null ? JETCompilerOptions.getDefaultCompilerOptions() : options;
this.noCompiles = 0;
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/builder/WorkspaceCompiler.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/builder/WorkspaceCompiler.java
index f2f9069..f99c224 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/builder/WorkspaceCompiler.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/builder/WorkspaceCompiler.java
@@ -12,7 +12,7 @@
*
* </copyright>
*
- * $Id: WorkspaceCompiler.java,v 1.3 2007/05/09 19:10:28 pelder Exp $
+ * $Id: WorkspaceCompiler.java,v 1.4 2007/05/22 17:55:24 pelder Exp $
*/
package org.eclipse.jet.internal.builder;
@@ -83,8 +83,12 @@ public class WorkspaceCompiler implements IJETCompiler, ICompilerOutput, ITagLib
public WorkspaceCompiler(IProject project, Serializable savedState, IProgressMonitor monitor)
{
+ this(project, savedState, CompileOptionsManager.getOptions(project), monitor);
+ }
+
+ public WorkspaceCompiler(IProject project, Serializable savedState, Map options, IProgressMonitor monitor)
+ {
this.project = project;
- final Map options = CompileOptionsManager.getOptions(project);
final IJETBundleDescriptor descriptor = JET2Platform.getProjectDescription(project.getName());
final Builder builder = new SimplifiedCompiler.Builder(