etch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vei...@apache.org
Subject svn commit: r1518250 - in /etch/trunk: binding-c/runtime/build.xml binding-c/runtime/c/CMakeLists.txt binding-c/runtime/c/README.txt scripts/apr-install.bat scripts/apr-install.sh
Date Wed, 28 Aug 2013 15:08:47 GMT
Author: veithm
Date: Wed Aug 28 15:08:47 2013
New Revision: 1518250

URL: http://svn.apache.org/r1518250
Log:
ETCH-224 Updating APR from version 1.4.5 to 1.4.8

Change-Id: Ia653ebe171ee78dc4b1a47619433406c233a9538

Modified:
    etch/trunk/binding-c/runtime/build.xml
    etch/trunk/binding-c/runtime/c/CMakeLists.txt
    etch/trunk/binding-c/runtime/c/README.txt
    etch/trunk/scripts/apr-install.bat
    etch/trunk/scripts/apr-install.sh

Modified: etch/trunk/binding-c/runtime/build.xml
URL: http://svn.apache.org/viewvc/etch/trunk/binding-c/runtime/build.xml?rev=1518250&r1=1518249&r2=1518250&view=diff
==============================================================================
--- etch/trunk/binding-c/runtime/build.xml (original)
+++ etch/trunk/binding-c/runtime/build.xml Wed Aug 28 15:08:47 2013
@@ -97,7 +97,7 @@
 
         <!-- copy apr library to dist folder -->
         <copy todir="${Etch.dist}/binding-c/extern/apr">
-            <fileset dir="${env.ETCH_EXTERNAL_DEPENDS}/apr/1.4.5">
+            <fileset dir="${env.ETCH_EXTERNAL_DEPENDS}/apr/1.4.8">
             </fileset>
         </copy>
     </target>

Modified: etch/trunk/binding-c/runtime/c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/etch/trunk/binding-c/runtime/c/CMakeLists.txt?rev=1518250&r1=1518249&r2=1518250&view=diff
==============================================================================
--- etch/trunk/binding-c/runtime/c/CMakeLists.txt (original)
+++ etch/trunk/binding-c/runtime/c/CMakeLists.txt Wed Aug 28 15:08:47 2013
@@ -31,7 +31,7 @@ ENDIF (UNIX)
 add_definitions(-D_UNICODE -DUNICODE)
 
 # APR library
-SET(APR ${ETCH_EXTERNAL_DEPENDS}/apr/1.4.5)
+SET(APR ${ETCH_EXTERNAL_DEPENDS}/apr/1.4.8)
 FIND_PATH(APR_INCLUDE_DIR apr.h ${APR}/include ${APR}/include/apr-1)
 FIND_LIBRARY(APR_LIBRARY NAMES libapr-1.lib libapr-1.so PATHS ${APR}/lib NO_DEFAULT_PATH)
 IF (APR_INCLUDE_DIR AND APR_LIBRARY)
@@ -42,7 +42,7 @@ IF (NOT APR_FOUND)
 ENDIF (NOT APR_FOUND)
 
 # APR-ICONV library
-SET(APR ${ETCH_EXTERNAL_DEPENDS}/apr/1.4.5)
+SET(APR ${ETCH_EXTERNAL_DEPENDS}/apr/1.4.8)
 FIND_PATH(APR-ICONV_INCLUDE_DIR apr_iconv.h ${APR}/include ${APR}/include/apr-1)
 FIND_LIBRARY(APR-ICONV_LIBRARY NAMES libapriconv-1.lib libapriconv-1.so PATHS ${APR}/lib
NO_DEFAULT_PATH)
 IF (APR-ICONV_INCLUDE_DIR AND APR-ICONV_LIBRARY)

Modified: etch/trunk/binding-c/runtime/c/README.txt
URL: http://svn.apache.org/viewvc/etch/trunk/binding-c/runtime/c/README.txt?rev=1518250&r1=1518249&r2=1518250&view=diff
==============================================================================
--- etch/trunk/binding-c/runtime/c/README.txt (original)
+++ etch/trunk/binding-c/runtime/c/README.txt Wed Aug 28 15:08:47 2013
@@ -3,9 +3,9 @@ Introduction to binding-c
 ==================================================
 To build the binding-c components, the following dependencies
 are needed.
