mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-02 15:15:23 +00:00
63ed119bc3
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;
|
||
|---|---|---|
| .. | ||
| build | ||
| config | ||
| dist | ||
| dom | ||
| external | ||
| pluggable-jvm | ||
| plugins | ||
| util | ||
| webclient | ||
| xpcom | ||
| .cvsignore | ||
| build.properties.sample | ||
| build.xml | ||
| changelo | ||
| makefiles | ||
| README | ||
| README.commercial | ||
20040222 This README documents the Java Enhancers to the Mozilla web browser. Currently, the only active sub-project is the Webclient Java API to the Mozilla web browser. This project also leverages the JavaDOM sub-project. Requirements: * J2SDK 1.3.1 or later * Apache ant 1.4.1 or later. If running under J2SDK 1.4.2 or later, you need ant 1.6.1, due to javah issues. * Successfully built debug enabled Mozilla 1.6 tree How To Build: * cd to the directory above your top level mozilla directory and cvs checkout the Webclient module. * Modify mozilla/allmakefiles.sh and prepend the contents of the file "makefiles", in this directory, to add_makefiles section after the "Common makfiles used by everyone" comment. * re-run ./configure to generate the java makefiles * put the "mozilla/dist/bin" directory in your LD_LIBRARY_PATH on Unix, or PATH on Win32. * set the value of the environment var MOZ_JDKHOME to be your J2SDK directory. * Create a build.properties file in the mozilla/java directory with the following contents. ###### build.unix.classes=true build.win32.classes=false build.home=/home/edburns/Projects/mozilla/MOZILLA_1_4/mozilla/dist/classes compile.debug=true ###### Of course, set the values of the above properties correctly according to your system. * run "ant" in the mozilla/java directory. This will build webclient and all dependent libraries. How to run the Junit tests: * Make sure junit.jar is properly set in your mozilla/java/build.properties * Make sure junit.jar is installed in your $ANT_HOME/lib directory * Set the following variables in your environment NSPR_LOG_MODULES=webclient:4,webclientstub:4 NSPR_LOG_FILE=logfile.txt * cd to mozilla/java/webclient * Kill any running mozilla instances. These will mess up the profilemanager code. * run ant test How to run the test browser (broken as of this writing): * cd to mozilla/java/webclient/src_moz and run the "runem" batch file to run the test browser. Problems? * post to netscape.public.mozilla.java newsgroup