*not part of the build*

fix for 82925
This commit is contained in:
idk%eng.sun.com 2001-05-27 11:04:44 +00:00
parent 07339d1164
commit ed48eba3fe
11 changed files with 26 additions and 29 deletions

View File

@ -46,8 +46,8 @@ LLIBS =$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
include <$(topsrcdir)\config\rules.mak>
javai:
echo $(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes:$(CLASSPATH) -d $(DEPTH)\dist\classes $(JAVAI)
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes:$(CLASSPATH) -d $(DEPTH)\dist\classes $(JAVAI)
echo $(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI)
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI)
install:: $(DLL) javai
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components

View File

@ -50,8 +50,8 @@ LLIBS =$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
include <$(topsrcdir)\config\rules.mak>
javai:
echo $(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes:$(CLASSPATH) -d $(DEPTH)\dist\classes $(JAVAI) $(JAVA_SRC)
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes:$(CLASSPATH) -d $(DEPTH)\dist\classes $(JAVAI) $(JAVA_SRC)
echo $(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI) $(JAVA_SRC)
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI) $(JAVA_SRC)
install:: $(DLL) javai
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components

View File

@ -48,8 +48,8 @@ LLIBS =$(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
include <$(DEPTH)\config\rules.mak>
javai:
echo $(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes:$(CLASSPATH) -d $(DEPTH)\dist\classes $(JAVAI)
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes:$(CLASSPATH) -d $(DEPTH)\dist\classes $(JAVAI)
echo $(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI)
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI)
install:: $(DLL) javai
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components

View File

@ -48,12 +48,13 @@ LLIBS= $(LLIBS) $(LIBNSPR) $(DIST)\lib\xpcom.lib
JDIRS = .
JAVAC_PROG=$(JDKHOME)\bin\javac
JAVAC_FLAGS=-classpath $(CLASSPATH);$(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
JAVAC_FLAGS=-classpath $(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
include <$(DEPTH)\config\rules.mak>
include <$(DEPTH)\config\javarules.mak>
install:: $(DLL)
iJ2XINServerTestComponent.class : iJ2XINServerTestComponent.java
$(JAVAC_PROG) $(JAVAC_FLAGS) iJ2XINServerTestComponent.java
install:: $(DLL) iJ2XINServerTestComponent.class
$(MAKE_INSTALL) $(DLL) $(DIST)\bin\components
clobber::
del /f $(DIST)\bin\components\$(DLLNAME).dll

View File

@ -27,7 +27,8 @@ import java.io.DataOutputStream;
import java.io.FileOutputStream;
import java.util.Hashtable;
public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iClientTestComponent, iJClientTestComponent, iExclusionSupport {
public class J2XINClientTestComponent implements iJ2XINClientTestComponent, iClientTestComponent, iJClientTestComponent,
iExclusionSupport {
private iJ2XINServerTestComponent server = null;
private VarContainer varContainer = null;
private String testLocation = null;

View File

@ -38,19 +38,13 @@ XPIDLSRCS = \
.\iJ2XINClientTestComponent.idl \
$(NULL)
JAVA_SRC = \
J2XINClientTestComponent.java\
$(NULL)
JDIRS = .
JAVAC_PROG=$(JDKHOME)\bin\javac
JAVAC_FLAGS=-classpath $(CLASSPATH);$(JAVA_DESTPATH) -d $(JAVA_DESTPATH)
include <$(DEPTH)\config\rules.mak>
include <$(DEPTH)\config\javarules.mak>
J2XINClientTestComponent.class:
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes $(JAVA_SRC)
J2XINClientTestComponent.class: J2XINClientTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes iJ2XINClientTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes J2XINClientTestComponent.java
J2XINClientTestComponent.jar.comp: manifest J2XINClientTestComponent.class
$(JDKHOME)\bin\jar cvfm J2XINClientTestComponent.jar.comp manifest *.class
@ -66,3 +60,4 @@ clobber::
clobber_all:: clobber
install:: install-component

View File

@ -57,8 +57,8 @@ LINCS=\
include <$(DEPTH)\config\rules.mak>
javai:
echo $(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes:$(CLASSPATH) -d $(DEPTH)\dist\classes $(JAVAI) $(COMMON_JAVA)
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes:$(CLASSPATH) -d $(DEPTH)\dist\classes $(JAVAI) $(COMMON_JAVA)
echo $(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes; -d $(DEPTH)\dist\classes $(JAVAI) $(COMMON_JAVA)
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes $(JAVAI) $(COMMON_JAVA)
#A little temporary hack with messenger
install:: $(DLL) javai

View File

@ -43,8 +43,8 @@ X2JINServerTestComponent.jar.comp: manifest iX2JINServerTestComponent.class X2JI
.SUFFIXES: .java .class
.java.class:
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) -d $(DEPTH)\dist\classes iX2JINServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) X2JINServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes iX2JINServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes X2JINServerTestComponent.java
install-component: X2JINServerTestComponent.jar.comp X2JINServerTestComponent.jar.info $(DLL)
copy X2JINServerTestComponent.jar* $(DIST)\bin\components

View File

@ -41,8 +41,8 @@ X2JINOUTServerTestComponent.jar.comp: manifest iX2JINOUTServerTestComponent.clas
.SUFFIXES: .java .class
.java.class:
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) -d $(DEPTH)\dist\classes iX2JINOUTServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) X2JINOUTServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes iX2JINOUTServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes X2JINOUTServerTestComponent.java
install-component: X2JINOUTServerTestComponent.jar.comp X2JINOUTServerTestComponent.jar.info $(DLL)
copy X2JINOUTServerTestComponent.jar* $(DIST)\bin\components

View File

@ -42,8 +42,8 @@ X2JOUTServerTestComponent.jar.comp: manifest iX2JOUTServerTestComponent.class X2
.SUFFIXES: .java .class
.java.class:
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) -d $(DEPTH)\dist\classes iX2JOUTServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) X2JOUTServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes iX2JOUTServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes X2JOUTServerTestComponent.java
install-component: X2JOUTServerTestComponent.jar.comp X2JOUTServerTestComponent.jar.info $(DLL)
copy X2JOUTServerTestComponent.jar* $(DIST)\bin\components

View File

@ -44,8 +44,8 @@ X2JRETServerTestComponent.jar.comp: manifest iX2JRETServerTestComponent.class X2
.SUFFIXES: .java .class
.java.class:
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) -d $(DEPTH)\dist\classes iX2JRETServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(CLASSPATH) X2JRETServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes -d $(DEPTH)\dist\classes iX2JRETServerTestComponent.java
$(JDKHOME)\bin\javac -classpath $(DEPTH)\dist\classes X2JRETServerTestComponent.java
install-component: X2JRETServerTestComponent.jar.comp X2JRETServerTestComponent.jar.info $(DLL)
copy X2JRETServerTestComponent.jar* $(DIST)\bin\components