incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1199758 - in /incubator/ooo/trunk/main: ./ reportbuilder/java/com/sun/star/report/function/metadata/ reportbuilder/java/com/sun/star/report/pentaho/ reportbuilder/java/com/sun/star/report/util/ reportbuilder/util/
Date Wed, 09 Nov 2011 13:51:57 GMT
Author: orw
Date: Wed Nov  9 13:51:56 2011
New Revision: 1199758

URL: http://svn.apache.org/viewvc?rev=1199758&view=rev
Log:
118573 - correction for the removal of module jfreereport: adjustments in order to make a
build of the Report Builder extension possible with a jfreereport which is available in the
system

Modified:
    incubator/ooo/trunk/main/configure.in
    incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
    incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
    incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/util/makefile.mk
    incubator/ooo/trunk/main/reportbuilder/util/makefile.mk
    incubator/ooo/trunk/main/set_soenv.in

Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1199758&r1=1199757&r2=1199758&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Wed Nov  9 13:51:56 2011
@@ -6103,6 +6103,7 @@ AC_MSG_CHECKING([whether to build the Re
 if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA"
!= "no"; then
   AC_MSG_RESULT([yes])
   ENABLE_REPORTBUILDER=YES
+  SYSTEM_JFREEREPORT=YES
   AC_MSG_CHECKING([for reportbuilder module])
   if test -d ./reportbuilder; then
     AC_MSG_RESULT([OK])
@@ -6273,6 +6274,7 @@ else
   ENABLE_REPORTBUILDER=NO
 fi
 AC_SUBST(ENABLE_REPORTBUILDER)
+AC_SUBST(SYSTEM_JFREEREPORT)
 AC_SUBST(SAC_JAR)
 AC_SUBST(LIBXML_JAR)
 AC_SUBST(FLUTE_JAR)

Modified: incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk?rev=1199758&r1=1199757&r2=1199758&view=diff
==============================================================================
--- incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
(original)
+++ incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk
Wed Nov  9 13:51:56 2011
@@ -32,12 +32,12 @@ PACKAGE = com$/sun$/star$/report$/functi
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
-.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
 #----- compile .java files -----------------------------------------
 
 .IF "$(SYSTEM_JFREEREPORT)" == "YES"
 EXTRAJARFILES = $(LIBBASE_JAR) $(LIBFORMULA_JAR)
 .ELSE
+.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
 JARFILES += \
 	libbase-$(LIBBASE_VERSION).jar                      \
 	libformula-$(LIBFORMULA_VERSION).jar

Modified: incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk?rev=1199758&r1=1199757&r2=1199758&view=diff
==============================================================================
--- incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk (original)
+++ incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/pentaho/makefile.mk Wed
Nov  9 13:51:56 2011
@@ -33,13 +33,13 @@ PACKAGE = com$/sun$/star$/report$/pentah
 nodep=true
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
-.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
 
 #----- compile .java files -----------------------------------------
 JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
 .IF "$(SYSTEM_JFREEREPORT)" == "YES"
 EXTRAJARFILES += $(FLUTE_JAR) $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR) $(LIBLOADER_JAR)
$(SAC_JAR) $(LIBLAYOUT_JAR) $(LIBSERIALIZER_JAR) $(LIBFONTS_JAR) $(LIBFORMULA_JAR) $(LIBREPOSITORY_JAR)
 .ELSE
+.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
 JARFILES += \
 	flute-$(FLUTE_VERSION).jar				            \
 	libserializer-$(LIBSERIALIZER_VERSION).jar			\

Modified: incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/util/makefile.mk?rev=1199758&r1=1199757&r2=1199758&view=diff
==============================================================================
--- incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/reportbuilder/java/com/sun/star/report/util/makefile.mk Wed Nov
 9 13:51:56 2011
@@ -32,12 +32,12 @@ PACKAGE = com$/sun$/star$/report$/util
 
 # --- Settings -----------------------------------------------------
 .INCLUDE: settings.mk
-.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
 #----- compile .java files -----------------------------------------
 
 .IF "$(SYSTEM_JFREEREPORT)" == "YES"
 EXTRAJARFILES   = $(LIBBASE_JAR) $(LIBXML_JAR) $(JFREEREPORT_JAR)
 .ELSE
+.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
 JARFILES += \
 	libbase-$(LIBBASE_VERSION).jar                      \
 	libxml-$(LIBXML_VERSION).jar						\

Modified: incubator/ooo/trunk/main/reportbuilder/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/reportbuilder/util/makefile.mk?rev=1199758&r1=1199757&r2=1199758&view=diff
==============================================================================
--- incubator/ooo/trunk/main/reportbuilder/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/reportbuilder/util/makefile.mk Wed Nov  9 13:51:56 2011
@@ -38,7 +38,6 @@ EXTENSION_VERSION_BASE=1.2.1
 
 # --- Settings ----------------------------------
 .INCLUDE :  makefile.pmk
-.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
 
 .IF "$(L10N_framework)"==""
 # ------------------------------------------------------------------
@@ -97,6 +96,7 @@ COMPONENT_EXTJARFILES = \
 	$(EXTENSIONDIR)$/reportbuilderwizard.jar
 
 .IF "$(SYSTEM_JFREEREPORT)" != "YES"
+.INCLUDE :  $(SOLARBINDIR)/jfreereport_version.mk
 COMPONENT_EXTJARFILES += \
 	$(EXTENSIONDIR)$/flute-$(FLUTE_VERSION).jar				            \
 	$(EXTENSIONDIR)$/libserializer-$(LIBSERIALIZER_VERSION).jar			\

Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1199758&r1=1199757&r2=1199758&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Wed Nov  9 13:51:56 2011
@@ -1645,6 +1645,7 @@ ToFile( "ENABLE_PRESENTER_EXTRA_UI","@EN
 ToFile( "ENABLE_MINIMIZER",   "@ENABLE_MINIMIZER@","e" );
 ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
 ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
+ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
 ToFile( "OOO_JUNIT_JAR",     "@OOO_JUNIT_JAR@",    "e" );
 ToFile( "SAC_JAR",           "@SAC_JAR@",          "e" );
 ToFile( "LIBXML_JAR",        "@LIBXML_JAR@",       "e" );



Mime
View raw message