[jbossnative-commits] JBoss Native SVN: r3004 - trunk/build/unix.

Author: jfrederic.clere(a)jboss.com Date: 2013-01-15 05:53:39 -0500 (Tue, 15 Jan 2013) New Revision: 3004 Modified: trunk/build/unix/build.sh Log: Try to do it as Mladen script = sample steps... Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2013-01-15 10:39:17 UTC (rev 3003) +++ trunk/build/unix/build.sh 2013-01-15 10:53:39 UTC (rev 3004) @@ -720,27 +720,30 @@ ./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} linux-ppc64 || exit 1 ;; windows-x86) - ./Configure ${ssl_target} VC-WIN32 + perl Configure ${ssl_target} VC-WIN32 # openssl 1.0.x uses do_nasm, not do_masm :D ms/do_nasm.bat + nmake -f ms\nt.mak ;; windows-x64|windows-amd64) echo "Doing: perl Configure VC-WIN64A ${ssl_target}" perl Configure VC-WIN64A ${ssl_target} ms/do_win64a.bat + nmake -f ms\nt.mak # fix the ml to ml64... - sed "s:=ml :=ml64 :" ms/nt.mak > $$.mak - mv $$.mak ms/nt.mak - sed "s:=ml :=ml64 :" ms/ntdll.mak > $$.mak - mv $$.mak ms/ntdll.mak + #sed "s:=ml :=ml64 :" ms/nt.mak > $$.mak + #mv $$.mak ms/nt.mak + #sed "s:=ml :=ml64 :" ms/ntdll.mak > $$.mak + #mv $$.mak ms/ntdll.mak ;; windows-i64) ./Configure ${ssl_target} VC-WIN64I ms/do_win64i.bat - 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 + nmake -f ms\nt.mak + #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 @@ -748,22 +751,7 @@ 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 {} \; - 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` - 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} + echo "Already done" else make depend || exit 1 make || exit 1 @@ -853,7 +841,6 @@ (cd ${apr_srcdir} cp -f include/apr.hw include/apr.h echo "Building APR ${apr_version} in ${apr_srcdir}" - ls -lt /cygdrive/e/workspace/JBossWebNative-windows/jbossnative/build/unix/cache/common/windows-x86-static/lib cygwinpath true PREFIX=${apr_common_dir} SRCDIR=`pwd` if $apr_static ; then nmake -f NMAKEmakefile $wrapped_args APR_DECLARE_STATIC=1 install || exit 1