September 2009 - jbossnative-commits

JBoss Native SVN: r2571 - sandbox/httpd.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-09-29 03:47:41 -0400 (Tue, 29 Sep 2009) New Revision: 2571 Modified: sandbox/httpd/httpd.test Log: Arrange the builds. Modified: sandbox/httpd/httpd.test =================================================================== --- sandbox/httpd/httpd.test 2009-09-25 15:32:59 UTC (rev 2570) +++ sandbox/httpd/httpd.test 2009-09-29 07:47:41 UTC (rev 2571) @@ -44,7 +44,8 @@ # # Copy the mod_cluster code into httpd-2.2.x/modules/proxy -# That is a hack until we have a provider of ping/pong in ajp/http...etc logics +# Now the ping/pong in ajp is in mod_proxy_cluster (http still missing). +# That is just to test the build in httpd-2.2.x sources. (cd $HOME/$TMPLOC cp mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c httpd-2.2.x/modules/proxy cp mod_cluster/native/mod_proxy_cluster/patch.txt httpd-2.2.x/modules/proxy @@ -68,25 +69,37 @@ make install ) if [ $? -ne 0 ]; then + echo "Can't build apr-trunk" exit 1 fi -(cd apr-util-trunk -./buildconf --with-apr=$HOME/$TMPLOC/apr-trunk -./configure --prefix=$HOME/$TMPLOC/APU --with-apr=$HOME/$TMPLOC/APR $APUADDCONF +(cd apr-1.3.x +./buildconf +./configure --prefix=$HOME/$TMPLOC/APR-1.3.x make clean make make install ) if [ $? -ne 0 ]; then + echo "Can't build apr-1.3.x" exit 1 fi +(cd apr-util-1.3.x +./buildconf --with-apr=$HOME/$TMPLOC/apr-1.3.x +./configure --prefix=$HOME/$TMPLOC/APU-1.3.x --with-apr=$HOME/$TMPLOC/APR-1.3.x $APUADDCONF +make clean +make +make install +) +if [ $? -ne 0 ]; then + exit 1 +fi # build HTTPD trunk (cd httpd-trunk -./buildconf --with-apr=$HOME/$TMPLOC/apr-trunk --with-apr-util=$HOME/$TMPLOC/apr-util-trunk +./buildconf --with-apr=$HOME/$TMPLOC/apr-1.3.x --with-apr-util=$HOME/$TMPLOC/apr-util-1.3.x ./configure --prefix=$HOME/$TMPLOC/APACHE \ - --with-apr=$HOME/$TMPLOC/APR \ - --with-apr-util=$HOME/$TMPLOC/APU \ + --with-apr=$HOME/$TMPLOC/APR-1.3.x \ + --with-apr-util=$HOME/$TMPLOC/APU-1.3.x \ --enable-maintainer-mode \ --enable-mods-shared=most \ --with-ssl=$SSL_LOC \ @@ -112,34 +125,12 @@ exit 1 fi -# build APR/APR-UTIL 1.3.x -(cd apr-1.3.x -./buildconf -./configure --prefix=$HOME/$TMPLOC/APR-1.3.x -make clean -make -make install -) -if [ $? -ne 0 ]; then - exit 1 -fi -(cd apr-util-1.3.x -./buildconf --with-apr=$HOME/$TMPLOC/apr-1.3.x -./configure --prefix=$HOME/$TMPLOC/APU-1.3.x --with-apr=$HOME/$TMPLOC/APR-1.3.x $APUADDCONF -make clean -make -make install -) -if [ $? -ne 0 ]; then - exit 1 -fi - # Build httpd 2.2.x (cd httpd-2.2.x -./buildconf --with-apr=$HOME/$TMPLOC/apr-trunk --with-apr-util=$HOME/$TMPLOC/apr-util-trunk +./buildconf --with-apr=$HOME/$TMPLOC/apr-1.3.x --with-apr-util=$HOME/$TMPLOC/apr-util-1.3.x ./configure --prefix=$HOME/$TMPLOC/APACHE-2.2.x \ - --with-apr=$HOME/$TMPLOC/APR \ - --with-apr-util=$HOME/$TMPLOC/APU \ + --with-apr=$HOME/$TMPLOC/APR-1.3.x \ + --with-apr-util=$HOME/$TMPLOC/APU-1.3.x \ --enable-maintainer-mode \ --enable-mods-shared=most \ --with-ssl=$SSL_LOC \

15 years, 3 months

1
0
0 / 0

