#124410# update apache commons-codec to version 1.6

git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1580879 13f79535-47bb-0310-9956-ffa450edef68
apache · Mar 24, 2014 · 47d3be6 · 47d3be6
1 parent 21f06b2
commit 47d3be6
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
diff --git a/main/apache-commons/java/codec/makefile.mk b/main/apache-commons/java/codec/makefile.mk
@@ -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=

diff --git a/main/apache-commons/patches/codec.patch b/main/apache-commons/patches/codec.patch
@@ -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"/>