3d7dee72f2
Author: Ron Capelli <capelli@acm.org>
The following files are updated to allow use of IBM Java 1.3.x
JVMs on Linux. Instead of statically linking libjawt.lib, the
code now dynamically links libjawt.so and then libawt.so only
if needed (similar to previous change for win32). It should
work on Solaris, but we couldn't test that here.
mozilla/java/webclient/src_moz/Makefile.in
mozilla/java/webclient/src_moz/gtk/GtkBrowserControlCanvas.cpp
The following files are changed to support the ant 'clean'
target for src_ie.
mozilla/java/webclient/build.xml
mozilla/java/webclient/src_ie/Makefile.in
The following files are changed to disable the CurrentPage(2)
interface for IE, since it will be a while before that can be
made to work. With these changes, IE embeds smoothly with
Navigation and History interfaces working nicely to some degree.
mozilla/java/webclient/src_ie/WrapperFactoryImpl.cpp
mozilla/java/webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java
The following file is changed so that it does not depend on
Mozilla, allowing it to be shared cleanly for IE.
mozilla/java/webclient/src_moz/win32/Win32BrowserControlCanvas.cpp
The following file is changed to correct the list of makefiles
that need to be configured for Webclient.
mozilla/java/makefiles
Finally, please delete the following files from CVS.
mozilla/java/webclient/src_ie/build.xml
mozilla/java/webclient/src_ie/Makefile.win
git-svn-id: svn://10.0.0.236/trunk@142382 18797224-902f-48f8-a5cc-f745e15eee43
322 lines
11 KiB
XML
322 lines
11 KiB
XML
<?xml version="1.0"?>
|
|
|
|
<!--
|
|
|
|
* The contents of this file are subject to the Netscape Public
|
|
* License Version 1.1 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.mozilla.org/NPL/
|
|
*
|
|
* Software distributed under the License is distributed on an "AS
|
|
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
* implied. See the License for the specific language governing
|
|
* rights and limitations under the License.
|
|
*
|
|
* The Original Code is mozilla.org code.
|
|
*
|
|
* The Initial Developer of the Original Code is Netscape
|
|
* Communications Corporation. Portions created by Netscape are
|
|
* Copyright (C) 1998 Netscape Communications Corporation. All
|
|
* Rights Reserved.
|
|
*
|
|
* Contributor(s):
|
|
|
|
* Ed Burns >edburns@acm.org<
|
|
|
|
|
|
-->
|
|
|
|
<project name="webclient" default="main" basedir=".">
|
|
|
|
<property name="Name" value="webclient"/>
|
|
<property name="name" value="webclient"/>
|
|
<property name="version" value="20020916"/>
|
|
|
|
<!-- ************ Per user local properties ******************************* -->
|
|
|
|
<property file="${user.home}/build.properties"/> <!-- User local -->
|
|
<property file="build.properties"/> <!-- Component local -->
|
|
<property file="../build.properties"/> <!-- java-supplement local -->
|
|
<property environment="myenv" />
|
|
|
|
<!-- ************ Compiler Defaults *************************************** -->
|
|
|
|
<!-- Should Java compilations set the 'debug' compiler option? -->
|
|
<property name="compile.debug" value="true"/>
|
|
|
|
<!-- Should Java compilations set the 'deprecation' compiler option? -->
|
|
<property name="compile.deprecation" value="false"/>
|
|
|
|
<!-- Should Java compilations set the 'optimize' compiler option? -->
|
|
<property name="compile.optimize" value="false"/>
|
|
|
|
<!-- ************ Where are we building into? ***************************** -->
|
|
|
|
<!-- The base directory for component sources -->
|
|
<property name="source.home" value="${basedir}/classes_spec"/>
|
|
|
|
<!-- Construct compile classpath -->
|
|
<path id="compile.classpath">
|
|
<pathelement location="${build.home}"/>
|
|
</path>
|
|
|
|
<target name="main"
|
|
depends="compile.classes_spec,compile.src_share,compile.src_moz,compile.src_ie,create.webclient.scripts"/>
|
|
|
|
<target name="compile.classes_spec">
|
|
|
|
<javac destdir="${build.home}"
|
|
debug="${compile.debug}"
|
|
deprecation="${compile.deprecation}"
|
|
optimize="${compile.optimize}">
|
|
<classpath refid="compile.classpath"/>
|
|
<src path="${source.home}"/>
|
|
<patternset>
|
|
<include name="org/mozilla/webclient/wrapper_native/gtk/*"
|
|
if="build.unix.classes"/>
|
|
</patternset>
|
|
<patternset>
|
|
<include name="org/mozilla/webclient/wrapper_native/win32/*"
|
|
if="build.win32.classes"/>
|
|
</patternset>
|
|
|
|
<!-- PENDING(edburns): include additional patternsets for ICE,
|
|
HotJava, etc -->
|
|
|
|
<include name="org/mozilla/webclient/*"/>
|
|
<include name="org/mozilla/webclient/wrapper_native/*"/>
|
|
<include name="org/mozilla/webclient/test/*"/>
|
|
</javac>
|
|
|
|
</target>
|
|
|
|
<target name="compile.src_share" depends="compile.javah.headers">
|
|
|
|
<exec os="SunOS" dir="${basedir}/src_share" failonerror="yes"
|
|
executable="gmake"/>
|
|
<exec os="Linux" dir="${basedir}/src_share" failonerror="yes"
|
|
executable="make"/>
|
|
<exec os="Windows 2000" dir="${basedir}/src_share" executable="make"
|
|
failonerror="yes"/>
|
|
|
|
</target>
|
|
|
|
<target name="compile.javah.headers" depends="compile.javah.canvas.headers">
|
|
|
|
<javah outputFile="${basedir}/src_share/BookmarksImpl.h"
|
|
class="org.mozilla.webclient.wrapper_native.BookmarksImpl">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
<javah outputFile="${basedir}/src_share/PreferencesImpl.h"
|
|
class="org.mozilla.webclient.wrapper_native.PreferencesImpl">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
<javah outputFile="${basedir}/src_share/CurrentPageImpl.h"
|
|
class="org.mozilla.webclient.wrapper_native.CurrentPageImpl">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
<javah outputFile="${basedir}/src_share/HistoryImpl.h"
|
|
class="org.mozilla.webclient.wrapper_native.HistoryImpl">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
<javah outputFile="${basedir}/src_share/WrapperFactoryImpl.h"
|
|
class="org.mozilla.webclient.wrapper_native.WrapperFactoryImpl">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
<javah outputFile="${basedir}/src_share/NavigationImpl.h"
|
|
class="org.mozilla.webclient.wrapper_native.NavigationImpl">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
<javah outputFile="${basedir}/src_share/RDFEnumeration.h"
|
|
class="org.mozilla.webclient.wrapper_native.RDFEnumeration">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
<javah outputFile="${basedir}/src_share/RDFTreeNode.h"
|
|
class="org.mozilla.webclient.wrapper_native.RDFTreeNode">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
<javah outputFile="${basedir}/src_share/ISupportsPeer.h"
|
|
class="org.mozilla.webclient.wrapper_native.ISupportsPeer">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
<javah outputFile="${basedir}/src_share/WindowControlImpl.h"
|
|
class="org.mozilla.webclient.wrapper_native.WindowControlImpl">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
<javah outputFile="${basedir}/src_share/NativeEventThread.h"
|
|
class="org.mozilla.webclient.wrapper_native.NativeEventThread">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
</target>
|
|
|
|
<target name="compile.javah.canvas.headers"
|
|
depends="compile.unix.canvas.headers,compile.win32.canvas.headers"/>
|
|
|
|
<target name="compile.unix.canvas.headers" if="build.unix.classes">
|
|
|
|
<javah outputFile="${basedir}/src_moz/gtk/GtkBrowserControlCanvas.h"
|
|
class="org.mozilla.webclient.wrapper_native.gtk.GtkBrowserControlCanvas">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
|
|
</target>
|
|
|
|
<target name="compile.win32.canvas.headers" if="build.win32.classes">
|
|
|
|
<javah outputFile="${basedir}/src_moz/win32/Win32BrowserControlCanvas.h"
|
|
class="org.mozilla.webclient.wrapper_native.win32.Win32BrowserControlCanvas">
|
|
<classpath refid="compile.classpath"/>
|
|
</javah>
|
|
|
|
</target>
|
|
|
|
|
|
|
|
<target name="compile.src_moz" depends="compile.src_share">
|
|
|
|
<exec os="SunOS" dir="${basedir}/src_moz" executable="gmake"
|
|
failonerror="yes">
|
|
</exec>
|
|
<exec os="Linux" dir="${basedir}/src_moz" executable="make"
|
|
failonerror="yes">
|
|
</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">
|
|
|
|
<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>
|
|
|
|
<target name="create.webclient.scripts"
|
|
depends="create.win32.webclient.scripts,create.unix.webclient.scripts"/>
|
|
|
|
<target name="create.win32.webclient.scripts"
|
|
if="build.win32.classes">
|
|
|
|
<condition property="debug.options" value="-Xdebug -Xrunjdwp:transport=dt_shmem,address=jdbconn,server=y,suspend=n">
|
|
<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.bat">set CLASSPATH=${build.home};%CLASSPATH%
|
|
set PATH=%PATH%;${build.home}\..\bin;${build.home}\..\bin\components;${myenv.MOZ_JDKHOME}\jre\bin
|
|
${myenv.MOZ_JDKHOME}/bin/java ${debug.options} org.mozilla.webclient.test.EmbeddedMozillaImpl ${build.home}\..\bin %1%
|
|
</echo>
|
|
</target>
|
|
|
|
<target name="create.unix.webclient.scripts"
|
|
if="build.unix.classes">
|
|
|
|
<condition property="debug.options" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n">
|
|
<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">
|
|
|
|
<ant antfile="build-tests.xml" target="clean"/>
|
|
|
|
<exec os="SunOS" dir="${basedir}/src_moz" executable="gmake"
|
|
failonerror="yes">
|
|
|
|
<arg line="clobber_all"/>
|
|
|
|
</exec>
|
|
<exec os="Linux" dir="${basedir}/src_moz" executable="make"
|
|
failonerror="yes">
|
|
|
|
<arg line="clobber_all"/>
|
|
|
|
</exec>
|
|
<exec os="Windows 2000" dir="${basedir}/src_moz" executable="make"
|
|
failonerror="yes">
|
|
<arg line="clobber_all"/>
|
|
</exec>
|
|
<!--
|
|
<exec os="Windows 2000" dir="${basedir}/src_ie" executable="make"
|
|
failonerror="yes">
|
|
<arg line="clean"/>
|
|
</exec>
|
|
-->
|
|
|
|
<exec os="SunOS" dir="${basedir}/src_share" executable="gmake"
|
|
failonerror="yes">
|
|
|
|
<arg line="clobber_all"/>
|
|
|
|
</exec>
|
|
<exec os="Linux" dir="${basedir}/src_share" executable="make"
|
|
failonerror="yes">
|
|
|
|
<arg line="clobber_all"/>
|
|
|
|
</exec>
|
|
<exec os="Windows 2000" dir="${basedir}/src_share" executable="make"
|
|
failonerror="yes">
|
|
<arg line="clobber_all"/>
|
|
</exec>
|
|
|
|
<delete >
|
|
<fileset dir="${basedir}/src_share">
|
|
<include name="*.h"/>
|
|
<exclude name="bal_util.h"/>
|
|
<exclude name="jni_util_export.h"/>
|
|
<exclude name="jni_util.h"/>
|
|
</fileset>
|
|
</delete>
|
|
|
|
<delete >
|
|
<fileset dir="${basedir}/src_moz">
|
|
<include name="*.ilk"/>
|
|
</fileset>
|
|
</delete>
|
|
|
|
|
|
<delete file="${basedir}/src_moz/gtk/GtkBrowserControlCanvas.h"/>
|
|
<delete file="${basedir}/src_moz/win32/Win32BrowserControlCanvas.h"/>
|
|
|
|
|
|
<delete dir="${build.home}/org/mozilla/webclient"/>
|
|
|
|
<delete >
|
|
<fileset dir="${basedir}/src_ie">
|
|
<include name="*.ilk"/>
|
|
</fileset>
|
|
</delete>
|
|
|
|
</target>
|
|
|
|
<target name="run.test" depends="main" description="Run unit tests">
|
|
|
|
<ant antfile="build-tests.xml" target="run.test"/>
|
|
|
|
</target>
|
|
|
|
</project>
|