-- Apache APR Source Version 1.4.5
+- Apache APR Source Version 1.4.8
   http://apr.apache.org/download.cgi
-- Apache APR Util Sources Version 1.3.12
+- Apache APR Util Sources Version 1.5.2
   http://apr.apache.org/download.cgi
 - Apache APR Iconv Sources Version 1.2.1
   http://apr.apache.org/download.cgi
@@ -25,19 +25,19 @@ You should have the following folder and
 etch directory "ETCH_EXTERNAL_DEPENDS".
 
 APR and APR-ICONV libraries
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/bin
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/bin/libapr-1.dll
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/bin/libapr-1.pdb
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/bin/libapriconv-1.dll
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/bin/libapriconv-1.pdb
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/iconv
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/iconv/*.so + *.pdb (coding tables)
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/include
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/include/apr-1
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/include/apr-1/*.h (header files)
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/lib
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/lib/libapr-1.lib
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/lib/libapriconv-1.lib
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/bin
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/bin/libapr-1.dll
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/bin/libapr-1.pdb
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/bin/libapriconv-1.dll
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/bin/libapriconv-1.pdb
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/iconv
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/iconv/*.so + *.pdb (coding tables)
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/include
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/include/apr-1
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/include/apr-1/*.h (header files)
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/lib
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/lib/libapr-1.lib
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/lib/libapriconv-1.lib
 
 APR and APR-ICONV can be build via MS Visual Studio GUI. After that, all needed
 artifacts have to be copied to above folder and file structure. If you do so, please
@@ -90,7 +90,7 @@ and ../trunk/binding-c/runtime/c/target/
 
 Please note that tests need libapr-1.dll and libapriconv-1.dll either in your path environment
 variable or in case of MS Visual Studio under the ..\binding-c\runtime\c\target\src\test\
folder.
-Additionally, you have to set APR_ICONV_PATH to <ETCH_EXTERNAL_DEPENDS>\apr\1.4.5\iconv\
to make
+Additionally, you have to set APR_ICONV_PATH to <ETCH_EXTERNAL_DEPENDS>\apr\1.4.8\iconv\
to make
 character conversion run. 
 
 ==================================================
@@ -103,18 +103,18 @@ You should have the following folder and
 etch directory "ETCH_EXTERNAL_DEPENDS".
 
 APR and APR-ICONV libraries
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/bin
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/include
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/include/apr-1
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/include/apr-1/*.h (header files)
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/lib
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/lib/libapr-1.so
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/lib/libapriconv-1.so
-- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.5/lib/iconv/*.so (coding tables)
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/bin
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/include
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/include/apr-1
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/include/apr-1/*.h (header files)
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/lib
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/lib/libapr-1.so
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/lib/libapriconv-1.so
+- <ETCH_EXTERNAL_DEPENDS>/apr/1.4.8/lib/iconv/*.so (coding tables)
 
 APR and APR-ICONV can be build via "configure" and make. Please set correct install
-location to configure script configure --prefix=$INSTALL_PREFIX/apr/1.4.5/ for apr
-and configure --prefix=$INSTALL_PREFIX/apr/1.4.5/ --with-apr=$INSTALL_PREFIX/apr/1.4.5/
+location to configure script configure --prefix=$INSTALL_PREFIX/apr/1.4.8/ for apr
+and configure --prefix=$INSTALL_PREFIX/apr/1.4.8/ --with-apr=$INSTALL_PREFIX/apr/1.4.8/
 for apr-iconv.
 
 A much more easy way to build apr is to use our apr-install.sh script (). For build the apr
libraries,

Modified: etch/trunk/scripts/apr-install.bat
URL: http://svn.apache.org/viewvc/etch/trunk/scripts/apr-install.bat?rev=1518250&r1=1518249&r2=1518250&view=diff
==============================================================================
--- etch/trunk/scripts/apr-install.bat (original)
+++ etch/trunk/scripts/apr-install.bat Wed Aug 28 15:08:47 2013
@@ -69,17 +69,17 @@ cd apr
 
 REM apr
 rem svn export https://svn.apache.org/repos/asf/apr/apr/tags/1.4.6/ apr
-wget http://apache.imsam.info//apr/apr-1.4.6-win32-src.zip
-unzip apr-1.4.6-win32-src.zip
-mv apr-1.4.6 apr
-rm -rf apr-1.4.6-win32-src.zip
+wget http://apache.imsam.info//apr/apr-1.4.8-win32-src.zip
+unzip apr-1.4.8-win32-src.zip
+mv apr-1.4.8 apr
+rm -rf apr-1.4.8-win32-src.zip
 
 REM apr-util
 rem svn export https://svn.apache.org/repos/asf/apr/apr-util/tags/1.4.1/ apr-util
-wget http://apache.imsam.info//apr/apr-util-1.4.1-win32-src.zip
-unzip apr-util-1.4.1-win32-src.zip
-mv apr-util-1.4.1 apr-util
-rm -rf apr-util-1.4.1-win32-src.zip
+wget http://apache.imsam.info//apr/apr-util-1.5.2-win32-src.zip
+unzip apr-util-1.5.2-win32-src.zip
+mv apr-util-1.5.2 apr-util
+rm -rf apr-util-1.5.2-win32-src.zip
 
 REM apr-iconv
 rem svn export https://svn.apache.org/repos/asf/apr/apr-iconv/tags/1.2.1/ apr-iconv
@@ -149,8 +149,7 @@ cd ..\..
 goto :EOF
 
 :install
-rem should be 1.4.6 but this is a hack
-set INSTALL_PREFIX_APR=%INSTALL_PREFIX%\apr\1.4.5
+set INSTALL_PREFIX_APR=%INSTALL_PREFIX%\apr\1.4.8
 mkdir "%INSTALL_PREFIX_APR%\bin"
 mkdir "%INSTALL_PREFIX_APR%\iconv"
 mkdir "%INSTALL_PREFIX_APR%\include\apr-1"

Modified: etch/trunk/scripts/apr-install.sh
URL: http://svn.apache.org/viewvc/etch/trunk/scripts/apr-install.sh?rev=1518250&r1=1518249&r2=1518250&view=diff
==============================================================================
--- etch/trunk/scripts/apr-install.sh (original)
+++ etch/trunk/scripts/apr-install.sh Wed Aug 28 15:08:47 2013
@@ -17,7 +17,7 @@
 # under the License.                                           * 
 
 # set install prefix
-if [ $INSTALL_PREFIX = "" ]; then 
+if [ -z "$INSTALL_PREFIX" ]; then 
     export INSTALL_PREFIX=/tmp
 fi
 echo using INSTALL_PREFIX: $INSTALL_PREFIX
@@ -32,10 +32,10 @@ mkdir apr
 cd apr
 
 # apr
-svn export https://svn.apache.org/repos/asf/apr/apr/tags/1.4.6/ apr
+svn export https://svn.apache.org/repos/asf/apr/apr/tags/1.4.8/ apr
 
 #apr-util
-#svn export https://svn.apache.org/repos/asf/apr/apr-util/tags/1.4.1/ apr-util
+svn export https://svn.apache.org/repos/asf/apr/apr-util/tags/1.5.2/ apr-util
 
 # apr-iconv
 svn export https://svn.apache.org/repos/asf/apr/apr-iconv/tags/1.2.1/ apr-iconv
@@ -50,8 +50,9 @@ build_apr(){
 # build apr
 cd apr/apr
 mkdir linux
+./buildconf
 cd linux
-../configure --prefix=$INSTALL_PREFIX/apr/1.4.5 CC="gcc" 
+../configure --prefix=$INSTALL_PREFIX/apr/1.4.8 CC="gcc"
 make
 make install
 cd ../../..
@@ -60,8 +61,9 @@ cd ../../..
 build_apr_iconv(){
 cd apr/apr-iconv
 mkdir linux
+./buildconf
 cd linux
-../configure --prefix=$INSTALL_PREFIX/apr/1.4.5 --with-apr=$INSTALL_PREFIX/apr/1.4.5 CC="gcc"
+../configure --prefix=$INSTALL_PREFIX/apr/1.4.8 --with-apr=$INSTALL_PREFIX/apr/1.4.8 CC="gcc"
 make
 make install
 }



Mime
View raw message