Author: jsc
Date: Mon Mar 24 15:08:40 2014
New Revision: 1580879
URL: http://svn.apache.org/r1580879
Log:
#124410# update apache commons-codec to version 1.6
Modified:
openoffice/trunk/main/apache-commons/java/codec/makefile.mk
openoffice/trunk/main/apache-commons/patches/codec.patch
Modified: openoffice/trunk/main/apache-commons/java/codec/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/apache-commons/java/codec/makefile.mk?rev=1580879&r1=1580878&r2=1580879&view=diff
==============================================================================
--- openoffice/trunk/main/apache-commons/java/codec/makefile.mk (original)
+++ openoffice/trunk/main/apache-commons/java/codec/makefile.mk Mon Mar 24
15:08:40 2014
@@ -38,16 +38,21 @@ ANT_BUILDFILE=build.xml
.IF "$(SOLAR_JAVA)" != "" && "$(ENABLE_MEDIAWIKI)" == "YES"
# --- Files --------------------------------------------------------
-TARFILE_NAME=commons-codec-1.6-src
-TARFILE_MD5=2e482c7567908d334785ce7d69ddfff7
+TARFILE_NAME=commons-codec-1.9-src
+TARFILE_MD5=db87f7004cefc9d17f7ac841f86122bd
+#TARFILE_NAME=commons-codec-1.6-src
+#TARFILE_MD5=2e482c7567908d334785ce7d69ddfff7
-TARFILE_ROOTDIR=commons-codec-1.6-src
+TARFILE_ROOTDIR=commons-codec-1.9-src
+#TARFILE_ROOTDIR=commons-codec-1.6-src
-PATCH_FILES=$(PRJ)$/patches$/codec.patch
+#PATCH_FILES=
+#PATCH_FILES=$(PRJ)$/patches$/codec.patch
#CONVERTFILES=build.xml
-
-OUT2CLASS=dist$/commons-codec-1.6-SNAPSHOT.jar
+
+OUT2CLASS=dist$/commons-codec-1.9.jar
+#OUT2CLASS=dist$/commons-codec-1.6-SNAPSHOT.jar
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
Modified: openoffice/trunk/main/apache-commons/patches/codec.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/apache-commons/patches/codec.patch?rev=1580879&r1=1580878&r2=1580879&view=diff
==============================================================================
--- openoffice/trunk/main/apache-commons/patches/codec.patch (original)
+++ openoffice/trunk/main/apache-commons/patches/codec.patch Mon Mar 24
15:08:40 2014
@@ -1,20 +1,20 @@
---- misc/build/commons-codec-1.6-src/build.xml-old 2012-05-05
22:12:32.000000000 -0500
-+++ misc/build/commons-codec-1.6-src/build.xml 2012-05-05 22:16:00.000000000
-0500
+--- misc/build/commons-codec-1.9-src/build.xml-old 2012-05-05
22:12:32.000000000 -0500
++++ misc/build/commons-codec-1.9-src/build.xml 2012-05-05 22:16:00.000000000
-0500
@@ -96,7 +96,6 @@
- </target>
- <target name="dist" depends="compile, javadoc" description="Create binary
distribution">
- <mkdir dir="${dist.home}"/>
-- <copy file="${basedir}/LICENSE.txt" todir="${dist.home}"/>
- <copy file="${basedir}/NOTICE.txt" todir="${dist.home}"/>
- <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
- <antcall target="jar"/>
+ </target>
+ <target name="dist" depends="compile, javadoc" description="Create binary
distribution">
+ <mkdir dir="${dist.home}"/>
+- <copy file="${basedir}/LICENSE.txt" todir="${dist.home}"/>
+ <copy file="${basedir}/NOTICE.txt" todir="${dist.home}"/>
+ <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/>
+ <antcall target="jar"/>
@@ -104,8 +103,7 @@
- <target name="jar" depends="compile" description="Create jar">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${build.home}/classes/META-INF"/>
-- <copy file="${basedir}/LICENSE.txt"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
-- <copy file="${basedir}/LICENSE.txt"
tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
-+ <copy file="${basedir}/NOTICE.txt"
tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
- <jar jarfile="${dist.home}/${final.name}.jar"
basedir="${build.home}/classes">
- <manifest>
- <attribute name="Specification-Title" value="Commons Codec"/>
+ <target name="jar" depends="compile" description="Create jar">
+ <mkdir dir="${dist.home}"/>
+ <mkdir dir="${build.home}/classes/META-INF"/>
+- <copy file="${basedir}/LICENSE.txt"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+- <copy file="${basedir}/LICENSE.txt"
tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
++ <copy file="${basedir}/NOTICE.txt"
tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+ <jar jarfile="${dist.home}/${final.name}.jar"
basedir="${build.home}/classes">
+ <manifest>
+ <attribute name="Specification-Title" value="Commons Codec"/>
