January 2013 - jbossnative-commits

JBoss Native SVN: r3000 - trunk/build/patch.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-01-15 05:04:55 -0500 (Tue, 15 Jan 2013) New Revision: 3000 Modified: trunk/build/patch/openssl-1.0.1c.patch Log: Oops spacess / tabs problems... Modified: trunk/build/patch/openssl-1.0.1c.patch =================================================================== --- trunk/build/patch/openssl-1.0.1c.patch 2013-01-15 09:50:25 UTC (rev 2999) +++ trunk/build/patch/openssl-1.0.1c.patch 2013-01-15 10:04:55 UTC (rev 3000) @@ -26,15 +26,14 @@ # 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/); ---- engines/Makefile -+++ engines/Makefile +--- Makefile.org 2013-01-15 11:01:45.241463537 +0100 ++++ Makefile 2013-01-15 11:02:33.231013924 +0100 @@ -11,7 +11,7 @@ - AR= ar r + AR= ar r ENGDIRS= ccgost - --RECURSIVE_MAKE= [ -z "$(ENGDIRS)" ] || for i in $(ENGDIRS) ; do \ -+RECURSIVE_MAKE= [ -z "$(ENGDIRS)" ] || for i in "$(ENGDIRS)" ; do \ - (cd $$i && echo "making $$target in $(DIR)/$$i..." && \ - $(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \ - done; - + +-RECURSIVE_MAKE= [ -z "$(ENGDIRS)" ] || for i in $(ENGDIRS) ; do \ ++RECURSIVE_MAKE= [ -z "$(ENGDIRS)" ] || for i in "$(ENGDIRS)" ; do \ + (cd $$i && echo "making $$target in $(DIR)/$$i..." && \ + $(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \ + done;

11 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2999 - trunk/build/patch.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-01-15 04:50:25 -0500 (Tue, 15 Jan 2013) New Revision: 2999 Modified: trunk/build/patch/openssl-1.0.1c.patch Log: Patch for the no-ec to Configure. Modified: trunk/build/patch/openssl-1.0.1c.patch =================================================================== --- trunk/build/patch/openssl-1.0.1c.patch 2013-01-15 09:08:44 UTC (rev 2998) +++ trunk/build/patch/openssl-1.0.1c.patch 2013-01-15 09:50:25 UTC (rev 2999) @@ -26,3 +26,15 @@ # 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/); +--- engines/Makefile ++++ engines/Makefile +@@ -11,7 +11,7 @@ + AR= ar r + ENGDIRS= ccgost + +-RECURSIVE_MAKE= [ -z "$(ENGDIRS)" ] || for i in $(ENGDIRS) ; do \ ++RECURSIVE_MAKE= [ -z "$(ENGDIRS)" ] || for i in "$(ENGDIRS)" ; do \ + (cd $$i && echo "making $$target in $(DIR)/$$i..." && \ + $(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \ + done; +

11 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-01-15 04:08:44 -0500 (Tue, 15 Jan 2013) New Revision: 2998 Modified: trunk/build/unix/build.sh Log: Add another trace... Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2013-01-15 08:22:29 UTC (rev 2997) +++ trunk/build/unix/build.sh 2013-01-15 09:08:44 UTC (rev 2998) @@ -1080,6 +1080,7 @@ if $has_static ; then buildopenssl srclib/openssl-${ssl_version} true || return 1 fi + ls -lt /cygdrive/e/workspace/JBossWebNative-windows/jbossnative/build/unix/cache/common/windows-x86-static/lib fi # build a static libconv.

11 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-01-15 03:22:29 -0500 (Tue, 15 Jan 2013) New Revision: 2997 Modified: trunk/build/unix/build.sh Log: Stop the build if apr install failed. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2013-01-15 08:21:01 UTC (rev 2996) +++ trunk/build/unix/build.sh 2013-01-15 08:22:29 UTC (rev 2997) @@ -856,9 +856,9 @@ 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 + nmake -f NMAKEmakefile $wrapped_args APR_DECLARE_STATIC=1 install || exit 1 else - nmake -f NMAKEmakefile $wrapped_args install + nmake -f NMAKEmakefile $wrapped_args install || exit 1 fi ) else

