Revision: 6207 Author: [email protected] Date: Thu Sep 24 13:55:42 2009 Log: 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 http://code.google.com/p/google-web-toolkit/source/detail?r=6207 Modified: /branches/farewellSwt/common.ant.xml /branches/farewellSwt/dev/common.ant.xml /branches/farewellSwt/distro-source/linux/build.xml /branches/farewellSwt/distro-source/mac/build.xml /branches/farewellSwt/distro-source/windows/build.xml ======================================= --- /branches/farewellSwt/common.ant.xml Sun Sep 20 12:33:31 2009 +++ /branches/farewellSwt/common.ant.xml Thu Sep 24 13:55:42 2009 @@ -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.fi...@{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" /> ======================================= --- /branches/farewellSwt/dev/common.ant.xml Fri Aug 21 10:48:30 2009 +++ /branches/farewellSwt/dev/common.ant.xml Thu Sep 24 13:55:42 2009 @@ -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"/> ======================================= --- /branches/farewellSwt/distro-source/linux/build.xml Thu Mar 19 20:38:51 2009 +++ /branches/farewellSwt/distro-source/linux/build.xml Thu Sep 24 13:55:42 2009 @@ -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"> ======================================= --- /branches/farewellSwt/distro-source/mac/build.xml Thu Mar 19 20:38:51 2009 +++ /branches/farewellSwt/distro-source/mac/build.xml Thu Sep 24 13:55:42 2009 @@ -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"> ======================================= --- /branches/farewellSwt/distro-source/windows/build.xml Thu Mar 19 20:38:51 2009 +++ /branches/farewellSwt/distro-source/windows/build.xml Thu Sep 24 13:55:42 2009 @@ -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}" /> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
