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

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