ooo-build r11447 - in trunk: . patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Tue Jan 29 20:18:30 2008
New Revision: 11447
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11447&view=rev

Log:
2008-01-29  Petr Mladek  <pmladek suse cz>

	* patches/src680/build-java-target.diff: set target also for sac.jar
	  that is part of the jfreereport module



Modified:
   trunk/ChangeLog
   trunk/patches/src680/build-java-target.diff

Modified: trunk/patches/src680/build-java-target.diff
==============================================================================
--- trunk/patches/src680/build-java-target.diff	(original)
+++ trunk/patches/src680/build-java-target.diff	Tue Jan 29 20:18:30 2008
@@ -438,6 +438,136 @@
 +                   optimize="${build.optimize}"
 +           >
 dummy line to avoid confusing diff-mode
+--- jfreereport/java/sac/makefile.mk.old	2008-01-11 09:27:31.000000000 +0100
++++ jfreereport/java/sac/makefile.mk	2008-01-29 17:56:18.000000000 +0100
+@@ -38,16 +38,12 @@ PRJ=..$/..
+ PRJNAME=jfreereport
+ TARGET=sac-1.3
+ 
++.IF "$(SOLAR_JAVA)" != ""
++
+ # --- Settings -----------------------------------------------------
+ 
+ .INCLUDE :	settings.mk
+ 
+-# override buildfile
+-ANT_BUILDFILE=build.xml
+-
+-.INCLUDE : antsettings.mk
+-
+-.IF "$(SOLAR_JAVA)" != ""
+ # --- Files --------------------------------------------------------
+ 
+ TARFILE_NAME=sacjava-1.3
+@@ -56,31 +52,26 @@ TARFILE_ROOTDIR=$(TARGET)
+ 
+ PATCH_FILE_NAME=patches$/sac.patch
+ 
+-ADDITIONAL_FILES=build.xml
++ADDITIONAL_FILES=build.xml \
++		 makefile.mk
+ 
+ # CONVERTFILES=build.xml
+ 
+-.IF "$(JAVACISGCJ)"=="yes"
+-JAVA_HOME=
+-.EXPORT : JAVA_HOME
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) all
+-.ELSE
+-BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) all
+-.ENDIF
+-
+-.ENDIF # $(SOLAR_JAVA)!= ""
++BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+ 
+ # --- Targets ------------------------------------------------------
+ 
+ .INCLUDE : set_ext.mk
+ .INCLUDE : target.mk
+ 
+-.IF "$(SOLAR_JAVA)" != ""
+ .INCLUDE : tg_ext.mk
+ 
+ ALLTAR : $(CLASSDIR)$/sac.jar
+ 
+ $(CLASSDIR)$/sac.jar : $(PACKAGE_DIR)$/$(INSTALL_FLAG_FILE)
+ 	$(COPY) $(PACKAGE_DIR)$/$(TARFILE_ROOTDIR)$/build$/lib$/sac.jar $(CLASSDIR)$/sac.jar
+-.ENDIF
+ 
++.ELSE
++ all:
++       @echo java disabled
++.ENDIF
+dummy line to avoid confusing diff-mode
+--- jfreereport/patches/sac.patch.old	2008-01-11 09:30:07.000000000 +0100
++++ jfreereport/patches/sac.patch	2008-01-29 17:58:23.000000000 +0100
+@@ -1,3 +1,56 @@
++*** misc/sac-1.3/makefile.mk.dummy	2008-01-29 14:31:39.000000000 +0100
++--- misc/build/sac-1.3/makefile.mk	2008-01-29 17:35:10.000000000 +0100
++***************
++*** 1 ****
++! dummy
++--- 1,47 ----
++! #*************************************************************************
++! #
++! #   OpenOffice.org - a multi-platform office productivity suite
++! #
++! #   $RCSfile$
++! #
++! #   $Revision$
++! #
++! #   last change: $Author$ $Date$
++! #
++! #   The Contents of this file are made available subject to
++! #   the terms of GNU Lesser General Public License Version 2.1.
++! #
++! #
++! #     GNU Lesser General Public License Version 2.1
++! #     =============================================
++! #     Copyright 2005 by Sun Microsystems, Inc.
++! #     901 San Antonio Road, Palo Alto, CA 94303, USA
++! #
++! #     This library is free software; you can redistribute it and/or
++! #     modify it under the terms of the GNU Lesser General Public
++! #     License version 2.1, as published by the Free Software Foundation.
++! #
++! #     This library is distributed in the hope that it will be useful,
++! #     but WITHOUT ANY WARRANTY; without even the implied warranty of
++! #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++! #     Lesser General Public License for more details.
++! #
++! #     You should have received a copy of the GNU Lesser General Public
++! #     License along with this library; if not, write to the Free Software
++! #     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++! #     MA  02111-1307  USA
++! #
++! #*************************************************************************
++! 
++! PRJ=..$/..$/..$/..
++! PRJNAME=jfreereport
++! TARGET=sac-1.3
++! 
++! # buildfile is in a subdirectory
++! ANT_BUILDFILE=build.xml
++! 
++! .INCLUDE : ant.mk
++! 
++! ANT_FLAGS+=-Dbuild.label="build-$(RSCREVISION)" jar
++! 
++! ALLTAR : ANTBUILD
+ *** misc/sac-1.3/build.xml	Thu Oct 18 09:22:24 2007
+ --- misc/build/sac-1.3/build.xml	Thu Oct 18 08:53:59 2007
+ ***************
+@@ -40,7 +93,7 @@
+ ! 
+ !   <!-- Build classes -->
+ !   <target name="classes" depends="prepare">
+-!     <javac srcdir="${src}" destdir="${build.classes}" debug="off" optimize="on"/>
++!     <javac srcdir="${src}" destdir="${build.classes}" source="${java.source.ver}" target="${java.target.ver}" debug="off" optimize="on"/>
+ !     <copy todir="${build.classes}">
+ !       <fileset dir="${src}">
+ !         <include name="**/*.properties"/>
+dummy line to avoid confusing diff-mode
 --- rhino/makefile.mk.old	2008-01-04 13:29:01.000000000 +0100
 +++ rhino/makefile.mk	2008-01-29 12:34:37.000000000 +0100
 @@ -42,7 +42,6 @@ TARGET=ooo_rhino