Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Checkpoint for mac os x reactivation.

Browse Source 
Having trouble with the implementation of getHandleToPeer.

Current problem is that JAWT_DrawingSurface->Lock() is failing.

Why would that be?


git-svn-id: svn://10.0.0.236/trunk@173357 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2005-05-13 06:40:12 +00:00
parent 16ed34f985
commit ba350c1664
19 changed files with 378 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mozilla/java/webclient/build.xml
View File

@@ -89,10 +89,17 @@
<src path="${source.home}"/>
<patternset>
<exclude name="**/Win32*.java" if="build.unix.classes"/>
<exclude name="**/Cocoa*.java" if="build.unix.classes"/>
</patternset>
<patternset>
<exclude name="**/Gtk*.java" if="build.win32.classes"/>
<exclude name="**/Cocoa*.java" if="build.win32.classes"/>
</patternset>
<patternset>
<exclude name="**/Gtk*.java" if="build.mac.classes"/>
<exclude name="**/Win32*.java" if="build.mac.classes"/>
</patternset>
<!-- PENDING(edburns): include additional patternsets for ICE,
@@ -130,7 +137,7 @@
</target>
<target name="compile.javah.canvas.headers"
depends="compile.unix.canvas.headers,compile.win32.canvas.headers"/>
depends="compile.unix.canvas.headers,compile.win32.canvas.headers,compile.mac.canvas.headers"/>
<target name="compile.unix.canvas.headers" if="build.unix.classes">
@@ -150,6 +157,14 @@
</target>
<target name="compile.mac.canvas.headers" if="build.mac.classes">
<javah destdir="${basedir}/src_moz/cocoa"
class="org.mozilla.webclient.impl.wrapper_native.CocoaBrowserControlCanvas">
<classpath refid="compile.classpath"/>
</javah>
</target>
<target name="compile.src_moz" depends="compile.src_share">
@@ -160,6 +175,9 @@
<exec os="Linux" dir="${basedir}/src_moz" executable="make"
failonerror="yes">
</exec>
<exec os="Mac OS X" dir="${basedir}/src_moz" executable="make"
failonerror="yes">
</exec>
<exec os="Windows 2000" dir="${basedir}/src_moz" executable="make"
failonerror="yes"/>
@@ -215,6 +233,26 @@ ${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.Embedd
</target>
<target name="create.mac.webclient.scripts"
if="build.mac.classes">
<condition property="debug.options" value="${debug.jvm.args}">
<equals arg1="${myenv.MOZ_DEBUG}" arg2="1"/>
</condition>
<condition property="debug.options" value="">
<not>
<equals arg1="${myenv.MOZ_DEBUG}" arg2="1"/>
</not>
</condition>
<echo file="${basedir}/src_moz/runem">export CLASSPATH=${build.home}:$CLASSPATH
export LD_LIBRARY_PATH=${build.home}/../bin:${build.home}/../bin/components:$LD_LIBRARY_PATH:;${myenv.MOZ_JDKHOME}/jre/bin
${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.EmbeddedMozillaImpl ${build.home}/../bin $*
</echo>
<chmod perm="755" file="${basedir}/src_moz/runem"/>
</target>
<target name="clean.classes_spec">
<delete dir="${build.home}/org/mozilla/webclient"/>
</target>