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
Here lies the MozWebShell java wrapper to mozilla M8.
Authors: Kirk Baker <kbaker@eb.com>
Ian Wilkinson <iw@ennoble.co>
Build hacking and packaging: Ed Burns <edburns@acm.org>
Unix port: Mark Lin <mark.lin@eng.sun.com>
========================================================================
Win32 Build Directions:
========================================================================
Requirements:
* built mozilla with source code from after 10/5/99
* JDK1.1.7 or greater
* built org.mozilla.util java classes (see NOTE_UTIL)
* Perl 5 perl.exe must be in your path
How To Build:
* Follow the directions in ..\README
* type "nmake /f makefile.win all" and hope for the best
How to Run:
* once the build has successfully completed, run this batch file:
.\src\WIN32_D.OBJ\runem.bat <opt: YOUR_URL>
Note that YOUR_URL is probably necessary since firewall support wasn't
working in M8.
Problems:
* clobber_all doesn't remove the .class files from dist\classes. You
have to do this manually.
* post to netscape.public.mozilla.java newsgroup
========================================================================
Unix Build Directions (currently only Linux,
Solaris support is coming soon):
========================================================================
Requirements:
* built mozilla tree for some variant of Linux
* JDK1.2 with native threads support from http://www.blackdown.org
(JDK1.1 doesn't seem to work)
* built org.mozilla.util java classes (see NOTE_UTIL)
How To Build:
* Follow the directions in ../util/README
* set JDKHOME to where your JDK install directory resides
-> setenv JDKHOME /usr/local/jdk1.2
* cd to 'classes' and type "make -f makefile.unix" and hope for the best
-> cd classes; make -f Makefile.unix
* then cd to 'src' and type "make -f makefile.unix" and hope for the best
-> cd src; make -f Makefile.unix
How to Run:
* once the build has successfully completed, run 'runem.unix' in your
'src' directory:
-> cd src; ./runem.unix <YOUR_URL>
Note that YOUR_URL is probably necessary since firewall support wasn't
working in M8.
Problems? Email mark.lin@eng.sun.com or post to netscape.public.mozilla.java.
========================================================================
NOTE_UTIL:
========================================================================
* this package depends on the org.mozilla.util classes, which can be
found in the mozilla tree under mozilla\java\util. They are a
separate checkout and build. Once you check out the org.mozilla.util
classes, see the README in the mozilla\java\util\README.
General notes:
* Please update the ChangeLog (changelo) when you make changes.