зеркало из https://github.com/mozilla/pjs.git
M dist/build.xml
M dist/webclient-dist.xml M webclient/classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java - rollback 2.0 alpha b changes. Thanks to Annie Lau.
This commit is contained in:
edburns%acm.org
Родитель
445a66c574
Коммит
1afd770773
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
<property name="Name" value="webclient"/>
|
||||
<property name="name" value="webclient"/>
|
||||
<property name="version" value="2_0_a2b"/>
|
||||
<property name="version" value="2_0_a2"/>
|
||||
|
||||
<!-- ************ Per user local properties ******************************* -->
|
||||
|
||||
|
|
@ -153,8 +153,6 @@
|
|||
<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}" />
|
||||
|
|
|
|||
|
|
@ -2,20 +2,8 @@
|
|||
|
||||
<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>
|
||||
|
||||
|
||||
<target name="main">
|
||||
|
||||
<condition property="PATH_SEP" value=";">
|
||||
<and>
|
||||
|
|
@ -29,82 +17,14 @@
|
|||
</and>
|
||||
</condition>
|
||||
|
||||
<condition property="gre.dir"
|
||||
value="${myenv.HOMEDRIVE}\PROGRA~1\COMMON~1\mozilla.org\GRE\1.7_2004061609">
|
||||
<and>
|
||||
<os family="windows" />
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
<condition property="gre.dir" value=":">
|
||||
<and>
|
||||
<os family="unix" />
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
<condition property="java.libpath"
|
||||
value="${basedir}${PATH_SEP}${basedir}\components${PATH_SEP}${gre.dir}${PATH_SEP}${gre.dir}\components">
|
||||
<and>
|
||||
<os family="windows" />
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
<condition property="java.libpath"
|
||||
value="${basedir}${PATH_SEP}${basedir}/components${PATH_SEP}${gre.dir}${PATH_SEP}${gre.dir}/components">
|
||||
<and>
|
||||
<os family="unix" />
|
||||
</and>
|
||||
</condition>
|
||||
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
<target name="test" depends="props">
|
||||
|
||||
<echo message="ANT_HOME = ${myenv.ANT_HOME}"/>
|
||||
<echo message="HOMEDRIVE = ${myenv.HOMEDRIVE}"/>
|
||||
<echo message="gre.dir = ${gre.dir}"/>
|
||||
<echo message="java.libpath = ${java.libpath}"/>
|
||||
|
||||
</target>
|
||||
|
||||
<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"
|
||||
<java classname="org.mozilla.webclient.test.TestBrowser"
|
||||
classpath="${basedir}/webclient.jar" fork="true">
|
||||
<jvmarg value="-Djava.library.path=${java.libpath}"/>
|
||||
<jvmarg value="-DNSPR_LOG_MODULES=webclient:4,webclientstub:4"/>
|
||||
<jvmarg value="-DNSPR_LOG_FILE=webclient.log"/>
|
||||
<jvmarg value="-DBROWSER_BIN_DIR=${gre.dir}"/>
|
||||
<jvmarg value="-Djava.library.path=${basedir}${PATH_SEP}${basedir}/components"/>
|
||||
<jvmarg value="-DNSPR_LOG_MODULES=${myenv.NSPR_LOG_MODULES}"/>
|
||||
<jvmarg value="-DNSPR_LOG_FILE=${myenv.NSPR_LOG_FILE}"/>
|
||||
<jvmarg value="-DBROWSER_BIN_DIR=${basedir}"/>
|
||||
</java>
|
||||
|
||||
</target>
|
||||
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -316,8 +316,7 @@ public class WrapperFactoryImpl extends Object implements WrapperFactory {
|
|||
|
||||
((Service)WrapperFactoryImpl.this.profileManager).startup();
|
||||
((Service)WrapperFactoryImpl.this.prefs).startup();
|
||||
// PENDING(edburns): see Message-ID: <bbf0af98.0410171147.3109d532@posting.google.com> on n.p.m.java
|
||||
// ((Service)WrapperFactoryImpl.this.bookmarks).startup();
|
||||
((Service)WrapperFactoryImpl.this.bookmarks).startup();
|
||||
|
||||
WrapperFactoryImpl.this.nativeAppSetup(nativeWrapperFactory);
|
||||
return null;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче