2004-09-29 23:53:55 +04:00
|
|
|
<?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<
|
|
|
|
|
|
|
|
|
|
|
|
-->
|
|
|
|
|
2007-02-16 22:57:59 +03:00
|
|
|
<project name="webclient" default="release" basedir=".">
|
2004-09-29 23:53:55 +04:00
|
|
|
|
|
|
|
<property name="Name" value="webclient"/>
|
|
|
|
<property name="name" value="webclient"/>
|
2005-08-21 05:23:11 +04:00
|
|
|
<property name="version" value="2_0_a5"/>
|
2004-09-29 23:53:55 +04:00
|
|
|
|
|
|
|
<!-- ************ 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" />
|
|
|
|
|
2007-02-16 22:57:59 +03:00
|
|
|
<property name="dist.home" value="${objdir}/${name}" />
|
2005-03-15 05:49:16 +03:00
|
|
|
<property name="dist.javadocs" value="${dist.home}/javadocs" />
|
2004-10-10 07:38:04 +04:00
|
|
|
<property name="source.home" value="${basedir}/.." />
|
2007-02-16 22:57:59 +03:00
|
|
|
<property name="moz.dist" value="${objdir}/dist" />
|
|
|
|
<property name="dist.classes" value="${moz.dist}/classes" />
|
2005-03-15 05:49:16 +03:00
|
|
|
<property name="javadoc.private" value="false"/>
|
|
|
|
<property name="javadoc.protected" value="true"/>
|
2007-02-16 22:57:59 +03:00
|
|
|
<property name="dist.jar" value="${dist.home}/lib/${name}-${version}.jar"/>
|
2005-03-15 05:49:16 +03:00
|
|
|
|
2007-02-16 22:57:59 +03:00
|
|
|
<target name="release">
|
2005-03-15 05:49:16 +03:00
|
|
|
|
2007-02-16 22:57:59 +03:00
|
|
|
<antcall target="prepare" />
|
|
|
|
<antcall target="uptodate.core.java.classes" />
|
|
|
|
<antcall target="compile.all" />
|
|
|
|
<antcall target="build.dist.jar" />
|
|
|
|
<antcall target="copy.binaries" />
|
|
|
|
<antcall target="copy.samples.src" />
|
2007-02-19 21:32:42 +03:00
|
|
|
<antcall target="copy.build.support" />
|
2007-02-16 22:57:59 +03:00
|
|
|
|
|
|
|
</target>
|
|
|
|
|
|
|
|
<target name="clean">
|
|
|
|
<delete dir="${dist.home}" />
|
|
|
|
</target>
|
|
|
|
|
|
|
|
<target name="prepare">
|
|
|
|
<mkdir dir="${dist.home}" />
|
|
|
|
<mkdir dir="${dist.home}/lib" />
|
|
|
|
<mkdir dir="${dist.home}/bin" />
|
|
|
|
<mkdir dir="${dist.home}/javadocs" />
|
|
|
|
<mkdir dir="${dist.home}/samples" />
|
2004-09-29 23:53:55 +04:00
|
|
|
|
|
|
|
<condition property="so.prefix" value="">
|
|
|
|
<and>
|
|
|
|
<os family="windows" />
|
|
|
|
</and>
|
|
|
|
</condition>
|
|
|
|
|
|
|
|
<condition property="so.prefix" value="lib">
|
|
|
|
<and>
|
|
|
|
<os family="unix" />
|
|
|
|
</and>
|
|
|
|
</condition>
|
|
|
|
|
|
|
|
<condition property="so.extension" value="dll">
|
|
|
|
<and>
|
|
|
|
<os family="windows" />
|
|
|
|
</and>
|
|
|
|
</condition>
|
|
|
|
|
|
|
|
<condition property="so.extension" value="so">
|
|
|
|
<and>
|
|
|
|
<os family="unix" />
|
|
|
|
</and>
|
|
|
|
</condition>
|
|
|
|
|
2004-10-15 20:39:07 +04:00
|
|
|
<condition property="platform" value="win32">
|
|
|
|
<and>
|
|
|
|
<os family="windows" />
|
|
|
|
</and>
|
|
|
|
</condition>
|
|
|
|
|
|
|
|
<condition property="platform" value="linux">
|
|
|
|
<and>
|
|
|
|
<os family="unix" />
|
|
|
|
</and>
|
|
|
|
</condition>
|
2005-03-15 05:49:16 +03:00
|
|
|
|
|
|
|
</target>
|
|
|
|
|
2004-10-15 20:39:07 +04:00
|
|
|
|
2007-02-16 22:57:59 +03:00
|
|
|
<target name="uptodate.core.java.classes">
|
|
|
|
<uptodate property="core.java.classes.uptodate"
|
|
|
|
targetfile="${dist.jar}">
|
|
|
|
<srcfiles dir="${dist.classes}" />
|
|
|
|
</uptodate>
|
2007-02-19 21:32:42 +03:00
|
|
|
<echo message="java classes up to date: ${core.java.classes.uptodate}" />
|
2004-09-29 23:53:55 +04:00
|
|
|
</target>
|
|
|
|
|
2007-02-16 22:57:59 +03:00
|
|
|
<target name="build.dist.jar">
|
|
|
|
<jar jarfile="${dist.jar}" >
|
2004-09-29 23:53:55 +04:00
|
|
|
<manifest>
|
|
|
|
<attribute name="Specification-Title" value="${Name}"/>
|
|
|
|
<attribute name="Specification-Version" value="2.0"/>
|
|
|
|
<attribute name="Implementation-Title" value="'${name}': ${Name}"/>
|
|
|
|
<attribute name="Implementation-Version" value="${version}"/>
|
|
|
|
<attribute name="Implementation-Vendor" value="mozilla.org"/>
|
|
|
|
<attribute name="Implementation-Vendor-Id" value="org.mozilla"/>
|
|
|
|
<attribute name="Extension-Name" value="org.mozilla.webclient"/>
|
|
|
|
</manifest>
|
|
|
|
|
2007-02-16 22:57:59 +03:00
|
|
|
<fileset dir="${dist.classes}"
|
2004-09-29 23:53:55 +04:00
|
|
|
excludes="**/test/**" />
|
|
|
|
</jar>
|
2004-10-10 07:38:04 +04:00
|
|
|
</target>
|
|
|
|
|
2007-02-19 21:32:42 +03:00
|
|
|
<target name="compile.all" unless="core.java.classes.uptodate"
|
|
|
|
depends="uptodate.core.java.classes">
|
2007-02-16 22:57:59 +03:00
|
|
|
<ant inheritAll="false" dir="${source.home}" />
|
This checkin removes bookmarks support from webclient by not
initializing the bookmarks engine. Next step is to work with the
mozilla embedding people to see how I can fix this. What I'd like to do
is *NOT* use the GRE, but rather use the mozilla suite installation.
SECTION: Changes
M dist/build.xml
- rename release to 2_0_a2b
- made the test run from the mozilla suite installation directory
- clean out the generated batch file or sh file.
M dist/webclient-dist.xml
- made the build.xml generate a batch file, that sets the proper env
vars, then calls back to this build.xml and executes the
run.test.browser target.
M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java
- don't pull in Bookmarks, since it's not in the GRE.
SECTION: Diffs
Index: dist/build.xml
===================================================================
RCS file: /cvsroot/mozilla/java/dist/build.xml,v
retrieving revision 1.4
diff -u -r1.4 build.xml
--- dist/build.xml 15 Oct 2004 16:39:07 -0000 1.4
+++ dist/build.xml 18 Oct 2004 14:03:36 -0000
@@ -30,7 +30,7 @@
<property name="Name" value="webclient"/>
<property name="name" value="webclient"/>
- <property name="version" value="2_0_a2"/>
+ <property name="version" value="2_0_a2b"/>
<!-- ************ Per user local properties ******************************* -->
@@ -136,9 +136,13 @@
</zip>
</target>
- <target name="test.dist" depends="prepare,clean.dev.build">
-
+ <target name="unzip.dist" depends="prepare">
<unzip dest="${moz.install.dir}" src="${dist.home}/${name}_${version}_${platform}.zip" />
+ </target>
+
+ <target name="test.dist" depends="prepare">
+
+ <antcall target="unzip.dist" />
<ant inheritAll="false" dir="${moz.install.dir}"/>
@@ -149,6 +153,8 @@
<target name="clean.test.dist" depends="props">
<delete file="${moz.install.dir}/build.xml" />
+ <delete file="${moz.install.dir}/runwc.bat" />
+ <delete file="${moz.install.dir}/runwc.sh" />
<delete file="${moz.install.dir}/components/${so.prefix}javadom.${so.extension}" />
<delete file="${moz.install.dir}/${so.prefix}javadomjni.${so.extension}" />
<delete file="${moz.install.dir}/${so.prefix}${name}.${so.extension}" />
Index: dist/webclient-dist.xml
===================================================================
RCS file: /cvsroot/mozilla/java/dist/webclient-dist.xml,v
retrieving revision 1.2
diff -u -r1.2 webclient-dist.xml
--- dist/webclient-dist.xml 15 Oct 2004 16:39:07 -0000 1.2
+++ dist/webclient-dist.xml 18 Oct 2004 14:03:36 -0000
@@ -3,6 +3,20 @@
<property environment="myenv" />
<target name="props">
+ <condition property="is.win32" value="true">
+ <and>
+ <os family="windows" />
+ </and>
+ </condition>
+
+ <condition property="is.unix" value="true">
+ <and>
+ <os family="unix" />
+ </and>
+ </condition>
+
+
+
<condition property="PATH_SEP" value=";">
<and>
<os family="windows" />
@@ -55,7 +69,31 @@
</target>
- <target name="main" depends="props">
+ <target name="main" depends="main.win32,main.unix"/>
+
+ <target name="main.win32" depends="props" if="is.win32">
+
+ <delete file="${basedir}/runwc.bat" />
+ <echo file="${basedir}/runwc.bat">
+SET PATH=${java.libpath};%PATH%
+SET NSPR_LOG_MODULES=webclient:4,webclientstub:4
+SET NSPR_LOG_FILE=webclient.log
+ant run.test.browser
+ </echo>
+ <exec command=".\runwc.bat" newenvironment="true" />
+
+ </target>
+
+ <target name="main.unix" depends="props" if="is.unix">
+
+ <delete file="${basedir}/runwc.sh" />
+ <echo file="${basedir}/runwc.sh">
+ </echo>
+
+ </target>
+
+
+ <target name="run.test.browser" depends="props">
<java newenvironment="true"
classname="org.mozilla.webclient.test.TestBrowser"
Index: webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java
===================================================================
RCS file: /cvsroot/mozilla/java/webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java,v
retrieving revision 1.8
diff -u -r1.8 WrapperFactoryImpl.java
--- webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java 17 Jun 2004 21:27:55 -0000 1.8
+++ webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java 18 Oct 2004 14:03:37 -0000
@@ -316,7 +316,8 @@
((Service)WrapperFactoryImpl.this.profileManager).startup();
((Service)WrapperFactoryImpl.this.prefs).startup();
- ((Service)WrapperFactoryImpl.this.bookmarks).startup();
+ // PENDING(edburns): see Message-ID: <bbf0af98.0410171147.3109d532@posting.google.com> on n.p.m.java
+ // ((Service)WrapperFactoryImpl.this.bookmarks).startup();
WrapperFactoryImpl.this.nativeAppSetup(nativeWrapperFactory);
return null;
2004-10-18 18:08:22 +04:00
|
|
|
</target>
|
|
|
|
|
2007-02-16 22:57:59 +03:00
|
|
|
<target name="copy.binaries" depends="prepare">
|
|
|
|
<copy todir="${dist.home}/bin/components"
|
|
|
|
file="${objdir}/java/dom/src/${so.prefix}javadom.${so.extension}" />
|
|
|
|
<copy todir="${dist.home}/bin"
|
|
|
|
file="${objdir}/java/dom/jni/${so.prefix}javadomjni.${so.extension}" />
|
|
|
|
<copy todir="${dist.home}/bin"
|
|
|
|
file="${objdir}/java/webclient/src_moz/${so.prefix}${name}.${so.extension}" />
|
2004-09-29 23:53:55 +04:00
|
|
|
|
|
|
|
</target>
|
|
|
|
|
2007-02-16 22:57:59 +03:00
|
|
|
<target name="copy.samples.src" depends="prepare">
|
|
|
|
<copy todir="${dist.home}/samples/automated/src/main/java">
|
|
|
|
<fileset dir="${source.home}/webclient/test/automated/src/classes" />
|
|
|
|
</copy>
|
|
|
|
<copy todir="${dist.home}/samples/automated/src/main/resources">
|
|
|
|
<fileset dir="${source.home}/webclient/test/automated/src/test">
|
|
|
|
<exclude name="*basic*/" />
|
|
|
|
</fileset>
|
|
|
|
</copy>
|
2004-09-29 23:53:55 +04:00
|
|
|
|
2007-02-19 21:32:42 +03:00
|
|
|
<copy todir="${dist.home}/samples/manual/src/main/java">
|
|
|
|
<fileset dir="${source.home}/webclient/test/manual/src/classes" />
|
|
|
|
</copy>
|
|
|
|
|
|
|
|
|
|
|
|
</target>
|
|
|
|
|
|
|
|
<target name="copy.build.support" depends="prepare">
|
|
|
|
<copy todir="${dist.home}/netbeans">
|
|
|
|
<fileset dir="${basedir}/netbeans" />
|
|
|
|
</copy>
|
2004-09-29 23:53:55 +04:00
|
|
|
</target>
|
2007-02-16 22:57:59 +03:00
|
|
|
|
2004-09-29 23:53:55 +04:00
|
|
|
|
|
|
|
</project>
|