JBoss Native SVN: r2570 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-09-25 11:32:59 -0400 (Fri, 25 Sep 2009) New Revision: 2570 Modified: trunk/build/unix/build.sh trunk/build/unix/buildbin.jboss-native.windows.sh Log: Clean dll too and cp preserving permissions. Note that: +++ $ ls -lt ./srclib/openssl-0.9.8i/out32dll/ssleay32.dll -rwxrwxrwx 1 hudson None 494592 Sep 24 08:17 ./srclib/openssl-0.9.8i/out32dll/ssleay32.dll $ ls -lt ./output/windows-i64/bin/native/ssleay32.dll -rw-rw-rw- 1 hudson None 494592 Sep 24 08:20 ./output/windows-i64/bin/native/ssleay32.dll +++ Prevent stuff to start on windoze... Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2009-09-24 11:56:30 UTC (rev 2569) +++ trunk/build/unix/build.sh 2009-09-25 15:32:59 UTC (rev 2570) @@ -665,6 +665,7 @@ # (See http://msdn.microsoft.com/en-us/library/cx06ysxh.aspx) # In fact we don't want the !CMDSWITCHES +A find . -name "*.ojb" -exec rm -f {} \; + find . -name "*.dll" -exec rm -f {} \; sed "s:!CMDSWITCHES +A:#!CMDSWITCHES +A:" ../../../../../windows/tools.ini > tools.ini initval=`set | grep "^INIT=" | awk -F = ' { print $2 } '` WHERE=`pwd` Modified: trunk/build/unix/buildbin.jboss-native.windows.sh =================================================================== --- trunk/build/unix/buildbin.jboss-native.windows.sh 2009-09-24 11:56:30 UTC (rev 2569) +++ trunk/build/unix/buildbin.jboss-native.windows.sh 2009-09-25 15:32:59 UTC (rev 2570) @@ -93,16 +93,16 @@ nmake -f NMAKEmgr PREFIX=${win_prefix_loc} install ) -cp ${common_loc}/lib/libapr*.dll ${output_loc}/bin/${output_lib} 2>/dev/null +cp -p ${common_loc}/lib/libapr*.dll ${output_loc}/bin/${output_lib} 2>/dev/null if $has_openssl ; then - cp ${common_loc}/bin/*eay32.dll ${output_loc}/bin/${output_lib} 2>/dev/null - cp ${common_loc}/bin/openssl.exe ${output_loc}/bin/${output_bin} + cp -p ${common_loc}/bin/*eay32.dll ${output_loc}/bin/${output_lib} 2>/dev/null + cp -p ${common_loc}/bin/openssl.exe ${output_loc}/bin/${output_bin} fi -cp ${prefix_loc}/lib/*.dll ${output_loc}/bin/${output_lib} 2>/dev/null -cp ${prefix_loc}/bin/jboss*.dll ${output_loc}/bin/${output_lib} 2>/dev/null -cp ${prefix_loc}/bin/jboss*.exe ${output_loc}/bin 2>/dev/null +cp -p ${prefix_loc}/lib/*.dll ${output_loc}/bin/${output_lib} 2>/dev/null +cp -p ${prefix_loc}/bin/jboss*.dll ${output_loc}/bin/${output_lib} 2>/dev/null +cp -p ${prefix_loc}/bin/jboss*.exe ${output_loc}/bin 2>/dev/null if [ -n "${CRT_REDIST}" ] ; then crt_redist_loc=`cygpath -u "${CRT_REDIST}"` - cp "${crt_redist_loc}"/*.dll ${output_loc}/bin/${output_lib} + cp -p "${crt_redist_loc}"/*.dll ${output_loc}/bin/${output_lib} fi

15 years, 3 months

1
0
0 / 0

