CWS-TOOLING: integrate CWS configuretoplevel

2009-01-19 15:47:39 +0100 rene  r266508 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@266428 (milestone: DEV300:m39)
2009-01-18 00:35:31 +0100 rene  r266462 : #i10000# Mac OS X "of course" has other paths...
2009-01-16 13:24:23 +0100 rene  r266415 : make OS2 use STLport...
2009-01-15 22:08:38 +0100 rene  r266393 : STLport for FreeBSD
2009-01-15 01:23:51 +0100 rene  r266333 : #i98048# harmonize STL default; default to *NOT* use STLport
2009-01-09 22:44:43 +0100 rene  r266120 : #i97428# try to find out XLIB via pkg-config
2009-01-09 22:41:18 +0100 rene  r266119 : #i97827# fail when we don't find make
2008-12-27 01:19:34 +0100 rene  r265812 : add make (dis)clean; force /bin/sh as we source *Enc.Set.sh
2008-12-27 01:16:31 +0100 rene  r265811 : fix makefile.rc for config.*/config_office move
2008-12-26 22:37:54 +0100 rene  r265810 : #i91641# in some cases, we also need the -Xbootclasspath at the second javac call
2008-12-26 17:55:11 +0100 rene  r265806 : actually commit Makefile.in
2008-12-25 19:24:24 +0100 rene  r265803 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@265758 (milestone: DEV300:m38)
2008-12-10 22:51:06 +0100 rene  r265232 : #i96912# revert, cws swffixes02 has the right fix
2008-12-08 18:47:10 +0100 rene  r265014 : xulrunner has no /plugin or /nspr
2008-12-08 17:51:28 +0100 rene  r265013 : i96912# fix --with-system-mozilla
2008-12-05 13:05:55 +0100 rene  r264903 : #i95339#
2008-12-04 17:53:53 +0100 rene  r264865 : fix merge error
#i80238# add help for --with-epm
2008-12-04 17:44:28 +0100 rene  r264864 : #i91641# fix build with JDKs already including a version of rhino which conflicts with our ancient one
2008-12-04 17:40:48 +0100 rene  r264863 : i93429# check for sanity for expand.exe
2008-12-04 17:34:20 +0100 rene  r264862 : config_office changes from m33 to m37
2008-12-04 17:28:55 +0100 rene  r264861 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@264807 (milestone: DEV300:m37)
2008-12-04 16:49:03 +0100 rene  r264856 : fix cws. part 5
2008-12-04 16:45:06 +0100 rene  r264855 : fix cws, part 4
2008-12-04 16:01:49 +0100 rene  r264850 : fix cws, part 3
2008-12-04 15:14:12 +0100 rene  r264848 : fix cws, part 2

1 files changed, 6 insertions, 50 deletions

diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk
index 2e2dbe68bdae..0c27a6b11a4c 100644
--- a/reportdesign/util/makefile.mk
+++ b/reportdesign/util/makefile.mk
@@ -263,6 +263,9 @@ COMPONENT_HELP= \
 
 # .jar files from solver
 COMPONENT_EXTJARFILES = \
+    $(EXTENSIONDIR)$/sun-report-builder.jar 					\
+    $(EXTENSIONDIR)$/reportbuilderwizard.jar
+.IF "$(SYSTEM_JFREEREPORT)" != "YES"
     $(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar				\
     $(EXTENSIONDIR)$/jcommon-1.0.10.jar							\
     $(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar				\
@@ -273,9 +276,8 @@ COMPONENT_EXTJARFILES = \
     $(EXTENSIONDIR)$/librepository-0.1.4.jar					\
     $(EXTENSIONDIR)$/libxml-0.9.9.jar							\
     $(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar 	\
-    $(EXTENSIONDIR)$/sac.jar                                 	\
-    $(EXTENSIONDIR)$/sun-report-builder.jar 					\
-    $(EXTENSIONDIR)$/reportbuilderwizard.jar
+    $(EXTENSIONDIR)$/sac.jar
+.ENDIF
 
 COMPONENT_MANIFEST_GENERIC:=TRUE
 COMPONENT_MANIFEST_SEARCHDIR:=registry
@@ -289,55 +291,9 @@ EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) $(COMPONENT_O
 .INCLUDE : target.mk
 .INCLUDE : extension_post.mk
 
-.IF "$(SYSTEM_JFREEREPORT)" == "YES"
-$(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar : $(FLUTE_JAR)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(EXTENSIONDIR)$/jcommon-1.0.10.jar : $(JCOMMON_JAR)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar : $(JCOMMON_SERIALIZER_JAR)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(EXTENSIONDIR)$/libfonts-0.3.3.jar : $(LIBFONTS_JAR)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(EXTENSIONDIR)$/libformula-0.1.14.jar : $(LIBFORMULA_JAR)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(EXTENSIONDIR)$/liblayout-0.2.8.jar : $(LIBLAYOUT_JAR)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(EXTENSIONDIR)$/libloader-0.3.6.jar : $(LIBLOADER_JAR)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(EXTENSIONDIR)$/librepository-0.1.4.jar : $(LIBREPOSITORY_JAR)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(EXTENSIONDIR)$/libxml-0.9.9.jar : $(LIBXML_JAR)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(EXTENSIONDIR)$/pentaho-reporting-flow-engine-0.9.2.jar : $(JFREEREPORT_JAR)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(EXTENSIONDIR)$/sac.jar : $(SAC_JAR)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-.ELSE
 $(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
-.ENDIF
 
 $(EXTENSIONDIR)$/readme_en-US.% : $(PRJ)$/license$/readme_en-US.%
     @@-$(MKDIRHIER) $(@:d)
@@ -362,4 +318,4 @@ $(DESCRIPTION_SRC): description.xml
 .ELSE			# "$(SOLAR_JAVA)"!=""
 .INCLUDE : target.mk
 .ENDIF			# "$(SOLAR_JAVA)"!=""
-#
+