Skip to content

C
core
Kaydet (Commit) 906514f1 authored tarafından Jürgen Schmidt's avatar Jürgen Schmidt
Dosyalara gözat
Seçenekler

#124410# #124411# related change to version upgrades code, logging

üst a399c255
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 27 deletions
configure.in
Dosyayı görüntüle @ 906514f1
...@@ -2882,7 +2882,7 @@ if test "z$with_build_version" != "z"; then ...@@ -2882,7 +2882,7 @@ if test "z$with_build_version" != "z"; then
BUILD_VER_STRING=$with_build_version BUILD_VER_STRING=$with_build_version
AC_MSG_RESULT([yes, $BUILD_VER_STRING]) AC_MSG_RESULT([yes, $BUILD_VER_STRING])
else else
BUILD_VER_STRING= BUILD_VER_STRING=`date +"%Y-%m-%d %H:%M:%S (%a, %d %b %Y)"`
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_SUBST(BUILD_VER_STRING) AC_SUBST(BUILD_VER_STRING)
...@@ -6294,8 +6294,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then ...@@ -6294,8 +6294,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
if test "$ENABLE_MEDIAWIKI" = "YES"; then if test "$ENABLE_MEDIAWIKI" = "YES"; then
if test -z $COMMONS_CODEC_JAR; then if test -z $COMMONS_CODEC_JAR; then
AC_CHECK_FILE(/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.6.jar ], [ COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.9.jar ],
[ [
AC_CHECK_FILE(/usr/share/java/commons-codec.jar, AC_CHECK_FILE(/usr/share/java/commons-codec.jar,
[ COMMONS_CODEC_JAR=/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 "$ENABLE_REPORTBUILDER" = "YES"; then ...@@ -6309,8 +6309,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
fi fi
if test -z $COMMONS_LANG_JAR; then if test -z $COMMONS_LANG_JAR; then
AC_CHECK_FILE(/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-lang-2.4.jar ], [ COMMONS_LANG_JAR=/usr/share/java/commons-lang3-3.3.jar ],
[ [
AC_CHECK_FILE(/usr/share/java/commons-lang.jar, AC_CHECK_FILE(/usr/share/java/commons-lang.jar,
[ COMMONS_LANG_JAR=/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 "$ENABLE_REPORTBUILDER" = "YES"; then ...@@ -6340,8 +6340,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
fi fi
if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then
if test -z $COMMONS_LOGGING_JAR; then if test -z $COMMONS_LOGGING_JAR; then
AC_CHECK_FILE(/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.1.jar ], [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.3.jar ],
[ [
AC_CHECK_FILE(/usr/share/java/commons-logging.jar, AC_CHECK_FILE(/usr/share/java/commons-logging.jar,
[ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ], [ COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
......
external_deps.lst
Dosyayı görüntüle @ 906514f1
...@@ -109,15 +109,14 @@ if (GUI!=UNX || SYSTEM_ZLIB!=YES) ...@@ -109,15 +109,14 @@ if (GUI!=UNX || SYSTEM_ZLIB!=YES)
if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES) if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
MD5 = 2c9b0f83ed5890af02c0df1c1776f39b MD5 = 2c9b0f83ed5890af02c0df1c1776f39b
name = commons-httpclient-3.1-src.tar.gz 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) URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES) if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
MD5 = 2e482c7567908d334785ce7d69ddfff7 MD5 = db87f7004cefc9d17f7ac841f86122bd
name = commons-codec-1.6-src.tar.gz name = commons-codec-1.9-src.tar.gz
URL1 = http://archive.apache.org/dist/commons/codec/source/commons-codec-1.6-src.tar.gz URL1 = http://archive.apache.org/dist/commons/codec/source/$(name)
URL2 = http://apache.spinellicreations.com//commons/codec/source/commons-codec-1.6-src.tar.gz URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
URL3 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true ) if ( true )
MD5 = 2f6ecca935948f7db92d925d88d0d078 MD5 = 2f6ecca935948f7db92d925d88d0d078
...@@ -132,10 +131,9 @@ if ( true ) ...@@ -132,10 +131,9 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(SHA1)-$(name) URL2 = $(OOO_EXTRAS)$(SHA1)-$(name)
if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES)) if (SOLAR_JAVA==TRUE && (ENABLE_MEDIAWIKI==YES || ENABLE_REPORTBUILDER==YES))
MD5 = 3c219630e4302863a9a83d0efde889db MD5 = e8e197d628436490886d17cffa108fe3
name = commons-logging-1.1.1-src.tar.gz name = commons-logging-1.1.3-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/$(name)
# URL1 = http://archive.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_JPEG != YES) if (SYSTEM_JPEG != YES)
...@@ -145,9 +143,9 @@ if (SYSTEM_JPEG != YES) ...@@ -145,9 +143,9 @@ if (SYSTEM_JPEG != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES) if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
MD5 = 625ff5f2f968dd908bca43c9469d6e6b MD5 = 4c8c505cc3cba4c467c479e3e0f09ba4
name = commons-lang-2.4-src.tar.gz name = commons-lang3-3.3-src.tar.gz
URL1 = http://archive.apache.org/dist/commons/lang/source/commons-lang-2.4-src.tar.gz URL1 = http://archive.apache.org/dist/commons/lang/source/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE) if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
...@@ -242,9 +240,9 @@ if ( true ) ...@@ -242,9 +240,9 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(MD5)-$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (RAT_JAR_HOME==BUILD) if (RAT_JAR_HOME==BUILD)
MD5 = e4244e69eb3644e71c254aea5952a918 MD5 = 0f926196d42577addec7e1aa5b510605
name = apache-rat-incubating-0.8-bin.tar.bz2 name = apache-rat-0.10-bin.tar.bz2
URL1 = http://archive.apache.org/dist/incubator/rat/binaries/$(name) URL1 = http://archive.apache.org/dist/creadur/apache-rat-0.10/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name) URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
############################################################################### ###############################################################################
......
swext/mediawiki/build.xml
Dosyayı görüntüle @ 906514f1
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<jar basedir="${classes}" compress="true" jarfile="${dist}/${target}.jar"> <jar basedir="${classes}" compress="true" jarfile="${dist}/${target}.jar">
<manifest> <manifest>
<!-- FIXME: Set Class-Path correctly for the system case !--> <!-- 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"/> <attribute name="RegistrationClassName" value="com.sun.star.wiki.WikiEditorImpl"/>
</manifest> </manifest>
</jar> </jar>
......
swext/mediawiki/makefile.mk
Dosyayı görüntüle @ 906514f1
...@@ -29,10 +29,10 @@ TARGET=mediawiki ...@@ -29,10 +29,10 @@ TARGET=mediawiki
.INCLUDE : ant.mk .INCLUDE : ant.mk
.IF "$(SYSTEM_APACHE_COMMONS)" != "YES" .IF "$(SYSTEM_APACHE_COMMONS)" != "YES"
COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.6.jar COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.9.jar
COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.4.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_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 .ELSE
COMP=fix_system_commons COMP=fix_system_commons
.ENDIF .ENDIF
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment