diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-03-23 13:41:17 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-03-23 13:41:17 +0000 |
| commit | dc0c53db2abd77ae481ba30280b153cca47c3230 (patch) | |
| tree | 5c583b4e7449e3da488ecebff4723f5ed818cb2f /apache-commons | |
| parent | 75c1670171db15129ce0237eb9635ba664561f70 (diff) | |
CWS-TOOLING: integrate CWS rptfix06_DEV300
2009-03-19 08:14:23 +0100 rene r269715 : #i10000#
2009-03-18 23:48:16 +0100 rene r269709 : #i100334# also reportbuilder
2009-03-18 22:39:42 +0100 rene r269706 : #i100334# fix build with system apache-commons
2009-03-18 22:34:24 +0100 rene r269705 : #i100335# build libs only when needed
2009-03-17 13:24:17 +0100 rene r269600 : fix system-* for the SRB
Diffstat (limited to 'apache-commons')
| -rw-r--r-- | apache-commons/java/codec/makefile.mk | 4 | ||||
| -rw-r--r-- | apache-commons/java/httpclient/makefile.mk | 4 | ||||
| -rw-r--r-- | apache-commons/java/lang/makefile.mk | 4 | ||||
| -rw-r--r-- | apache-commons/java/logging/makefile.mk | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/apache-commons/java/codec/makefile.mk b/apache-commons/java/codec/makefile.mk index 7945803bf867..6a6d637fde7d 100644 --- a/apache-commons/java/codec/makefile.mk +++ b/apache-commons/java/codec/makefile.mk @@ -43,7 +43,7 @@ ANT_BUILDFILE=build.xml .INCLUDE : antsettings.mk -.IF "$(SOLAR_JAVA)" != "" +.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES" # --- Files -------------------------------------------------------- TARFILE_NAME=commons-codec-1.3-src @@ -71,7 +71,7 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar .INCLUDE : set_ext.mk .INCLUDE : target.mk -.IF "$(SOLAR_JAVA)" != "" +.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES" .INCLUDE : tg_ext.mk .ENDIF diff --git a/apache-commons/java/httpclient/makefile.mk b/apache-commons/java/httpclient/makefile.mk index 8d3c696705f2..7070a07d5a6a 100644 --- a/apache-commons/java/httpclient/makefile.mk +++ b/apache-commons/java/httpclient/makefile.mk @@ -43,7 +43,7 @@ ANT_BUILDFILE=build.xml .INCLUDE : antsettings.mk -.IF "$(SOLAR_JAVA)" != "" +.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES" # --- Files -------------------------------------------------------- TARFILE_NAME=commons-httpclient-3.1-src @@ -74,7 +74,7 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dcommons-logging.jar= .INCLUDE : set_ext.mk .INCLUDE : target.mk -.IF "$(SOLAR_JAVA)" != "" +.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES" .INCLUDE : tg_ext.mk .ENDIF diff --git a/apache-commons/java/lang/makefile.mk b/apache-commons/java/lang/makefile.mk index 3699660632f5..5db479dbd58c 100644 --- a/apache-commons/java/lang/makefile.mk +++ b/apache-commons/java/lang/makefile.mk @@ -43,7 +43,7 @@ ANT_BUILDFILE=build.xml .INCLUDE : antsettings.mk -.IF "$(SOLAR_JAVA)" != "" +.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES" # --- Files -------------------------------------------------------- TARFILE_NAME=commons-lang-2.3-src @@ -71,7 +71,7 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar .INCLUDE : set_ext.mk .INCLUDE : target.mk -.IF "$(SOLAR_JAVA)" != "" +.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES" .INCLUDE : tg_ext.mk .ENDIF diff --git a/apache-commons/java/logging/makefile.mk b/apache-commons/java/logging/makefile.mk index ab3476974b1b..8874c700a998 100644 --- a/apache-commons/java/logging/makefile.mk +++ b/apache-commons/java/logging/makefile.mk @@ -43,7 +43,7 @@ ANT_BUILDFILE=build.xml .INCLUDE : antsettings.mk -.IF "$(SOLAR_JAVA)" != "" +.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" ) # --- Files -------------------------------------------------------- TARFILE_NAME=commons-logging-1.1.1-src @@ -75,7 +75,7 @@ BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) -Ds .INCLUDE : set_ext.mk .INCLUDE : target.mk -.IF "$(SOLAR_JAVA)" != "" +.IF "$(SOLAR_JAVA)" != "" && ( "$(ENABLE_MEDIAWIKI)" == "YES" || "$(ENABLE_REPORTBUILDER)" == "YES" ) .INCLUDE : tg_ext.mk .ENDIF |