diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 09:04:58 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 09:04:58 +0000 |
commit | 93d89bfbc1e47f3663582ddc38d3c9904925b085 (patch) | |
tree | 3237f64c14da8a588f7727d876e192151bcdc21b | |
parent | 57a8051720ae2285c8d386885657e1b51a5709d4 (diff) |
CWS-TOOLING: integrate CWS sb93
-rw-r--r-- | bean/qa/complex/makefile.mk | 4 | ||||
-rw-r--r-- | bean/test/applet/oooapplet/makefile.mk | 4 | ||||
-rw-r--r-- | bean/test/makefile.mk | 4 | ||||
-rw-r--r-- | extensions/qa/complex/extensions/makefile.mk | 4 | ||||
-rw-r--r-- | extensions/qa/integration/extensions/makefile.mk | 4 | ||||
-rwxr-xr-x | forms/qa/complex/forms/makefile.mk | 4 | ||||
-rw-r--r-- | forms/qa/makefile.mk | 2 | ||||
-rw-r--r-- | package/qa/ofopxmlstorages/makefile.mk | 4 | ||||
-rw-r--r-- | package/qa/storages/makefile.mk | 4 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/agenda/makefile.mk | 3 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/fax/makefile.mk | 4 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/form/makefile.mk | 4 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/letter/makefile.mk | 4 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/report/makefile.mk | 4 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk | 4 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/reportbuilder/makefile.mk | 4 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/table/makefile.mk | 4 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/web/export/makefile.mk | 4 | ||||
-rw-r--r-- | wizards/prj/build.lst | 2 |
19 files changed, 35 insertions, 36 deletions
diff --git a/bean/qa/complex/makefile.mk b/bean/qa/complex/makefile.mk index 87ece877123b..dbf6e8362e1b 100644 --- a/bean/qa/complex/makefile.mk +++ b/bean/qa/complex/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.8.1 $ # # This file is part of OpenOffice.org. # @@ -38,7 +38,7 @@ PACKAGE = complex #----- compile .java files ----------------------------------------- -JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES = OOoBeanTest.java ScreenComparer.java WriterFrame.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/bean/test/applet/oooapplet/makefile.mk b/bean/test/applet/oooapplet/makefile.mk index 54c3d17af4a0..5056e0bbb4c6 100644 --- a/bean/test/applet/oooapplet/makefile.mk +++ b/bean/test/applet/oooapplet/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.3.8.1 $ # # This file is part of OpenOffice.org. # @@ -38,7 +38,7 @@ PACKAGE = oooapplet #----- compile .java files ----------------------------------------- -JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar +JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar JAVAFILES = OOoViewer.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/bean/test/makefile.mk b/bean/test/makefile.mk index 8e44cb1d6625..f214fe4f24cc 100644 --- a/bean/test/makefile.mk +++ b/bean/test/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.8.1 $ # # This file is part of OpenOffice.org. # @@ -38,7 +38,7 @@ PACKAGE = test #----- compile .java files ----------------------------------------- -JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar +JARFILES = officebean.jar sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar JAVAFILES = Test.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/extensions/qa/complex/extensions/makefile.mk b/extensions/qa/complex/extensions/makefile.mk index f4e2a46a00d7..ce5bd16412ab 100644 --- a/extensions/qa/complex/extensions/makefile.mk +++ b/extensions/qa/complex/extensions/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.76.1 $ # # This file is part of OpenOffice.org. # @@ -73,7 +73,7 @@ RESLIB2SRSFILES=$(RES2FILELIST) #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar JAVAFILES = $(shell @$(FIND) .$/*.java) JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/extensions/qa/integration/extensions/makefile.mk b/extensions/qa/integration/extensions/makefile.mk index 9d6d375a8d21..88ae8f775c33 100644 --- a/extensions/qa/integration/extensions/makefile.mk +++ b/extensions/qa/integration/extensions/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.7.76.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = integration$/$(PRJNAME) #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES := $(shell @$(FIND) .$/*.java) JAVACLASSFILES := $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/forms/qa/complex/forms/makefile.mk b/forms/qa/complex/forms/makefile.mk index 01a9e96f8892..7333c58e2381 100755 --- a/forms/qa/complex/forms/makefile.mk +++ b/forms/qa/complex/forms/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.4.56.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/forms #----- compile .java files ----------------------------------------- -JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar mysql.jar +JARFILES = sandbox.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar mysql.jar JAVAFILES = CheckOGroupBoxModel.java JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class) diff --git a/forms/qa/makefile.mk b/forms/qa/makefile.mk index 335bd4954d53..9f5a3fd9e1f4 100644 --- a/forms/qa/makefile.mk +++ b/forms/qa/makefile.mk @@ -40,7 +40,7 @@ PRJNAME = forms .IF "$(BUILD_QADEVOOO)" == "YES" #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar ConnectivityTools.jar JAVAFILES := $(shell @$(FIND) org -name "*.java") \ $(shell @$(FIND) integration -name "*.java") JAVACLASSFILES := $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(i:d)$/$(i:b).class) diff --git a/package/qa/ofopxmlstorages/makefile.mk b/package/qa/ofopxmlstorages/makefile.mk index dc8056eeabf3..f4a99196181d 100644 --- a/package/qa/ofopxmlstorages/makefile.mk +++ b/package/qa/ofopxmlstorages/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.18.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/ofopxmlstorages #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES =\ StorageUnitTest.java\ diff --git a/package/qa/storages/makefile.mk b/package/qa/storages/makefile.mk index bca486f9fe14..d78f51a6051e 100644 --- a/package/qa/storages/makefile.mk +++ b/package/qa/storages/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.15.18.1 $ # # This file is part of OpenOffice.org. # @@ -40,7 +40,7 @@ PACKAGE = complex$/storages #----- compile .java files ----------------------------------------- -JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar +JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar JAVAFILES =\ StorageUnitTest.java\ diff --git a/wizards/com/sun/star/wizards/agenda/makefile.mk b/wizards/com/sun/star/wizards/agenda/makefile.mk index ea654d6be1aa..375476c9c4af 100644 --- a/wizards/com/sun/star/wizards/agenda/makefile.mk +++ b/wizards/com/sun/star/wizards/agenda/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.42.1 $ # # This file is part of OpenOffice.org. # @@ -44,7 +44,6 @@ JARFILES= unoil.jar \ ridl.jar \ sandbox.jar \ juh.jar \ - jut.jar \ java_uno.jar \ java_uno_accessbridge \ commonwizards.jar diff --git a/wizards/com/sun/star/wizards/fax/makefile.mk b/wizards/com/sun/star/wizards/fax/makefile.mk index 4bd5b53bb625..66e56132d6ab 100644 --- a/wizards/com/sun/star/wizards/fax/makefile.mk +++ b/wizards/com/sun/star/wizards/fax/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.42.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/fax .INCLUDE : settings.mk #.INCLUDE : $(PRJ)$/util$/makefile.pmk -JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar +JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar CUSTOMMANIFESTFILE= MANIFEST.MF diff --git a/wizards/com/sun/star/wizards/form/makefile.mk b/wizards/com/sun/star/wizards/form/makefile.mk index 115e803f1db4..1853e0844fe8 100644 --- a/wizards/com/sun/star/wizards/form/makefile.mk +++ b/wizards/com/sun/star/wizards/form/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.5 $ +# $Revision: 1.5.42.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/form .INCLUDE : settings.mk #.INCLUDE : $(PRJ)$/util$/makefile.pmk -JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar jut.jar java_uno.jar commonwizards.jar +JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar java_uno.jar commonwizards.jar CUSTOMMANIFESTFILE= MANIFEST.MF JARCLASSDIRS = com$/sun$/star$/wizards$/form diff --git a/wizards/com/sun/star/wizards/letter/makefile.mk b/wizards/com/sun/star/wizards/letter/makefile.mk index bc2a916a8843..6c4a62149d83 100644 --- a/wizards/com/sun/star/wizards/letter/makefile.mk +++ b/wizards/com/sun/star/wizards/letter/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.7.42.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/letter .INCLUDE : settings.mk #.INCLUDE : $(PRJ)$/util$/makefile.pmk -JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar +JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar CUSTOMMANIFESTFILE= MANIFEST.MF diff --git a/wizards/com/sun/star/wizards/report/makefile.mk b/wizards/com/sun/star/wizards/report/makefile.mk index 2cec404a1463..d4624cc690ba 100644 --- a/wizards/com/sun/star/wizards/report/makefile.mk +++ b/wizards/com/sun/star/wizards/report/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.17.26.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/report .INCLUDE : settings.mk #.INCLUDE : $(PRJ)$/util$/makefile.pmk -JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar commonwizards.jar +JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar CUSTOMMANIFESTFILE= MANIFEST.MF diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk b/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk index 00d6eb4054df..5961467b2dcc 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk +++ b/wizards/com/sun/star/wizards/reportbuilder/layout/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.26.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/reportbuilder$/layout .INCLUDE : settings.mk #.INCLUDE : $(PRJ)$/util$/makefile.pmk -JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar commonwizards.jar report.jar +JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar report.jar # CUSTOMMANIFESTFILE= MANIFEST.MF diff --git a/wizards/com/sun/star/wizards/reportbuilder/makefile.mk b/wizards/com/sun/star/wizards/reportbuilder/makefile.mk index 50548e756561..961c1a0a1e30 100644 --- a/wizards/com/sun/star/wizards/reportbuilder/makefile.mk +++ b/wizards/com/sun/star/wizards/reportbuilder/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.26.1 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/reportbuilder .INCLUDE : settings.mk #.INCLUDE : $(PRJ)$/util$/makefile.pmk -JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar commonwizards.jar report.jar +JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar commonwizards.jar report.jar # CUSTOMMANIFESTFILE= Manifest.mf diff --git a/wizards/com/sun/star/wizards/table/makefile.mk b/wizards/com/sun/star/wizards/table/makefile.mk index bf8d5e44c764..f7cfcfe5c160 100644 --- a/wizards/com/sun/star/wizards/table/makefile.mk +++ b/wizards/com/sun/star/wizards/table/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.6.42.1 $ # # This file is part of OpenOffice.org. # @@ -38,7 +38,7 @@ PACKAGE = com$/sun$/star$/wizards$/table .INCLUDE : settings.mk #.INCLUDE : $(PRJ)$/util$/makefile.pmk -JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar jut.jar java_uno.jar commonwizards.jar +JARFILES= unoil.jar jurt.jar ridl.jar sandbox.jar juh.jar java_uno.jar commonwizards.jar CUSTOMMANIFESTFILE= MANIFEST.MF JARCLASSDIRS = com$/sun$/star$/wizards$/table diff --git a/wizards/com/sun/star/wizards/web/export/makefile.mk b/wizards/com/sun/star/wizards/web/export/makefile.mk index 5fe65dcd6a77..2ad816ff834f 100644 --- a/wizards/com/sun/star/wizards/web/export/makefile.mk +++ b/wizards/com/sun/star/wizards/web/export/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.9.40.2 $ # # This file is part of OpenOffice.org. # @@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/wizards$/web$/export .INCLUDE : settings.mk #.INCLUDE : $(PRJ)$/util$/makefile.pmk -JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar +JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar .IF "$(SYSTEM_SAXON)" == "YES" XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR) diff --git a/wizards/prj/build.lst b/wizards/prj/build.lst index 5f128223b2bf..ac2d1e25081b 100644 --- a/wizards/prj/build.lst +++ b/wizards/prj/build.lst @@ -1,4 +1,4 @@ -wz wizards : rsc javaunohelper jut unoil QADEVOOO:qadevOOo transex3 NULL +wz wizards : rsc javaunohelper unoil QADEVOOO:qadevOOo transex3 NULL wz wizards\util nmake - all wz_util NULL wz wizards\source\config nmake - all wz_config NULL wz wizards\source\configshare nmake - all wz_configshare NULL |