You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2014/03/24 16:18:26 UTC
svn commit: r1580882 - in /openoffice/trunk/main: configure.in
external_deps.lst swext/mediawiki/build.xml swext/mediawiki/makefile.mk
Author: jsc
Date: Mon Mar 24 15:18:26 2014
New Revision: 1580882
URL: http://svn.apache.org/r1580882
Log:
#124410# #124411# related change to version upgrades code, logging
Modified:
openoffice/trunk/main/configure.in
openoffice/trunk/main/external_deps.lst
openoffice/trunk/main/swext/mediawiki/build.xml
openoffice/trunk/main/swext/mediawiki/makefile.mk
Modified: openoffice/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1580882&r1=1580881&r2=1580882&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Mon Mar 24 15:18:26 2014
@@ -2882,7 +2882,7 @@ if test "z$with_build_version" != "z"; t
BUILD_VER_STRING=$with_build_version
AC_MSG_RESULT([yes, $BUILD_VER_STRING])
else
- BUILD_VER_STRING=
+ BUILD_VER_STRING=`date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)"`
AC_MSG_RESULT([no])
fi
AC_SUBST(BUILD_VER_STRING)
@@ -6294,8 +6294,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "
AC_MSG_RESULT([external])
if test "$ENABLE_MEDIAWIKI" = "YES"; then
if test -z $COMMONS_CODEC_JAR; then
- AC_CHECK_FILE(/usr/share/java/commons-codec-1.6.jar,
- [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.6.jar ],
+ AC_CHECK_FILE(/usr/share/java/commons-codec-1.9.jar,
+ [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.9.jar ],
[
AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
[ COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar ],
@@ -6309,8 +6309,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "
fi
if test -z $COMMONS_LANG_JAR; then
- AC_CHECK_FILE(/usr/share/java/commons-lang-2.4.jar,
- [ COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.4.jar ],
+ AC_CHECK_FILE(/usr/share/java/commons-lang3-3.3.jar,
+ [ COMMONS_LANG_JAR=/usr/share/java/commons-lang3-3.3.jar ],
[
AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
[ COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar ],
@@ -6340,8 +6340,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "
fi
if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
if test -z $COMMONS_LOGGING_JAR; then
- AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.1.jar,
- [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar ],
+ AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.3.jar,
+ [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.3.jar ],
[
AC_CHECK_FILE(/usr/share/java/commons-logging.jar,
[ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
Modified: openoffice/trunk/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1580882&r1=1580881&r2=1580882&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Mon Mar 24 15:18:26 2014
@@ -109,15 +109,14 @@ if (GUI!=UNX || SYSTEM_ZLIB!=YES)
if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
MD5 = 2c9b0f83ed5890af02c0df1c1776f39b
name = commons-httpclient-3.1-src.tar.gz
- URL1 = http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.tar.gz
+ URL1 = http://archive.apache.org/dist/httpcomponents/commons-httpclient/source/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
- MD5 = 2e482c7567908d334785ce7d69ddfff7
- name = commons-codec-1.6-src.tar.gz
- URL1 = http://archive.apache.org/dist/commons/codec/source/commons-codec-1.6-src.tar.gz
- URL2 = http://apache.spinellicreations.com//commons/codec/source/commons-codec-1.6-src.tar.gz
- URL3 = $(OOO_EXTRAS)$(MD5)-$(name)
+ MD5 = db87f7004cefc9d17f7ac841f86122bd
+ name = commons-codec-1.9-src.tar.gz
+ URL1 = http://archive.apache.org/dist/commons/codec/source/$(name)
+ URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
MD5 = 2f6ecca935948f7db92d925d88d0d078
@@ -132,10 +131,9 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))
- MD5 = 3c219630e4302863a9a83d0efde889db
- name = commons-logging-1.1.1-src.tar.gz
- # This seems to be the original host, but the MD5 sum does not match.
- # URL1 = http://archive.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz
+ MD5 = e8e197d628436490886d17cffa108fe3
+ name = commons-logging-1.1.3-src.tar.gz
+ URL1 = http://archive.apache.org/dist/commons/logging/source/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_JPEG != YES)
@@ -145,9 +143,9 @@ if (SYSTEM_JPEG != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
- MD5 = 625ff5f2f968dd908bca43c9469d6e6b
- name = commons-lang-2.4-src.tar.gz
- URL1 = http://archive.apache.org/dist/commons/lang/source/commons-lang-2.4-src.tar.gz
+ MD5 = 4c8c505cc3cba4c467c479e3e0f09ba4
+ name = commons-lang3-3.3-src.tar.gz
+ URL1 = http://archive.apache.org/dist/commons/lang/source/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
@@ -242,9 +240,9 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (RAT_JAR_HOME==BUILD)
- MD5 = e4244e69eb3644e71c254aea5952a918
- name = apache-rat-incubating-0.8-bin.tar.bz2
- URL1 = http://archive.apache.org/dist/incubator/rat/binaries/$(name)
+ MD5 = 0f926196d42577addec7e1aa5b510605
+ name = apache-rat-0.10-bin.tar.bz2
+ URL1 = http://archive.apache.org/dist/creadur/apache-rat-0.10/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
###############################################################################
Modified: openoffice/trunk/main/swext/mediawiki/build.xml
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/swext/mediawiki/build.xml?rev=1580882&r1=1580881&r2=1580882&view=diff
==============================================================================
--- openoffice/trunk/main/swext/mediawiki/build.xml (original)
+++ openoffice/trunk/main/swext/mediawiki/build.xml Mon Mar 24 15:18:26 2014
@@ -95,7 +95,7 @@
<jar basedir="${classes}" compress="true" jarfile="${dist}/${target}.jar">
<manifest>
<!-- FIXME: Set Class-Path correctly for the system case !-->
- <attribute name="Class-Path" value="commons-codec-1.6.jar commons-lang-2.4.jar commons-httpclient-3.1.jar commons-logging-1.1.1.jar"/>
+ <attribute name="Class-Path" value="commons-codec-1.9.jar commons-lang3-3.3.jar commons-httpclient-3.1.jar commons-logging-1.1.3.jar"/>
<attribute name="RegistrationClassName" value="com.sun.star.wiki.WikiEditorImpl"/>
</manifest>
</jar>
Modified: openoffice/trunk/main/swext/mediawiki/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/swext/mediawiki/makefile.mk?rev=1580882&r1=1580881&r2=1580882&view=diff
==============================================================================
--- openoffice/trunk/main/swext/mediawiki/makefile.mk (original)
+++ openoffice/trunk/main/swext/mediawiki/makefile.mk Mon Mar 24 15:18:26 2014
@@ -29,10 +29,10 @@ TARGET=mediawiki
.INCLUDE : ant.mk
.IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
-COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.6.jar
-COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.4.jar
+COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.9.jar
+COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang3-3.3.jar
COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-httpclient-3.1.jar
-COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.1.jar
+COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.3.jar
.ELSE
COMP=fix_system_commons
.ENDIF