JBoss Native SVN: r2569 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-09-24 07:56:30 -0400 (Thu, 24 Sep 2009) New Revision: 2569 Modified: trunk/build/unix/build.sh Log: Use our own tools.ini file for openssl. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2009-09-24 08:41:08 UTC (rev 2568) +++ trunk/build/unix/build.sh 2009-09-24 11:56:30 UTC (rev 2569) @@ -648,19 +648,11 @@ ;; windows-i64) ./Configure ${ssl_target} VC-WIN64I - find . -name "*.ojb" -exec rm -f {} \; ms/do_win64i.bat - # it builds ms/uptable.obj but in tools.ini we have !CMDSWITCHES +A so it would be - # build again and will failed due to ASM instead AS and due to /c of the predefined rules - # (See http://msdn.microsoft.com/en-us/library/cx06ysxh.aspx) - # In fact we don't want the !CMDSWITCHES +A - # fix the ml to ias... sed "s:=ml :=ias :" ms/nt.mak > $$.mak mv $$.mak ms/nt.mak sed "s:=ml :=ias :" ms/ntdll.mak > $$.mak mv $$.mak ms/ntdll.mak - sed "/^ASM=/a \!CMDSWITCHES -A" ms/ntdll.mak > $$.mak - mv $$.mak ms/ntdll.mak ;; *) ./config ${ssl_target} -fPIC ${ssl_common_flags} ${ssl_build_flags} || exit 1 @@ -668,11 +660,21 @@ esac echo "Building OpenSSL ${ssl_version} for ${BUILD_TAG} ..." if $BUILD_WIN ; then + # it builds ms/uptable.obj but in tools.ini we have !CMDSWITCHES +A so it would be + # build again and will failed due to ASM instead AS and due to the /c of the predefined rules + # (See http://msdn.microsoft.com/en-us/library/cx06ysxh.aspx) + # In fact we don't want the !CMDSWITCHES +A + find . -name "*.ojb" -exec rm -f {} \; + sed "s:!CMDSWITCHES +A:#!CMDSWITCHES +A:" ../../../../../windows/tools.ini > tools.ini + initval=`set | grep "^INIT=" | awk -F = ' { print $2 } '` + WHERE=`pwd` + INIT=`cygpath -w ${WHERE}` if $ssl_static ; then nmake -f ms/nt.mak install || exit 1 else nmake -f ms/ntdll.mak install || exit 1 fi + INIT=${initval} else make depend || exit 1 make || exit 1

15 years, 3 months

1
0
0 / 0

JBoss Native SVN: r2568 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-09-24 04:41:08 -0400 (Thu, 24 Sep 2009) New Revision: 2568 Modified: trunk/build/unix/build.sh Log: Oops we need -A Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2009-09-24 08:40:26 UTC (rev 2567) +++ trunk/build/unix/build.sh 2009-09-24 08:41:08 UTC (rev 2568) @@ -659,7 +659,7 @@ mv $$.mak ms/nt.mak sed "s:=ml :=ias :" ms/ntdll.mak > $$.mak mv $$.mak ms/ntdll.mak - sed "/^ASM=/a \!CMDSWITCHES +A" ms/ntdll.mak > $$.mak + sed "/^ASM=/a \!CMDSWITCHES -A" ms/ntdll.mak > $$.mak mv $$.mak ms/ntdll.mak ;; *)

15 years, 3 months

1
0
0 / 0

JBoss Native SVN: r2567 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-09-24 04:40:26 -0400 (Thu, 24 Sep 2009) New Revision: 2567 Modified: trunk/build/unix/build.sh Log: In fact all the problems around the uptable.obj are due to the !CMDSWITCHES +A in the tools.ini Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2009-09-23 16:30:37 UTC (rev 2566) +++ trunk/build/unix/build.sh 2009-09-24 08:40:26 UTC (rev 2567) @@ -648,13 +648,18 @@ ;; windows-i64) ./Configure ${ssl_target} VC-WIN64I + find . -name "*.ojb" -exec rm -f {} \; ms/do_win64i.bat + # it builds ms/uptable.obj but in tools.ini we have !CMDSWITCHES +A so it would be + # build again and will failed due to ASM instead AS and due to /c of the predefined rules + # (See http://msdn.microsoft.com/en-us/library/cx06ysxh.aspx) + # In fact we don't want the !CMDSWITCHES +A # fix the ml to ias... sed "s:=ml :=ias :" ms/nt.mak > $$.mak mv $$.mak ms/nt.mak sed "s:=ml :=ias :" ms/ntdll.mak > $$.mak mv $$.mak ms/ntdll.mak - sed "/^ASM=/a \AS=ias" ms/ntdll.mak > $$.mak + sed "/^ASM=/a \!CMDSWITCHES +A" ms/ntdll.mak > $$.mak mv $$.mak ms/ntdll.mak ;; *)

15 years, 3 months

1
0
0 / 0

JBoss Native SVN: r2566 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-09-23 12:30:37 -0400 (Wed, 23 Sep 2009) New Revision: 2566 Modified: trunk/build/unix/build.sh Log: ias doesn't like the parameters... Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2009-09-23 14:59:43 UTC (rev 2565) +++ trunk/build/unix/build.sh 2009-09-23 16:30:37 UTC (rev 2566) @@ -654,7 +654,7 @@ mv $$.mak ms/nt.mak sed "s:=ml :=ias :" ms/ntdll.mak > $$.mak mv $$.mak ms/ntdll.mak - sed "s:ASM=:AS=:" ms/ntdll.mak > $$.mak + sed "/^ASM=/a \AS=ias" ms/ntdll.mak > $$.mak mv $$.mak ms/ntdll.mak ;; *)

