diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-10-11 22:57:28 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-10-11 22:57:28 +0200 |
| commit | 66d230686f217bd692b789b97a961e57135312c8 (patch) | |
| tree | 2fa495708319b83e9587474d3a296a347513d689 /connectivity/qa | |
| parent | bb14bf05acd3cb0b55bebf374b350976098643af (diff) | |
dba34b: made sure that different jars include disjunct sets of .class files
Diffstat (limited to 'connectivity/qa')
| -rw-r--r-- | connectivity/qa/connectivity/tools/makefile.mk | 8 | ||||
| -rw-r--r-- | connectivity/qa/makefile.mk | 9 |
2 files changed, 5 insertions, 12 deletions
diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk index 07490532a1b1..d77da7f1b945 100644 --- a/connectivity/qa/connectivity/tools/makefile.mk +++ b/connectivity/qa/connectivity/tools/makefile.mk @@ -42,15 +42,11 @@ all: JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunnerLight.jar JAVAFILES := $(shell @$(FIND) . -name "*.java") -JAVACLASSFILES := $(foreach,i,$(JAVAFILES) $(CLASSDIR)/$(PACKAGE)/$(i:d)$(i:b).class) #----- make a jar from compiled files ------------------------------ -MAXLINELENGTH = 100000 - -JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +JARCLASSDIRS = $(PACKAGE) +JARTARGET = $(TARGET).jar # --- Targets ------------------------------------------------------ diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk index 2ae164868f0e..ee41cab63554 100644 --- a/connectivity/qa/makefile.mk +++ b/connectivity/qa/makefile.mk @@ -28,6 +28,7 @@ PRJ = .. TARGET = ConnectivityComplexTests PRJNAME = connectivity +PACKAGE = complex/connectivity # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk @@ -36,15 +37,11 @@ PRJNAME = connectivity JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar JAVAFILES := $(shell @$(FIND) complex -name "*.java") -JAVACLASSFILES := $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(i:d)$/$(i:b).class) #----- make a jar from compiled files ------------------------------ -MAXLINELENGTH = 100000 - -#JARCLASSDIRS = $(PACKAGE) -JARTARGET = $(TARGET).jar -JARCOMPRESS = TRUE +JARCLASSDIRS = $(PACKAGE) +JARTARGET = $(TARGET).jar # --- Runner Settings ---------------------------------------------- |