Try to repair export-ecj.xml
+ configurable using -Dbin=... to switch headless<->IDE builds
diff --git a/org.eclipse.jdt.core/scripts/export-ecj.xml b/org.eclipse.jdt.core/scripts/export-ecj.xml
index 379665b..ddaf987 100644
--- a/org.eclipse.jdt.core/scripts/export-ecj.xml
+++ b/org.eclipse.jdt.core/scripts/export-ecj.xml
@@ -68,17 +68,18 @@
<property name="ecj-temp-src-folder" value="${basedir}/ecj-temp-src-folder" />
<mkdir dir="${ecj-temp-src-folder}" />
<mkdir dir="${ecj-temp-folder}"/>
+ <property name="bin" value="@dot"/>
</target>
<target name="extract-batch-compiler" depends="init">
- <property name="target.folder" value="${basedir}/bin"/>
+ <property name="target.folder" value="${basedir}/../org.eclipse.jdt.core.compiler.batch/${bin}"/>
<replace file="${target.folder}/org/eclipse/jdt/internal/compiler/batch/messages.properties" token="bundle_qualifier" value="${bundleVersionQualifer}"/>
<!-- {ObjectTeams: more replacement (strategy no longer maintained in JDT?) -->
<replace file="${target.folder}/org/eclipse/jdt/internal/compiler/batch/messages.properties" token="bundle_version" value="${bundleVersionMajor}.${bundleVersionMinor}.${bundleVersionService}"/>
<!-- SH}-->
- <echo message="Extract .class file and properties for the batch compiler" />
+ <echo message="Extract .class file and properties for the batch compiler to ${ecj-temp-folder}" />
<copy todir="${ecj-temp-folder}">
- <fileset dir="${basedir}/../org.eclipse.jdt.core.compiler.batch_${bundleVersion}/bin"> <!--{ObjectTeams : changed from target/classes SH} -->
+ <fileset dir="${basedir}/../org.eclipse.jdt.core.compiler.batch/${bin}"> <!--{ObjectTeams : changed from target/classes SH} -->
<include name="org/eclipse/jdt/internal/compiler/**"/>
<include name="org/eclipse/jdt/core/compiler/**"/>
<!--{ObjectTeams:-->
@@ -102,54 +103,20 @@
<exclude name="org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter*.class"/>
</fileset>
</copy>
-<!-- {ObjectTeams: add apt and tool: -->
- <property name="compiler.apt" value="${build.root.dir}/eclipse/plugins/${jdt.compiler.apt}"/>
- <echo message="compiler.apt=${compiler.apt}"/>
- <unzip src="${compiler.apt}" dest="${ecj-temp-folder}">
- <patternset>
- <include name="**/*.class"/>
- <include name="**/*.properties"/>
- </patternset>
- </unzip>
- <property name="compiler.tool" value="${build.root.dir}/eclipse/plugins/${jdt.compiler.tool}"/>
- <echo message="compiler.tool=${compiler.tool}"/>
- <unzip src="${compiler.tool}" dest="${ecj-temp-folder}">
- <patternset>
- <include name="**/*.class"/>
- <include name="**/*.properties"/>
- </patternset>
- </unzip>
-<!-- SH} -->
- </target>
-
- <target name="extract-_jsr199" depends="init">
- <property name="target.folder" value="${basedir}/../org.eclipse.jdt.compiler.tool/bin"/>
- <echo message="Extract .class file and properties for the jsr199" />
- <copy todir="${ecj-temp-folder}" failonerror="false">
- <fileset dir="${target.folder}"/>
- </copy>
- </target>
-
- <target name="extract-_jsr269" depends="init">
- <property name="jsr_project" value="org.eclipse.jdt.compiler.apt"/>
- <property name="target.folder" value="${basedir}/../org.eclipse.jdt.compiler.apt/bin"/>
- <echo message="Extract .class file and properties for the jsr269" />
- <copy todir="${ecj-temp-folder}" failonerror="false">
- <fileset dir="${target.folder}"/>
- </copy>
</target>
<target name="extract-ant-adapter-compiler" depends="init">
<property name="target.folder" value="${basedir}/antbin"/>
- <echo message="Extract .class file and properties for the ant adapter" />
+ <echo message="Extract .class file and properties for the ant adapter to ${ecj-temp-folder}" />
<mkdir dir="${ecj-temp-folder}"/>
<copy todir="${ecj-temp-folder}">
<fileset dir="${target.folder}">
<exclude name="org/eclipse/jdt/core/CheckDebugAttributes*.*"/>
<exclude name="org/eclipse/jdt/core/BuildJarIndex*.*"/>
</fileset>
- <fileset dir="${basedir}/../org.eclipse.jdt.core.compiler.batch_${bundleVersion}/bin"> <!--{ObjectTeams : changed from target/classes SH} -->
+ <fileset dir="${basedir}/../org.eclipse.jdt.core.compiler.batch/${bin}"> <!--{ObjectTeams : changed from target/classes SH} -->
<include name="org/eclipse/jdt/internal/antadapter/*.*"/>
+ <include name="org/eclipse/jdt/core/JDTCompilerAdapter*.*"/>
</fileset>
</copy>
</target>
@@ -188,15 +155,12 @@
<replace file="${ecj-temp-src-folder}/scripts/binary/META-INF/MANIFEST.MF" token="qualifier" value="${bundleVersionQualifer}"/>
<zip zipfile="${dest}/ecjsrc-${buildLabel}.jar">
<zipfileset dir="ecj-temp-src-folder" />
- <zipfileset dir="batch">
- <exclude name="org/eclipse/jdt/internal/compiler/batch/messages.properties"/>
- </zipfileset>
<fileset dir="${ecj-temp-folder}">
<include name="**/messages.properties"/>
<include name="ecj.1"/>
</fileset>
- <zipfileset dir="compiler" />
- <zipfileset dir="antadapter">
+ <zipfileset dir="${basedir}/../org.eclipse.jdt.core.compiler.batch/${bin}">
+ <exclude name="org/eclipse/jdt/internal/compiler/batch/messages.properties"/>
<exclude name="org/eclipse/jdt/core/CheckDebugAttributes.java"/>
<exclude name="org/eclipse/jdt/core/BuildJarIndex.java"/>
</zipfileset>
@@ -221,9 +185,7 @@
<replace file="${ecj-temp-folder}/META-INF/MANIFEST.MF" token="qualifier" value="${bundleVersionQualifer}"/>
<copy todir="${ecj-temp-src-folder}/src">
- <fileset dir="batch" />
- <fileset dir="compiler" />
- <fileset dir="antadapter">
+ <fileset dir="${basedir}/../org.eclipse.jdt.core.compiler.batch/src">
<exclude name="org/eclipse/jdt/core/CheckDebugAttributes.java"/>
<exclude name="org/eclipse/jdt/core/BuildJarIndex.java"/>
</fileset>
@@ -253,8 +215,6 @@
<target name="export-all" depends="init">
<antcall target="extract-batch-compiler"/>
<antcall target="extract-ant-adapter-compiler"/>
- <antcall target="extract-_jsr199"/>
- <antcall target="extract-_jsr269"/>
<antcall target="export_src_bin"/>
<antcall target="export"/>
<antcall target="cleanup"/>