CWS-TOOLING: integrate CWS cmcfixes50

2008-11-10 13:31:50 +0100 cmc  r263517 : gio doesn't do anything useful for remote stuff wrt info
2008-11-06 00:11:47 +0100 cmc  r263359 : #i93436# pile of other 64bit new gcc warnings
2008-11-05 00:39:03 +0100 cmc  r263340 : i95856 let a ppc64 vanilla build succeed
2008-11-04 14:00:25 +0100 cmc  r263320 : #i93436# useless const
2008-11-04 11:53:10 +0100 cmc  r263314 : #i93436# ambiguous
2008-11-04 11:48:05 +0100 cmc  r263313 : #i93436# add some braces
2008-11-04 11:29:24 +0100 cmc  r263312 : #i93436# ambiguous
2008-11-04 10:53:46 +0100 cmc  r263311 : 

reportdesign/java/com/sun/star/report/pentaho/makefile.mk

@@ -41,7 +41,7 @@ nodep=true
 #----- compile .java files -----------------------------------------
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
 .IF "$(SYSTEM_JFREEREPORT)" == "YES"
-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(JCOMMON_SERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)librepository-0.1.4.jar
+XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(JCOMMON_JAR)$(PATH_SEPERATOR)$(LIBXML_JAR)$(PATH_SEPERATOR)$(JFREEREPORT_JAR)$(PATH_SEPERATOR)$(LIBLOADER_JAR)$(PATH_SEPERATOR)$(SAC_JAR)$(PATH_SEPERATOR)$(LIBLAYOUT_JAR)$(PATH_SEPERATOR)$(JCOMMON_SERIALIZER_JAR)$(PATH_SEPERATOR)$(LIBFONTS_JAR)$(PATH_SEPERATOR)$(LIBFORMULA_JAR)$(PATH_SEPERATOR)$(LIBREPOSITORY_JAR)
 .ELSE
 JARFILES += flute-1.3-jfree-20061107.jar jcommon-1.0.10.jar	jcommon-serializer-0.2.0.jar libfonts-0.3.3.jar libformula-0.1.14.jar liblayout-0.2.8.jar libloader-0.3.6.jar librepository-0.1.4.jar libxml-0.9.9.jar pentaho-reporting-flow-engine-0.9.2.jar sac.jar
 .ENDIF

reportdesign/util/makefile.mk

@@ -236,18 +236,18 @@ COMPONENT_HELP= \
 
 # .jar files from solver
 COMPONENT_EXTJARFILES = \
-    $(EXTENSIONDIR)$/flute-1.3-jfree-20061107.jar							\
-    $(EXTENSIONDIR)$/jcommon-1.0.10.jar										\
-    $(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar							\
-    $(EXTENSIONDIR)$/libfonts-0.3.3.jar										\
-    $(EXTENSIONDIR)$/libformula-0.1.14.jar									\
-    $(EXTENSIONDIR)$/liblayout-0.2.8.jar										\
-    $(EXTENSIONDIR)$/libloader-0.3.6.jar										\
-    $(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)$/flute-1.3-jfree-20061107.jar				\
+    $(EXTENSIONDIR)$/jcommon-1.0.10.jar							\
+    $(EXTENSIONDIR)$/jcommon-serializer-0.2.0.jar				\
+    $(EXTENSIONDIR)$/libfonts-0.3.3.jar							\
+    $(EXTENSIONDIR)$/libformula-0.1.14.jar						\
+    $(EXTENSIONDIR)$/liblayout-0.2.8.jar						\
+    $(EXTENSIONDIR)$/libloader-0.3.6.jar						\
+    $(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
 
 COMPONENT_MANIFEST_GENERIC:=TRUE
@@ -263,7 +263,47 @@ EXTENSION_PACKDEPS=$(COMPONENT_EXTJARFILES) $(COMPONENT_HTMLFILES) $(COMPONENT_O
 .INCLUDE : extension_post.mk
 
 .IF "$(SYSTEM_JFREEREPORT)" == "YES"
-$(EXTENSIONDIR)$/%.jar : $(JFREEREPORT_JAR:d:d)$/%.jar
+$(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