Make webclient compile with Mozilla 1.6. Unit tests still don't run.
M README - update instructions for building and running source and unit tests M build.properties.sample - you need junit.jar M webclient/build-tests.xml - reformat M webclient/build.xml - add "prepare" target to set the PATH_SEP M webclient/src_ie/BookmarksImpl.cpp M webclient/src_ie/CurrentPageImpl.cpp M webclient/src_ie/HistoryImpl.cpp - Account for new javah header names M webclient/src_moz/Makefile.in - account for new location of jawt.lib in J2SDK 1.4.2 M webclient/src_moz/NativeEventThread.cpp +#include "nsEmbedAPI.h" // for NS_HandleEmbeddingEvent M webclient/src_moz/NavigationActionEvents.cpp - result is an nsIInputStream M webclient/src_moz/WrapperFactoryImpl.cpp +#include <nsDependentString.h> // for nsDependentCString and the compile is more strict now. M webclient/src_moz/dom_util.cpp - signature change git-svn-id: svn://10.0.0.236/trunk@153091 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -60,8 +60,24 @@
|
||||
<pathelement location="${build.home}"/>
|
||||
</path>
|
||||
|
||||
<target name="prepare">
|
||||
|
||||
<condition property="PATH_SEP" value=";">
|
||||
<and>
|
||||
<os family="windows" />
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
<condition property="PATH_SEP" value=":">
|
||||
<and>
|
||||
<os family="unix" />
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="main"
|
||||
depends="compile.classes_spec,compile.src_share,compile.src_moz,compile.src_ie,create.webclient.scripts"/>
|
||||
depends="prepare,compile.classes_spec,compile.src_share,compile.src_moz,compile.src_ie,create.webclient.scripts"/>
|
||||
|
||||
<target name="compile.classes_spec">
|
||||
|
||||
@@ -148,18 +164,15 @@
|
||||
</exec>
|
||||
<exec os="Windows 2000" dir="${basedir}/src_moz" executable="make"
|
||||
failonerror="yes"/>
|
||||
<exec os="Windows 2000" dir="${basedir}/src_moz" executable="make"
|
||||
failonerror="yes"/>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="compile.src_ie" depends="compile.src_share">
|
||||
|
||||
<!-- PENDING(edburns): re-enable IE support
|
||||
<exec os="Windows 2000" dir="${basedir}/src_ie" executable="make"
|
||||
failonerror="yes"/>
|
||||
|
||||
<exec os="Windows 2000" dir="${basedir}/src_ie" executable="make"
|
||||
failonerror="yes"/>
|
||||
-->
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user