JBoss Native SVN: r3030 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2013-01-16 04:56:08 -0500 (Wed, 16 Jan 2013)
New Revision: 3030
Modified:
trunk/build/unix/build.sh
Log:
Comment .asm pre-create
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-01-16 09:43:20 UTC (rev 3029)
+++ trunk/build/unix/build.sh 2013-01-16 09:56:08 UTC (rev 3030)
@@ -737,9 +737,9 @@
rm -rf engines
cygspawn perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A
ms/do_win64a.bat
- mkdir tmp32dll
- cygspawn perl crypto/x86_64cpuid.pl tmp32dll/x86_64cpuid.asm
- nmake -f ms/ntdll.mak || exit 1
+# mkdir tmp32dll
+# cygspawn perl crypto/x86_64cpuid.pl nasm tmp32dll/x86_64cpuid.asm
+# nmake -f ms/ntdll.mak || exit 1
#CPERL=`cygpath -w /usr/bin/perl`
#nmake -f ms/nt.mak install PERL="$CPERL"
nmake -f ms/ntdll.mak install || exit 1
11 years, 11 months
JBoss Native SVN: r3029 - in trunk/build: windows and 1 other directory.
by jbossnative-commits@lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2013-01-16 04:43:20 -0500 (Wed, 16 Jan 2013)
New Revision: 3029
Modified:
trunk/build/unix/build.sh
trunk/build/windows/tools.ini
Log:
Try without +A
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-01-16 09:24:13 UTC (rev 3028)
+++ trunk/build/unix/build.sh 2013-01-16 09:43:20 UTC (rev 3029)
@@ -737,6 +737,7 @@
rm -rf engines
cygspawn perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A
ms/do_win64a.bat
+ mkdir tmp32dll
cygspawn perl crypto/x86_64cpuid.pl tmp32dll/x86_64cpuid.asm
nmake -f ms/ntdll.mak || exit 1
#CPERL=`cygpath -w /usr/bin/perl`
Modified: trunk/build/windows/tools.ini
===================================================================
--- trunk/build/windows/tools.ini 2013-01-16 09:24:13 UTC (rev 3028)
+++ trunk/build/windows/tools.ini 2013-01-16 09:43:20 UTC (rev 3029)
@@ -1,7 +1,7 @@
[NMAKE]
# Forces build of all evaluated targets, even if not out-of-date with
# respect to dependents
-!CMDSWITCHES +A
+#!CMDSWITCHES +A
# Ignores exit codes from all commands.
#!CMDSWITCHES +I
11 years, 11 months
JBoss Native SVN: r3028 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2013-01-16 04:24:13 -0500 (Wed, 16 Jan 2013)
New Revision: 3028
Modified:
trunk/build/unix/build.sh
Log:
Create .asm files
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-01-16 08:32:14 UTC (rev 3027)
+++ trunk/build/unix/build.sh 2013-01-16 09:24:13 UTC (rev 3028)
@@ -734,11 +734,10 @@
;;
windows-x64|windows-amd64)
echo "Doing: perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A"
- rm -rf tmp32
rm -rf engines
cygspawn perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A
ms/do_win64a.bat
- nmake -f ms/ntdll.mak clean
+ cygspawn perl crypto/x86_64cpuid.pl tmp32dll/x86_64cpuid.asm
nmake -f ms/ntdll.mak || exit 1
#CPERL=`cygpath -w /usr/bin/perl`
#nmake -f ms/nt.mak install PERL="$CPERL"
@@ -752,7 +751,7 @@
windows-i64)
./Configure ${ssl_target} VC-WIN64I
ms/do_win64i.bat
- nmake -f ms\nt.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
11 years, 11 months
JBoss Native SVN: r3027 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-01-16 03:32:14 -0500 (Wed, 16 Jan 2013)
New Revision: 3027
Modified:
trunk/build/unix/build.sh
Log:
Also remove rc4 :-(
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-01-16 06:31:56 UTC (rev 3026)
+++ trunk/build/unix/build.sh 2013-01-16 08:32:14 UTC (rev 3027)
@@ -676,7 +676,7 @@
fi
SSLNUM=`basename ${ssl_srcdir} | awk -F - '{ print $2}' | sed 's:[a-z]::'`
echo "Configuring OpenSSL ${ssl_version} for ${BUILD_TAG} ..."
- ssl_common_flags="threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec no-ec2m no-ecdh no-ecdsa"
+ ssl_common_flags="threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc4 no-rc5 no-mdc2 no-idea no-ec no-ec2m no-ecdh no-ecdsa"
if $ssl_static ; then
ssl_build_flags="no-asm no-shared"
else
11 years, 11 months
JBoss Native SVN: r3026 - in trunk/build: unix and 1 other directory.
by jbossnative-commits@lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2013-01-16 01:31:56 -0500 (Wed, 16 Jan 2013)
New Revision: 3026
Modified:
trunk/build/patch/openssl-1.0.1c.patch
trunk/build/unix/build.sh
Log:
Update patch and axe engines completely
Modified: trunk/build/patch/openssl-1.0.1c.patch
===================================================================
--- trunk/build/patch/openssl-1.0.1c.patch 2013-01-15 19:27:51 UTC (rev 3025)
+++ trunk/build/patch/openssl-1.0.1c.patch 2013-01-16 06:31:56 UTC (rev 3026)
@@ -26,6 +26,18 @@
# WIN32 UNICODE build gets linked with unicows.lib for
# backward compatibility with Win9x.
$ex_libs="unicows.lib $ex_libs" if ($FLAVOR =~ /WIN32/ and $cflags =~ /\-DUNICODE/);
+--- crypto/md5/asm/md5-x86_64.pl
++++ crypto/md5/asm/md5-x86_64.pl
+@@ -112,7 +112,7 @@
+ my $output = shift;
+ if ($flavour =~ /\./) { $output = $flavour; undef $flavour; }
+
+-my $win64=0; $win64=1 if ($flavour =~ /[nm]asm|mingw64/ || $output =~ /\.asm$/);
++my $win64=0; $win64=1 if ($output =~ /\.asm$/);
+
+ $0 =~ m/(.*[\/\\])[^\/\\]+$/; my $dir=$1; my $xlate;
+ ( $xlate="${dir}x86_64-xlate.pl" and -f $xlate ) or
+
--- engines/Makefile 2013-01-15 11:01:45.241463537 +0100
+++ engines/Makefile 2013-01-15 11:02:33.231013924 +0100
@@ -11,7 +11,7 @@
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-01-15 19:27:51 UTC (rev 3025)
+++ trunk/build/unix/build.sh 2013-01-16 06:31:56 UTC (rev 3026)
@@ -676,7 +676,7 @@
fi
SSLNUM=`basename ${ssl_srcdir} | awk -F - '{ print $2}' | sed 's:[a-z]::'`
echo "Configuring OpenSSL ${ssl_version} for ${BUILD_TAG} ..."
- ssl_common_flags="threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec no-ecdh no-ecdsa"
+ ssl_common_flags="threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec no-ec2m no-ecdh no-ecdsa"
if $ssl_static ; then
ssl_build_flags="no-asm no-shared"
else
@@ -722,6 +722,7 @@
windows-x86)
env; echo $PATH
rm -rf tmp32
+ rm -rf engines
cygspawn perl Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} VC-WIN32
# openssl 1.0.x uses do_nasm, not do_masm :D
ms/do_nasm.bat
@@ -734,6 +735,7 @@
windows-x64|windows-amd64)
echo "Doing: perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A"
rm -rf tmp32
+ rm -rf engines
cygspawn perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A
ms/do_win64a.bat
nmake -f ms/ntdll.mak clean
11 years, 11 months
JBoss Native SVN: r3025 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-01-15 14:27:51 -0500 (Tue, 15 Jan 2013)
New Revision: 3025
Modified:
trunk/build/unix/build.sh
Log:
try what is in INSTALL.W64 :D
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-01-15 19:15:07 UTC (rev 3024)
+++ trunk/build/unix/build.sh 2013-01-15 19:27:51 UTC (rev 3025)
@@ -736,11 +736,11 @@
rm -rf tmp32
cygspawn perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A
ms/do_win64a.bat
- nmake -f ms/nt.mak clean
- nmake -f ms/nt.mak || exit 1
+ nmake -f ms/ntdll.mak clean
+ nmake -f ms/ntdll.mak || exit 1
#CPERL=`cygpath -w /usr/bin/perl`
#nmake -f ms/nt.mak install PERL="$CPERL"
- nmake -f ms/nt.mak install || exit 1
+ nmake -f ms/ntdll.mak install || exit 1
# fix the ml to ml64...
#sed "s:=ml :=ml64 :" ms/nt.mak > $$.mak
#mv $$.mak ms/nt.mak
11 years, 11 months
JBoss Native SVN: r3024 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-01-15 14:15:07 -0500 (Tue, 15 Jan 2013)
New Revision: 3024
Modified:
trunk/build/unix/build.sh
Log:
no-asm doesn't help :-(
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-01-15 18:59:02 UTC (rev 3023)
+++ trunk/build/unix/build.sh 2013-01-15 19:15:07 UTC (rev 3024)
@@ -732,7 +732,7 @@
nmake -f ms/nt.mak install || exit 1
;;
windows-x64|windows-amd64)
- echo "Doing: perl Configure ${ssl_target} ${ssl_common_flags} no-asm VC-WIN64A"
+ echo "Doing: perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A"
rm -rf tmp32
cygspawn perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A
ms/do_win64a.bat
11 years, 11 months
JBoss Native SVN: r3023 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-01-15 13:59:02 -0500 (Tue, 15 Jan 2013)
New Revision: 3023
Modified:
trunk/build/unix/build.sh
Log:
Asm part looks broken :-(
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-01-15 18:28:44 UTC (rev 3022)
+++ trunk/build/unix/build.sh 2013-01-15 18:59:02 UTC (rev 3023)
@@ -732,7 +732,7 @@
nmake -f ms/nt.mak install || exit 1
;;
windows-x64|windows-amd64)
- echo "Doing: perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A"
+ echo "Doing: perl Configure ${ssl_target} ${ssl_common_flags} no-asm VC-WIN64A"
rm -rf tmp32
cygspawn perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A
ms/do_win64a.bat
11 years, 11 months
JBoss Native SVN: r3022 - trunk/build/unix.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-01-15 13:28:44 -0500 (Tue, 15 Jan 2013)
New Revision: 3022
Modified:
trunk/build/unix/build.sh
Log:
clean before building.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2013-01-15 17:36:01 UTC (rev 3021)
+++ trunk/build/unix/build.sh 2013-01-15 18:28:44 UTC (rev 3022)
@@ -721,9 +721,11 @@
;;
windows-x86)
env; echo $PATH
+ rm -rf tmp32
cygspawn perl Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} VC-WIN32
# openssl 1.0.x uses do_nasm, not do_masm :D
ms/do_nasm.bat
+ nmake -f ms/nt.mak clean
nmake -f ms/nt.mak || exit 1
#CPERL=`cygpath -w /usr/bin/perl`
#nmake -f ms/nt.mak install PERL="$CPERL"
@@ -731,8 +733,10 @@
;;
windows-x64|windows-amd64)
echo "Doing: perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A"
+ rm -rf tmp32
cygspawn perl Configure ${ssl_target} ${ssl_common_flags} VC-WIN64A
ms/do_win64a.bat
+ nmake -f ms/nt.mak clean
nmake -f ms/nt.mak || exit 1
#CPERL=`cygpath -w /usr/bin/perl`
#nmake -f ms/nt.mak install PERL="$CPERL"
11 years, 11 months
JBoss Native SVN: r3021 - trunk/build/daemon.
by jbossnative-commits@lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2013-01-15 12:36:01 -0500 (Tue, 15 Jan 2013)
New Revision: 3021
Modified:
trunk/build/daemon/buildnat.bat
Log:
Do only 64 bits.
Modified: trunk/build/daemon/buildnat.bat
===================================================================
--- trunk/build/daemon/buildnat.bat 2013-01-15 17:33:33 UTC (rev 3020)
+++ trunk/build/daemon/buildnat.bat 2013-01-15 17:36:01 UTC (rev 3021)
@@ -47,7 +47,7 @@
pushd %BUILD_HOME%\windows
REM static dll tcnative-1.dll
-call buildnew.bat static x86 jboss-native -ssl -cache -static
+REM call buildnew.bat static x86 jboss-native -ssl -cache -static
call buildnew.bat static x64 jboss-native -ssl -cache -static
REM call build.bat sdk static i64 jboss-native -ssl -cache -static
REM Uncomment for building sight
11 years, 11 months