Remove SWT references and related mac-specific changes from the build files.
ant test.hosted and test.web now works on a mac.
Patch by: amitmanjhi
Review by: fabbott, jat
git-svn-id: https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt@6207 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/common.ant.xml b/common.ant.xml
index 1e47100..33fda2e 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -95,33 +95,11 @@
</condition>
<fail unless="build.host.platform" message="Building on ${os.name} is not supported" />
- <condition property="junit.platform.args" value="-XstartOnFirstThread" else="">
- <isset property="build.host.ismac" />
- </condition>
-
<!-- JUnit support -->
<property name="gwt.dev.staging.jar" location="${gwt.build.staging}/gwt-${gwt.version}/gwt-dev.jar" />
<property name="gwt.junit.port" value="8888" />
<property name="gwt.junit.testcase.includes" value="**/*Suite.class"/>
- <!-- Headless mode keeps the hosted mode browser and log window
- from popping up during a unit test run. This is usually desirable,
- but the WebKit layout engine performs some optimizations in
- headless mode that causes some GWT unit tests to break. The
- solution for the time being is to turn off headless mode on
- the mac.
- -->
- <condition property="junit.headless">
- <not>
- <isset property="build.host.ismac" />
- </not>
- </condition>
- <condition property="junit.notheadless.arg" value="-notHeadless" else="">
- <not>
- <isset property="junit.headless" />
- </not>
- </condition>
-
<!-- Shared class paths -->
<path id="project.classpath.class">
<pathelement location="${javac.out}" />
@@ -202,12 +180,11 @@
<echo message="${javac.out} ${javac.junit.out}" />
<junit dir="@{test.out}" fork="yes" printsummary="yes"
failureproperty="junit.failure" tempdir="@{test.out}">
- <jvmarg line="${junit.platform.args}" />
<jvmarg line="-Xmx768m" />
<jvmarg value="-Demma.coverage.out.file=@{test.emma.coverage}/coverage.emma" />
<jvmarg value="-Demma.coverage.out.merge=true" />
- <sysproperty key="gwt.args" value="${junit.notheadless.arg} @{test.args}" />
- <sysproperty key="java.awt.headless" value="${junit.headless}" />
+ <sysproperty key="gwt.args" value="@{test.args}" />
+ <sysproperty key="java.awt.headless" value="true" />
<classpath>
<path refid="project.classpath.src" />
<pathelement location="${gwt.root}/${project.tail}/super" />
diff --git a/dev/common.ant.xml b/dev/common.ant.xml
index 10d9500..178bc62 100755
--- a/dev/common.ant.xml
+++ b/dev/common.ant.xml
@@ -10,7 +10,6 @@
<mkdir dir="${javac.out}" />
<gwt.javac>
<classpath>
- <pathelement location="${gwt.tools.lib}/eclipse/${gwt.dev.swt.jar}" />
<pathelement location="${gwt.core.build}/bin" />
<pathelement location="${gwt.core.build}/alldeps.jar" />
</classpath>
@@ -29,7 +28,6 @@
<fileset dir="${gwt.core.root}/super" excludes="**/package.html" />
<fileset dir="${javac.out}" />
<fileset dir="${gwt.core.build}/bin" />
- <fileset file="${gwt.tools.lib}/eclipse/${gwt.dev.swt.jar}" />
<fileset file="${gwt.core.build}/alldeps.jar" />
<fileset dir="${gwt.tools.soyc}/images"/>
<fileset file="${gwt.tools.soyc}/classLevel.css"/>
@@ -48,7 +46,6 @@
<fileset dir="${gwt.core.root}/super" excludes="**/package.html" />
<fileset dir="${javac.out}" />
<fileset dir="${gwt.core.build}/bin" />
- <zipfileset src="${gwt.tools.lib}/eclipse/${gwt.dev.swt.jar}" />
<zipfileset src="${gwt.core.build}/alldeps.jar" />
<zipfileset dir="${gwt.tools.soyc}/images" prefix="com/google/gwt/soyc/resources/images"/>
diff --git a/distro-source/linux/build.xml b/distro-source/linux/build.xml
index 1f483eb..b57a571 100755
--- a/distro-source/linux/build.xml
+++ b/distro-source/linux/build.xml
@@ -19,9 +19,6 @@
<!-- jni libs-->
<tarfileset dir="${gwt.build.jni}/${dist.platform}" prefix="${project.distname}" />
- <tarfileset dir="${gwt.tools.lib}/eclipse" prefix="${project.distname}">
- <include name="libswt-*gtk-3235.so" />
- </tarfileset>
<!-- raw files -->
<tarfileset dir="${dist.resources}" prefix="${project.distname}" mode="755">
diff --git a/distro-source/mac/build.xml b/distro-source/mac/build.xml
index e2e947e..7821d24 100755
--- a/distro-source/mac/build.xml
+++ b/distro-source/mac/build.xml
@@ -19,11 +19,6 @@
<!-- jni libs-->
<tarfileset dir="${gwt.build.jni}/${dist.platform}" prefix="${project.distname}" />
- <tarfileset dir="${gwt.tools.lib}/eclipse" prefix="${project.distname}">
- <include name="libswt-*carbon-3235.jnilib" />
- <!-- Use our modified version instead of this stock version -->
- <exclude name="libswt-webkit-carbon-3235.jnilib" />
- </tarfileset>
<!-- raw files -->
<tarfileset dir="${dist.resources}" prefix="${project.distname}" mode="755">
diff --git a/distro-source/windows/build.xml b/distro-source/windows/build.xml
index 68bf5ed..9feba0b 100755
--- a/distro-source/windows/build.xml
+++ b/distro-source/windows/build.xml
@@ -19,9 +19,6 @@
<!-- jni libs-->
<zipfileset dir="${gwt.build.jni}/${dist.platform}" prefix="${project.distname}" />
- <zipfileset dir="${gwt.tools.lib}/eclipse" prefix="${project.distname}">
- <include name="swt-*win32-3235.dll" />
- </zipfileset>
<!-- raw files -->
<zipfileset dir="${dist.resources}" prefix="${project.distname}" />
