Author: jfrederic.clere(a)jboss.com Date: 2011-04-28 05:10:05 -0400 (Thu, 28 Apr 2011) New Revision: 2754 Modified: trunk/build/daemon/buildnat.bat trunk/build/unix/build.sh trunk/build/unix/package.list trunk/srclib/tomcat-native/tomcat-native-1.1/NMAKEmakefile Log: Arrange static tcnative... and remove used dependencies. Modified: trunk/build/daemon/buildnat.bat =================================================================== --- trunk/build/daemon/buildnat.bat 2011-04-27 08:37:22 UTC (rev 2753) +++ trunk/build/daemon/buildnat.bat 2011-04-28 09:10:05 UTC (rev 2754) @@ -52,9 +52,9 @@ #call build.bat sdk i64 jboss-native -ssl -cache # static dll tcnative-1.dll -call build.bat sdk x86 jboss-native -ssl -cache -static -call build.bat sdk x64 jboss-native -ssl -cache -static -call build.bat sdk i64 jboss-native -ssl -cache -static +call build.bat sdk static x86 jboss-native -ssl -cache -static +call build.bat sdk static x64 jboss-native -ssl -cache -static +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 REM call build.bat sdk x64 jboss-sight -cache Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2011-04-27 08:37:22 UTC (rev 2753) +++ trunk/build/unix/build.sh 2011-04-28 09:10:05 UTC (rev 2754) @@ -807,7 +807,7 @@ echo "Building APR ${apr_version} in ${apr_srcdir}" cygwinpath true PREFIX=${apr_common_dir} SRCDIR=`pwd` if $apr_static ; then - nmake -f NMAKEmakefile $wrapped_args APR_DECLARE_STATIC=true install + nmake -f NMAKEmakefile $wrapped_args APR_DECLARE_STATIC=1 install else nmake -f NMAKEmakefile $wrapped_args install fi @@ -862,7 +862,7 @@ echo "Building APR utilities ${apu_version} ..." cygwinpath true WITH_APR=${apu_common_dir} PREFIX=${apu_common_dir} SRCDIR=`pwd` if $apu_static ; then - nmake -f NMAKEmakefile $wrapped_args APR_DECLARE_STATIC=true install + nmake -f NMAKEmakefile $wrapped_args APR_DECLARE_STATIC=1 install else nmake -f NMAKEmakefile $wrapped_args install fi @@ -904,7 +904,7 @@ echo "Building APR iconv ${api_version} ..." cygwinpath true WITH_APR=${api_common_dir} PREFIX=${api_common_dir} SRCDIR=`pwd` if $api_static ; then - nmake -f NMAKEmakefile $wrapped_args APR_DECLARE_STATIC=true install + nmake -f NMAKEmakefile $wrapped_args APR_DECLARE_STATIC=1 install else nmake -f NMAKEmakefile $wrapped_args install fi @@ -943,7 +943,7 @@ cygwinpath true PREFIX=${any_common_dir} SRCDIR=`pwd` if $any_static ; then # XXX: That won't work probably. - nmake -f NMAKEmakefile $wrapped_args ANY_DECLARE_STATIC=true install + nmake -f NMAKEmakefile $wrapped_args ANY_DECLARE_STATIC=1 APR_DECLARE_STATIC=1 install else nmake -f NMAKEmakefile $wrapped_args install fi @@ -990,7 +990,7 @@ echo "Building Zlib ${zlib_version} ..." cygwinpath true PREFIX=${zlib_common_dir} SRCDIR=`pwd` if $zlib_static ; then - nmake -f NMAKEmakefile $wrapped_args ZLIB_DECLARE_STATIC=true install + nmake -f NMAKEmakefile $wrapped_args ZLIB_DECLARE_STATIC=1 install else nmake -f NMAKEmakefile $wrapped_args install fi Modified: trunk/build/unix/package.list =================================================================== --- trunk/build/unix/package.list 2011-04-27 08:37:22 UTC (rev 2753) +++ trunk/build/unix/package.list 2011-04-28 09:10:05 UTC (rev 2754) @@ -11,7 +11,7 @@ jboss-native|2.0.7|TOMCAT_NATIVE_1_1_17|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3 jboss-native|2.0.8|TOMCAT_NATIVE_1_1_18|apr:v:1.3.8|apu:v:1.3.9|api:v:1.2.1|ssl:v:0.9.8i|zlib:v:1.2.3 jboss-native|2.0.9|TOMCAT_NATIVE_1_1_20|apr:v:1.3.8|apu:v:1.3.9|api:v:1.2.1|ssl:v:0.9.8k|zlib:v:1.2.3 -jboss-native|2.0.10-dev|branches/1.1.x|apr:v:1.3.12|apu:v:1.3.10|api:v:1.2.1|ssl:v:0.9.8r|zlib:v:1.2.3 +jboss-native|2.0.10-dev|branches/1.1.x|apr:v:1.3.12|ssl:v:0.9.8r # SIGHT jboss-sight|1.0.0|trunk|apr:v:1.2.9|apu:v:1.2.8|api:v:1.2.1 jboss-sight|1.0.1|trunk|apr:v:1.2.8|apu:v:1.2.8|api:v:1.2.1 Modified: trunk/srclib/tomcat-native/tomcat-native-1.1/NMAKEmakefile =================================================================== --- trunk/srclib/tomcat-native/tomcat-native-1.1/NMAKEmakefile 2011-04-27 08:37:22 UTC (rev 2753) +++ trunk/srclib/tomcat-native/tomcat-native-1.1/NMAKEmakefile 2011-04-28 09:10:05 UTC (rev 2754) @@ -28,23 +28,21 @@ !IF !DEFINED(APR_DECLARE_STATIC) || "$(APR_DECLARE_STATIC)" == "" PROJECT = libtcnative-1 APR_LIB = libapr-1.lib -APU_LIB = libaprutil-1.lib !ELSE -CFLAGS = -DAPR_DECLARE_STATIC -DAPU_DECLARE_STATIC $(CFLAGS) +CFLAGS = -DAPR_DECLARE_STATIC $(CFLAGS) PROJECT = tcnative-1 APR_LIB = apr-1.lib -APU_LIB = aprutil-1.lib !ENDIF TARGET = DLL !include <..\..\NMAKEcommon.inc> !IF DEFINED(WITH_OPENSSL) && "$(WITH_OPENSSL)" != "no" -CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DNO_IDEA -DNO_RC5 -DNO_MDC2 -DOPENSSL_NO_IDEA \ +CFLAGS = $(CFLAGS) -DNO_IDEA -DNO_RC5 -DNO_MDC2 -DOPENSSL_NO_IDEA \ -DOPENSSL_NO_RC5 -DOPENSSL_NO_MDC2 -DHAVE_OPENSSL -DHAVE_SSL_SET_STATE=1 \ -DTCN_DECLARE_EXPORT !ELSE -CFLAGS = $(CFLAGS) -DZLIB_WINAPI -DTCN_DECLARE_EXPORT +CFLAGS = $(CFLAGS) -DTCN_DECLARE_EXPORT !ENDIF !IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" @@ -66,7 +64,7 @@ LFLAGS = $(LFLAGS) /version:1.1 LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib ole32.lib -LFLAGS = $(LFLAGS) $(APR_LIB) $(APU_LIB) +LFLAGS = $(LFLAGS) $(APR_LIB) !IF DEFINED(WITH_OPENSSL) && "$(WITH_OPENSSL)" != "no" LFLAGS = $(LFLAGS) libeay32.lib ssleay32.lib LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)\lib"