3e55f85672
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;
git-svn-id: svn://10.0.0.236/trunk@163961 18797224-902f-48f8-a5cc-f745e15eee43
188 lines
6.1 KiB
XML
188 lines
6.1 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="dist" basedir=".">
|
|
|
|
<property name="Name" value="webclient"/>
|
|
<property name="name" value="webclient"/>
|
|
<property name="version" value="2_0_a2b"/>
|
|
|
|
<!-- ************ 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" />
|
|
|
|
<property name="dist.home" value="${basedir}/dist" />
|
|
<property name="source.home" value="${basedir}/.." />
|
|
<property name="moz.dist" value="${myenv.MOZ_SRC}/mozilla/dist" />
|
|
|
|
<target name="props">
|
|
<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>
|
|
|
|
<condition property="platform" value="win32">
|
|
<and>
|
|
<os family="windows" />
|
|
</and>
|
|
</condition>
|
|
|
|
<condition property="platform" value="linux">
|
|
<and>
|
|
<os family="unix" />
|
|
</and>
|
|
</condition>
|
|
</target>
|
|
|
|
<target name="prepare" depends="props">
|
|
|
|
<mkdir dir="${dist.home}" />
|
|
<mkdir dir="${dist.home}/components" />
|
|
|
|
</target>
|
|
|
|
<target name="dist" depends="prepare,compile.test">
|
|
|
|
<echo message="${build.home}" />
|
|
|
|
<jar jarfile="${dist.home}/${name}.jar" >
|
|
<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>
|
|
|
|
<fileset dir="${build.home}"
|
|
excludes="**/test/**" />
|
|
<fileset dir="${build.home}/test/classes"
|
|
includes="org/mozilla/webclient/test/**" />
|
|
</jar>
|
|
|
|
<copy todir="${dist.home}/components"
|
|
file="${basedir}/../dom/src/${so.prefix}javadom.${so.extension}" />
|
|
<copy todir="${dist.home}"
|
|
file="${basedir}/../dom/jni/${so.prefix}javadomjni.${so.extension}" />
|
|
<copy todir="${dist.home}"
|
|
file="${basedir}/../webclient/src_moz/${so.prefix}${name}.${so.extension}" />
|
|
|
|
<copy tofile="${dist.home}/build.xml" file="webclient-dist.xml" />
|
|
|
|
<zip destfile="${name}_${version}_${platform}.zip"
|
|
basedir="${dist.home}" />
|
|
<copy todir="${dist.home}" file="${name}_${version}_${platform}.zip" />
|
|
<delete file="${name}_${version}_${platform}.zip" />
|
|
|
|
</target>
|
|
|
|
<target name="src.dist">
|
|
<ant inheritAll="false" dir="${source.home}" target="clean"/>
|
|
<antcall target="prepare" />
|
|
|
|
<zip destfile="${dist.home}/${name}-src-${version}.zip">
|
|
<zipfileset dir="${source.home}"
|
|
excludes="**/CVS/**,build.properties,**/.deps/**,**/build.test/**,**/dist/dist/**,**/Makefile"
|
|
prefix="${name}-src-${version}/src"/>
|
|
</zip>
|
|
</target>
|
|
|
|
<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}"/>
|
|
|
|
<antcall target="clean.test.dist" />
|
|
|
|
</target>
|
|
|
|
<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}" />
|
|
<delete file="${moz.install.dir}/${name}.jar" />
|
|
|
|
</target>
|
|
|
|
<target name="clean.dev.build" depends="prepare"
|
|
description="remove in-place binaries for development work">
|
|
<delete file="${basedir}/../dom/src/${so.prefix}javadom.${so.extension}" />
|
|
<delete file="${basedir}/../dom/jni/${so.prefix}javadomjni.${so.extension}" />
|
|
<delete file="${basedir}/../webclient/src_moz/${so.prefix}webclient.${so.extension}" />
|
|
<delete dir="${build.home}" />
|
|
|
|
<delete file="${moz.dist}/lib/components/${so.prefix}javadom.${so.extension}" />
|
|
<delete file="${moz.dist}/bin/components/${so.prefix}javadom.${so.extension}" />
|
|
<delete file="${moz.dist}/bin/${so.prefix}javadomjni.${so.extension}" />
|
|
<delete file="${moz.dist}/bin/${so.prefix}webclient.${so.extension}" />
|
|
|
|
</target>
|
|
|
|
<target name="compile.test">
|
|
<ant dir="${basedir}/../webclient" target="compile.test" />
|
|
</target>
|
|
|
|
<target name="clean">
|
|
<delete dir="${dist.home}" />
|
|
</target>
|
|
|
|
</project>
|