11 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-01-15 03:21:01 -0500 (Tue, 15 Jan 2013) New Revision: 2996 Modified: trunk/build/unix/build.sh Log: Add a trace :-( Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2013-01-15 07:25:51 UTC (rev 2995) +++ trunk/build/unix/build.sh 2013-01-15 08:21:01 UTC (rev 2996) @@ -853,6 +853,7 @@ (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

11 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2995 - trunk/build/daemon.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-01-15 02:25:51 -0500 (Tue, 15 Jan 2013) New Revision: 2995 Modified: trunk/build/daemon/buildnat.bat Log: try first with 32 bits. Modified: trunk/build/daemon/buildnat.bat =================================================================== --- trunk/build/daemon/buildnat.bat 2013-01-14 18:26:54 UTC (rev 2994) +++ trunk/build/daemon/buildnat.bat 2013-01-15 07:25:51 UTC (rev 2995) @@ -48,7 +48,7 @@ REM static dll tcnative-1.dll call buildnew.bat static x86 jboss-native -ssl -cache -static -call buildnew.bat static x64 jboss-native -ssl -cache -static +REM 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 REM call build.bat sdk x86 jboss-sight -cache

11 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-01-14 13:26:54 -0500 (Mon, 14 Jan 2013) New Revision: 2994 Modified: trunk/build/unix/build.sh Log: typo :-( Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2013-01-14 17:53:01 UTC (rev 2993) +++ trunk/build/unix/build.sh 2013-01-14 18:26:54 UTC (rev 2994) @@ -724,7 +724,7 @@ # openssl 1.0.x uses do_nasm, not do_masm :D ms/do_nasm.bat ;; - windows-x64|windows-adm64) + windows-x64|windows-amd64) echo "Doing: perl Configure VC-WIN64A ${ssl_target}" perl Configure VC-WIN64A ${ssl_target} ms/do_win64a.bat

11 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-01-14 12:53:01 -0500 (Mon, 14 Jan 2013) New Revision: 2993 Modified: trunk/build/unix/build.sh Log: Add a trace... It does something weird :-( Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2013-01-14 16:56:43 UTC (rev 2992) +++ trunk/build/unix/build.sh 2013-01-14 17:53:01 UTC (rev 2993) @@ -725,7 +725,8 @@ ms/do_nasm.bat ;; windows-x64|windows-adm64) - ./Configure ${ssl_target} VC-WIN64A + echo "Doing: perl Configure VC-WIN64A ${ssl_target}" + perl Configure VC-WIN64A ${ssl_target} ms/do_win64a.bat # fix the ml to ml64... sed "s:=ml :=ml64 :" ms/nt.mak > $$.mak

11 years, 11 months

1
0
0 / 0

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

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-01-14 11:56:43 -0500 (Mon, 14 Jan 2013) New Revision: 2992 Modified: trunk/build/unix/build.sh Log: the c:\cmsc\setenv.bat users adm64 instead of x64 :-( Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2013-01-14 15:13:31 UTC (rev 2991) +++ trunk/build/unix/build.sh 2013-01-14 16:56:43 UTC (rev 2992) @@ -724,7 +724,7 @@ # openssl 1.0.x uses do_nasm, not do_masm :D ms/do_nasm.bat ;; - windows-x64) + windows-x64|windows-adm64) ./Configure ${ssl_target} VC-WIN64A ms/do_win64a.bat # fix the ml to ml64...

11 years, 11 months

1
0
0 / 0

JBoss Native SVN: r2990 - in trunk/srclib/apr: apr-1.4 and 1 other directory.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2013-01-11 12:57:42 -0500 (Fri, 11 Jan 2013) New Revision: 2990 Added: trunk/srclib/apr/apr-1.4/ trunk/srclib/apr/apr-1.4/NMAKEmakefile Log: Add apr-1.4 NMAKEmakefile (copied from 1.3). Added: trunk/srclib/apr/apr-1.4/NMAKEmakefile =================================================================== --- trunk/srclib/apr/apr-1.4/NMAKEmakefile (rev 0) +++ trunk/srclib/apr/apr-1.4/NMAKEmakefile 2013-01-11 17:57:42 UTC (rev 2990) @@ -0,0 +1,225 @@ +# Copyright 2001-2009 The Apache Software Foundation or its licensors, as +# applicable. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ==================================================================== +# +# NMAKEmakefile Master APR makefile. +# Usage: +# DLL=1 Build DLL version +# DEBUG=1 Build DEBUG version of APR +# +# Originally contributed by Mladen Turk <mturk redhat.com> +# +# ==================================================================== +# + +!IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == "" +TARGET=DLL +CFLAGS = -DAPR_DECLARE_EXPORT $(CFLAGS) +PROJECT = libapr-1 +!ELSE +TARGET=LIB +CFLAGS = -DAPR_DECLARE_STATIC $(CFLAGS) +PROJECT = apr-1 +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <..\common\NMAKEcommon.inc> + +!IF "$(TARGET)" != "LIB" +LFLAGS = $(LFLAGS) /version:1.4 +!ENDIF +INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\include\arch -I$(SRCDIR)\include\arch\win32 -I$(SRCDIR)\include\arch\unix +PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src +OBJECTS = \ + $(WORKDIR)\apr_atomic.obj \ + $(WORKDIR)\dso.obj \ + $(WORKDIR)\copy.obj \ + $(WORKDIR)\fileacc.obj \ + $(WORKDIR)\filepath_util.obj \ + $(WORKDIR)\fullrw.obj \ + $(WORKDIR)\mktemp.obj \ + $(WORKDIR)\tempdir.obj \ + $(WORKDIR)\buffer.obj \ + $(WORKDIR)\dir.obj \ + $(WORKDIR)\filedup.obj \ + $(WORKDIR)\filepath.obj \ + $(WORKDIR)\filestat.obj \ + $(WORKDIR)\filesys.obj \ + $(WORKDIR)\flock.obj \ + $(WORKDIR)\open.obj \ + $(WORKDIR)\pipe.obj \ + $(WORKDIR)\readwrite.obj \ + $(WORKDIR)\seek.obj \ + $(WORKDIR)\proc_mutex.obj \ + $(WORKDIR)\thread_cond.obj \ + $(WORKDIR)\thread_mutex.obj \ + $(WORKDIR)\thread_rwlock.obj \ + $(WORKDIR)\apr_pools.obj \ + $(WORKDIR)\errorcodes.obj \ + $(WORKDIR)\getopt.obj \ + $(WORKDIR)\otherchild.obj \ + $(WORKDIR)\version.obj \ + $(WORKDIR)\charset.obj \ + $(WORKDIR)\env.obj \ + $(WORKDIR)\internal.obj \ + $(WORKDIR)\misc.obj \ + $(WORKDIR)\rand.obj \ + $(WORKDIR)\start.obj \ + $(WORKDIR)\utf8.obj \ + $(WORKDIR)\common.obj \ + $(WORKDIR)\mmap.obj \ + $(WORKDIR)\inet_ntop.obj \ + $(WORKDIR)\inet_pton.obj \ + $(WORKDIR)\multicast.obj \ + $(WORKDIR)\sockaddr.obj \ + $(WORKDIR)\sendrecv.obj \ + $(WORKDIR)\sockets.obj \ + $(WORKDIR)\sockopt.obj \ + $(WORKDIR)\apr_getpass.obj \ + $(WORKDIR)\select.obj \ + $(WORKDIR)\apr_random.obj \ + $(WORKDIR)\sha2.obj \ + $(WORKDIR)\sha2_glue.obj \ + $(WORKDIR)\shm.obj \ + $(WORKDIR)\apr_cpystrn.obj \ + $(WORKDIR)\apr_fnmatch.obj \ + $(WORKDIR)\apr_snprintf.obj \ + $(WORKDIR)\apr_strings.obj \ + $(WORKDIR)\apr_strnatcmp.obj \ + $(WORKDIR)\apr_strtok.obj \ + $(WORKDIR)\apr_hash.obj \ + $(WORKDIR)\apr_tables.obj \ + $(WORKDIR)\proc.obj \ + $(WORKDIR)\signals.obj \ + $(WORKDIR)\thread.obj \ + $(WORKDIR)\threadpriv.obj \ + $(WORKDIR)\access.obj \ + $(WORKDIR)\time.obj \ + $(WORKDIR)\timestr.obj \ + $(WORKDIR)\groupinfo.obj \ + $(WORKDIR)\userinfo.obj + +BUILDINC = $(PREFIX)\include\apr-1 +BUILDLIB = $(PREFIX)\lib +!IF "$(TARGET)" == "DLL" +BUILDBIN = $(WORKDIR)\$(PROJECT).dll +BUILDPDB = $(WORKDIR)\$(PROJECT).pdb +BUILDRES = $(WORKDIR)\$(PROJECT).res +BUILDMAN = $(BUILDBIN).manifest +!ELSE +BUILDBIN = $(WORKDIR)\$(PROJECT).lib +!ENDIF + +all : $(WORKDIR) $(BUILDBIN) + +$(BUILDINC) : + @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32" + +$(BUILDLIB) : + @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)" + +$(WORKDIR) : + @$(MAKEWORKDIR) + +{$(SRCDIR)\atomic\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\dso\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\file_io\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\file_io\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\locks\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\memory\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\misc\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\misc\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\mmap\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\mmap\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\network_io\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\network_io\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\passwd}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\poll\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\random\unix}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\shmem\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\strings}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\tables}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\threadproc\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\time\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)\user\win32}.c{$(WORKDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(OBJECTS): $(SRCDIR)\include\*.h $(SRCDIR)\include\arch\*.h $(SRCDIR)\include\arch\win32\*.h $(SRCDIR)\include\arch\unix\*.h + +!IF "$(TARGET)" == "DLL" +$(BUILDRES): libapr.rc $(SRCDIR)\include\*.h + $(RC) $(RCFLAGS) /i "$(SRCDIR)\include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc +$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDBIN) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2 +!ELSE +$(BUILDBIN): $(WORKDIR) $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDBIN) +!ENDIF + +clean: + @$(CLEANTARGET) + +install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(BUILDBIN) + @xcopy "$(SRCDIR)\include\*.h" "$(BUILDINC)" /Y /Q + @xcopy "$(SRCDIR)\include\arch\apr_private_common.h" "$(BUILDINC)\arch" /Y /Q + @xcopy "$(SRCDIR)\include\arch\win32\*.h" "$(BUILDINC)\arch\win32" /Y /Q + @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q + @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL

11 years, 11 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 January 2013