15 years, 3 months

1
0
0 / 0

JBoss Native SVN: r2565 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-09-23 10:59:43 -0400 (Wed, 23 Sep 2009) New Revision: 2565 Modified: trunk/build/unix/build.sh Log: Previous try doesn't help... ASM should be AS according to m$ docs... Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2009-09-23 14:36:20 UTC (rev 2564) +++ trunk/build/unix/build.sh 2009-09-23 14:59:43 UTC (rev 2565) @@ -654,9 +654,8 @@ mv $$.mak ms/nt.mak sed "s:=ml :=ias :" ms/ntdll.mak > $$.mak mv $$.mak ms/ntdll.mak - # nmake doesn't seem to find that uptable.obj (made by do_win64i.bat is up to date) - sleep 1 - touch ms/uptable.obj + sed "s:ASM=:AS=:" ms/ntdll.mak > $$.mak + mv $$.mak ms/ntdll.mak ;; *) ./config ${ssl_target} -fPIC ${ssl_common_flags} ${ssl_build_flags} || exit 1

15 years, 3 months

1
0
0 / 0

JBoss Native SVN: r2564 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-09-23 10:36:20 -0400 (Wed, 23 Sep 2009) New Revision: 2564 Modified: trunk/build/unix/build.sh Log: +++ ms\uptable.obj Wed Sep 23 09:22:54 2009 ms\uptable.asm Wed Sep 23 09:22:54 2009 ml /c ms\uptable.asm 'ml' is not recognized as an internal or external command, +++ I don't see why it builds it... Touching should help??? Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2009-09-23 13:07:04 UTC (rev 2563) +++ trunk/build/unix/build.sh 2009-09-23 14:36:20 UTC (rev 2564) @@ -654,6 +654,9 @@ mv $$.mak ms/nt.mak sed "s:=ml :=ias :" ms/ntdll.mak > $$.mak mv $$.mak ms/ntdll.mak + # nmake doesn't seem to find that uptable.obj (made by do_win64i.bat is up to date) + sleep 1 + touch ms/uptable.obj ;; *) ./config ${ssl_target} -fPIC ${ssl_common_flags} ${ssl_build_flags} || exit 1

15 years, 3 months

1
0
0 / 0

JBoss Native SVN: r2563 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-09-23 09:07:04 -0400 (Wed, 23 Sep 2009) New Revision: 2563 Modified: trunk/build/unix/build.sh Log: Arrange ia64 for windows. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2009-09-23 12:00:57 UTC (rev 2562) +++ trunk/build/unix/build.sh 2009-09-23 13:07:04 UTC (rev 2563) @@ -649,6 +649,11 @@ windows-i64) ./Configure ${ssl_target} VC-WIN64I ms/do_win64i.bat + # fix the ml to ias... + sed "s:=ml :=ias :" ms/nt.mak > $$.mak + mv $$.mak ms/nt.mak + sed "s:=ml :=ias :" ms/ntdll.mak > $$.mak + mv $$.mak ms/ntdll.mak ;; *) ./config ${ssl_target} -fPIC ${ssl_common_flags} ${ssl_build_flags} || exit 1

15 years, 3 months

1
0
0 / 0

JBoss Native SVN: r2562 - trunk/build/unix.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-09-23 08:00:57 -0400 (Wed, 23 Sep 2009) New Revision: 2562 Modified: trunk/build/unix/build.sh Log: Oops use absolut location. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2009-09-23 11:26:26 UTC (rev 2561) +++ trunk/build/unix/build.sh 2009-09-23 12:00:57 UTC (rev 2562) @@ -1066,7 +1066,7 @@ cd $build_cache_dir if [ ! -d ${src_dir} ]; then downloadtaredsrc $src_url $src_url_back - util/overridecp.sh $build_top/../../srclib/ ${name_prod} ${version_prod} NMAKEmakefile $src_dir + $build_top/util/overridecp.sh $build_top/../../srclib/ ${name_prod} ${version_prod} NMAKEmakefile $src_dir applypatch $src_dir false fi cp -rp ${src_dir} ${package_src_dir}/srclib

15 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits September 2009