JBoss Native SVN: r1198 - trunk/build/windows.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-13 05:36:37 -0500 (Thu, 13 Dec 2007)
New Revision: 1198
Modified:
trunk/build/windows/build.bat
Log:
Don't even bother with < Windows NT.
Modified: trunk/build/windows/build.bat
===================================================================
--- trunk/build/windows/build.bat 2007-12-13 10:33:49 UTC (rev 1197)
+++ trunk/build/windows/build.bat 2007-12-13 10:36:37 UTC (rev 1198)
@@ -29,8 +29,8 @@
set "DIRNAME=%~dp0%"
set "PROGNAME=%~nx0%"
) else (
-set DIRNAME=.\
-set PROGNAME=build.bat
+echo Detected uncompatible Windows version.
+goto cmdEnd
)
pushd %DIRNAME%..
16 years, 5 months
JBoss Native SVN: r1197 - trunk/build/windows.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-13 05:33:49 -0500 (Thu, 13 Dec 2007)
New Revision: 1197
Modified:
trunk/build/windows/build.bat
Log:
Fix directory detection
Modified: trunk/build/windows/build.bat
===================================================================
--- trunk/build/windows/build.bat 2007-12-13 10:29:50 UTC (rev 1196)
+++ trunk/build/windows/build.bat 2007-12-13 10:33:49 UTC (rev 1197)
@@ -45,7 +45,7 @@
echo.
@if "%TOOLS_ROOT%" == "" set TOOLS_ROOT=C:\opt
-@if exist "%TOOLS_ROOT%\NUL" goto cmdSetTools
+@if exist "%TOOLS_ROOT%\" goto cmdSetTools
echo TOOLS_ROOT points to invalid directory %TOOLS_ROOT%
goto cmdEnd
@@ -57,7 +57,7 @@
set BUILD_OS=windows
@if "%CYGWIN_INSTALL_DIR%" == "" set CYGWIN_INSTALL_DIR=C:\cygwin
-@if exist "%CYGWIN_INSTALL_DIR%\NUL" goto cmdFoundCygwin
+@if exist "%CYGWIN_INSTALL_DIR%\" goto cmdFoundCygwin
echo CYGWIN_INSTALL_DIR points to invalid directory %CYGWIN_INSTALL_DIR%
goto cmdEnd
16 years, 5 months
JBoss Native SVN: r1196 - trunk/build/windows.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-13 05:29:50 -0500 (Thu, 13 Dec 2007)
New Revision: 1196
Modified:
trunk/build/windows/build.bat
Log:
Allow to specify the cygwin root path
Modified: trunk/build/windows/build.bat
===================================================================
--- trunk/build/windows/build.bat 2007-12-13 08:38:50 UTC (rev 1195)
+++ trunk/build/windows/build.bat 2007-12-13 10:29:50 UTC (rev 1196)
@@ -45,7 +45,7 @@
echo.
@if "%TOOLS_ROOT%" == "" set TOOLS_ROOT=C:\opt
-@if not exist "%TOOLS_ROOT%\NUL" goto cmdSetTools
+@if exist "%TOOLS_ROOT%\NUL" goto cmdSetTools
echo TOOLS_ROOT points to invalid directory %TOOLS_ROOT%
goto cmdEnd
@@ -54,10 +54,16 @@
set MSVS8VC=%TOOLS_ROOT%\MSVS8\VC
set MSVS6VC=%TOOLS_ROOT%\MSVS6
set MSWPSDK=%TOOLS_ROOT%\PSDK6
-
set BUILD_OS=windows
-set PATH=C:\cygwin\bin;%PATH%
+@if "%CYGWIN_INSTALL_DIR%" == "" set CYGWIN_INSTALL_DIR=C:\cygwin
+@if exist "%CYGWIN_INSTALL_DIR%\NUL" goto cmdFoundCygwin
+echo CYGWIN_INSTALL_DIR points to invalid directory %CYGWIN_INSTALL_DIR%
+goto cmdEnd
+
+:cmdFoundCygwin
+set PATH=%CYGWIN_INSTALL_DIR%\bin;%PATH%
+
set CRT_REDIST=
set USE_PLATFORM_SDK=
set APR_DECLARE_STATIC=
16 years, 5 months
JBoss Native SVN: r1195 - in trunk/build/unix: util and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2007-12-13 03:38:50 -0500 (Thu, 13 Dec 2007)
New Revision: 1195
Added:
trunk/build/unix/util/builddep.linux2.sh
trunk/build/unix/util/builddep.solaris.sh
Modified:
trunk/build/unix/build.sh
trunk/build/unix/util/builddep.sh
Log:
As the builddep stuff is experimental makes the default one doing nothing and
create a solaris and linux2 ones (note the linux2 one is only for rpm based
distribution.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-13 08:27:59 UTC (rev 1194)
+++ trunk/build/unix/build.sh 2007-12-13 08:38:50 UTC (rev 1195)
@@ -816,4 +816,4 @@
)
# generate a list of dependencies
-override ${build_top}/util/builddep $build_output_dir ${PACKAGE}.${build_version}.${BUILD_SYS}.${BUILD_CPU}.depends
+override ${build_top}/util/builddep $build_output_dir ${PACKAGE}.${build_version}.${BUILD_SYS}.${BUILD_CPU}.depends ${build_working_dir}
Added: trunk/build/unix/util/builddep.linux2.sh
===================================================================
--- trunk/build/unix/util/builddep.linux2.sh (rev 0)
+++ trunk/build/unix/util/builddep.linux2.sh 2007-12-13 08:38:50 UTC (rev 1195)
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright(c) 2007 Red Hat Middleware, LLC,
+# and individual contributors as indicated by the @authors tag.
+# See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library in the file COPYING.LIB;
+# if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+#
+# @author Jean-Frederic Clere
+#
+
+# Download the sources. It guess how to do it.
+# $1: binary build directory.
+# $2: ouput file.
+# $3: work directory location
+LD_LIBRARY_PATH=$1
+for dir in `find $1 -name "*.so" -exec dirname {} \;`
+do
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dir
+done
+echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH
+
+find $1 -name "*.${so_extension}" -exec ldd {} \; > $3/$2.all
+cat $3/$2.all | awk 'NF==4 { print $3 } ' | sort -u | grep -v "$1" > $3/$2
+> $3/$2.tmp
+for file in `cat $3/$2`
+do
+ rpm -qf $file >> $3/$2.tmp
+done
+sort -u $3/$2.tmp > $3/$2.pkg
Property changes on: trunk/build/unix/util/builddep.linux2.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/build/unix/util/builddep.sh
===================================================================
--- trunk/build/unix/util/builddep.sh 2007-12-13 08:27:59 UTC (rev 1194)
+++ trunk/build/unix/util/builddep.sh 2007-12-13 08:38:50 UTC (rev 1195)
@@ -25,26 +25,5 @@
# Download the sources. It guess how to do it.
# $1: binary build directory.
# $2: ouput file.
-LD_LIBRARY_PATH=$1
-for dir in `find $1 -name "*.${so_extension}" -exec dirname {} \;`
-do
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dir
-done
-echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
-export LD_LIBRARY_PATH
-
-find $1 -name "*.${so_extension}" -exec ldd {} \; > $2.all
-cat $2.all | awk 'NF==4 { print $3 } ' | sort -u | grep -v "$1" > $2
-> $2.tmp
-for file in `cat $2`
-do
- case ${BUILD_SYS} in
- linux2)
- rpm -qf $file >> $2.tmp
- ;;
- solaris)
- pkgchk -l -p $file | grep "^ " >> $2.tmp
- ;;
- esac
-done
-sort -u $2.tmp > $2.pkg
+# $3: work directory.
+echo "Not yet supported in this platform"
Added: trunk/build/unix/util/builddep.solaris.sh
===================================================================
--- trunk/build/unix/util/builddep.solaris.sh (rev 0)
+++ trunk/build/unix/util/builddep.solaris.sh 2007-12-13 08:38:50 UTC (rev 1195)
@@ -0,0 +1,44 @@
+#!/bin/sh
+# Copyright(c) 2007 Red Hat Middleware, LLC,
+# and individual contributors as indicated by the @authors tag.
+# See the copyright.txt in the distribution for a
+# full listing of individual contributors.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library in the file COPYING.LIB;
+# if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+#
+# @author Jean-Frederic Clere
+#
+
+# Download the sources. It guess how to do it.
+# $1: binary build directory.
+# $2: ouput file.
+# $3: work directory.
+LD_LIBRARY_PATH=$1
+for dir in `find $1 -name "*.${so_extension}" -exec dirname {} \;`
+do
+ LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$dir
+done
+echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH
+
+find $1 -name "*.${so_extension}" -exec ldd {} \; > $3/$2.all
+cat $3/$2.all | awk 'NF==4 { print $3 } ' | sort -u | grep -v "$1" > $3/$2
+> $3/$2.tmp
+for file in `cat $3/$2`
+do
+ pkgchk -l -p $file | grep "^ " >> $3/$2.tmp
+done
+sort -u $3/$2.tmp > $3/$2.pkg
Property changes on: trunk/build/unix/util/builddep.solaris.sh
___________________________________________________________________
Name: svn:executable
+ *
16 years, 5 months
JBoss Native SVN: r1194 - in trunk: srclib/zlib and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-13 03:27:59 -0500 (Thu, 13 Dec 2007)
New Revision: 1194
Modified:
trunk/build/unix/build.sh
trunk/srclib/zlib/NMAKEmakefile
Log:
Fix zlib build
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-13 07:47:12 UTC (rev 1193)
+++ trunk/build/unix/build.sh 2007-12-13 08:27:59 UTC (rev 1194)
@@ -42,7 +42,7 @@
has_posix_tar=true
# parameters
-has_zlib=false
+has_zlib=true
has_openssl=false
has_apr=true
has_apu=true
@@ -652,6 +652,12 @@
echo "Building binaries at `pwd`"
dst_dir=$1
+ if $has_zlib; then
+ buildzlib srclib/zlib-${zlib_version} false
+ if $has_static ; then
+ builzlib srclib/zlib-${zlib_version} true
+ fi
+ fi
# apr-util has a --with-openssl=DIR so we must be build openssl before apu.
ls srclib | grep openssl >/dev/null
if [ $? -eq 0 ]; then
@@ -794,6 +800,9 @@
if $has_apu; then
cp ../../srclib/apr-util/NMAKEmakefile $package_src_dir/srclib/apr-util-${apu_version}/
fi
+if $has_zlib; then
+ cp ../../srclib/zlib/NMAKEmakefile $package_src_dir/srclib/zlib-${zlib_version}/
+fi
# Build the source tarball
buildtar ${build_working_dir} ${package_src_name} ${build_output_dir} ${package_src_name}
Modified: trunk/srclib/zlib/NMAKEmakefile
===================================================================
--- trunk/srclib/zlib/NMAKEmakefile 2007-12-13 07:47:12 UTC (rev 1193)
+++ trunk/srclib/zlib/NMAKEmakefile 2007-12-13 08:27:59 UTC (rev 1194)
@@ -26,12 +26,14 @@
# ====================================================================
#
-!IFDEF DLL
-TARGET = DLL
-PROJECT = zlib1
+!IF !DEFINED(ZLIB_DECLARE_STATIC) || "$(ZLIB_DECLARE_STATIC)" == ""
+TARGET=DLL
+PROJECT = libzlib1
+CFLAGS = -DZLIB_DECLARE_EXPORT $(CFLAGS)
!ELSE
-TARGET = LIB
+TARGET=LIB
PROJECT = zlib1
+CFLAGS = -DZLIB_DECLARE_STATIC $(CFLAGS)
!ENDIF
CFLAGS = -wd4996 $(CFLAGS)
@@ -40,72 +42,80 @@
SRCDIR = .
!ENDIF
-!include <../../build/NMAKEcommon.inc>
+!include <..\..\NMAKEcommon.inc>
INCLUDES = -I$(SRCDIR)
-PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src
+PDBFLAGS = -Fo$(WORKDIR)\ -Fd$(WORKDIR)\$(PROJECT)-src
OBJECTS = \
- $(BUILDIR)\adler32.obj \
- $(BUILDIR)\compress.obj \
- $(BUILDIR)\crc32.obj \
- $(BUILDIR)\deflate.obj \
- $(BUILDIR)\gzio.obj \
- $(BUILDIR)\infback.obj \
- $(BUILDIR)\inffast.obj \
- $(BUILDIR)\inflate.obj \
- $(BUILDIR)\inftrees.obj \
- $(BUILDIR)\trees.obj \
- $(BUILDIR)\uncompr.obj \
- $(BUILDIR)\zutil.obj
+ $(WORKDIR)\adler32.obj \
+ $(WORKDIR)\compress.obj \
+ $(WORKDIR)\crc32.obj \
+ $(WORKDIR)\deflate.obj \
+ $(WORKDIR)\gzio.obj \
+ $(WORKDIR)\infback.obj \
+ $(WORKDIR)\inffast.obj \
+ $(WORKDIR)\inflate.obj \
+ $(WORKDIR)\inftrees.obj \
+ $(WORKDIR)\trees.obj \
+ $(WORKDIR)\uncompr.obj \
+ $(WORKDIR)\zutil.obj
!IFDEF ASM
CFLAGS = -DASMV -DASMINF $(CFLAGS)
!IF "$(CPU)" == "AMD64"
ASM_OBJECTS = \
- $(BUILDIR)\inffas8664.obj \
- $(BUILDIR)\gvmat64.obj \
- $(BUILDIR)\inffas64.obj
+ $(WORKDIR)\inffas8664.obj \
+ $(WORKDIR)\gvmat64.obj \
+ $(WORKDIR)\inffas64.obj
!ELSE
ASM_OBJECTS = \
- $(BUILDIR)\gvmat32c.obj \
- $(BUILDIR)\gvmat32.obj \
- $(BUILDIR)\inffas32.obj
+ $(WORKDIR)\gvmat32c.obj \
+ $(WORKDIR)\gvmat32.obj \
+ $(WORKDIR)\inffas32.obj
!ENDIF
!ELSE
ASM_OBJECTS =
!ENDIF
-!IFDEF DLL
-BUILDLIB = $(BUILDIR)\$(PROJECT).dll
-BUILDPDB = $(BUILDIR)\$(PROJECT).pdb
-BUILDRES = $(BUILDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDLIB).manifest
+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
-BUILDLIB = $(BUILDIR)\$(PROJECT).lib
+BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-all : $(BUILDIR) $(BUILDLIB)
+all : $(WORKDIR) $(BUILDBIN)
-$(BUILDIR) :
- @$(MAKETARGET)
+$(BUILDINC) :
+ @if not exist "$(BUILDINC)\arch\win32\$(NULL)" mkdir "$(BUILDINC)\arch\win32"
-{$(SRCDIR)}.c{$(BUILDIR)}.obj:
+$(BUILDLIB) :
+ @if not exist "$(BUILDLIB)\$(NULL)" mkdir "$(BUILDLIB)"
+
+$(WORKDIR) :
+ @$(MAKEWORKDIR)
+
+{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
!IF "$(CPU)" == "AMD64"
-{$(SRCDIR)/contrib/masmx64}.c{$(BUILDIR)}.obj:
+{$(SRCDIR)/contrib/masmx64}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-{$(SRCDIR)/contrib/masmx64}.asm{$(BUILDIR)}.obj:
+{$(SRCDIR)/contrib/masmx64}.asm{$(WORKDIR)}.obj:
$(ML) $(AFLAGS) /Fo$@ $<
!ELSE
-{$(SRCDIR)/contrib/masmx86}.c{$(BUILDIR)}.obj:
+{$(SRCDIR)/contrib/masmx86}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-{$(SRCDIR)/contrib/masmx86}.asm{$(BUILDIR)}.obj:
+{$(SRCDIR)/contrib/masmx86}.asm{$(WORKDIR)}.obj:
$(ML) $(AFLAGS) /Fo$@ $<
!ENDIF
@@ -116,14 +126,21 @@
!IFDEF DLL
$(BUILDRES): win32/zlib1.rc
$(RC) $(RCFLAGS) /fo $(BUILDRES) win32/zlib1.rc
-$(BUILDLIB): $(BUILDIR) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES)
- $(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES) $(LIBS) /def:win32/zlib.def /pdb:$(BUILDPDB) /out:$(BUILDLIB)
+$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES) $(LIBS) /def:win32/zlib.def /pdb:$(BUILDPDB) /out:$(BUILDBIN)
IF EXIST $(BUILDMAN) \
- mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2
+ mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDBIN);2
!ELSE
-$(BUILDLIB): $(BUILDIR) $(OBJECTS) $(ASM_OBJECTS)
- $(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) /out:$(BUILDLIB)
+$(BUILDBIN): $(WORKDIR) $(OBJECTS) $(ASM_OBJECTS)
+ $(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) /out:$(BUILDBIN)
!ENDIF
clean:
@$(CLEANTARGET)
+
+install: $(BUILDINC) $(BUILDLIB) $(WORKDIR) $(BUILDBIN)
+ @xcopy "$(SRCDIR)\zlib.h" "$(BUILDINC)" /Y /Q
+ @xcopy "$(SRCDIR)\zconf.h" "$(BUILDINC)" /Y /Q
+ @xcopy "$(SRCDIR)\zutil.h" "$(BUILDINC)" /Y /Q
+ @xcopy "$(WORKDIR)\*.lib" "$(BUILDLIB)" /Y /Q
+ @xcopy "$(WORKDIR)\*.dll" "$(BUILDLIB)" /Y /Q 2>NUL
16 years, 5 months
JBoss Native SVN: r1193 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-13 02:47:12 -0500 (Thu, 13 Dec 2007)
New Revision: 1193
Modified:
trunk/build/unix/build.sh
trunk/build/unix/package.list
Log:
Add zlib to the build.sh
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2007-12-13 07:33:59 UTC (rev 1192)
+++ trunk/build/unix/build.sh 2007-12-13 07:47:12 UTC (rev 1193)
@@ -42,11 +42,13 @@
has_posix_tar=true
# parameters
+has_zlib=false
has_openssl=false
has_apr=true
has_apu=true
has_api=true
build_api=false
+build_zlib=false
has_cache=false
has_version=false
has_package=false
@@ -148,8 +150,12 @@
apu_version=`echo "${parg}" | ${awk} -F'|' '{print $4}'`
api_version=`echo "${parg}" | ${awk} -F'|' '{print $5}'`
ssl_version=`echo "${parg}" | ${awk} -F'|' '{print $6}'`
-svn_tagname=`echo "${parg}" | ${awk} -F'|' '{print $7}'`
+zlib_version=`echo "${parg}" | ${awk} -F'|' '{print $7}'`
+svn_tagname=`echo "${parg}" | ${awk} -F'|' '{print $8}'`
+if [ "x" = "x${zlib_version}" ]; then
+ has_zlib=false
+fi
if [ "x" = "x${ssl_version}" ]; then
has_openssl=false
fi
@@ -220,6 +226,9 @@
if $has_api; then
build_api=true
fi
+ if $has_zlib; then
+ build_zlib=true
+ fi
;;
CYGWIN*)
so_extension=dll
@@ -602,6 +611,39 @@
}
#
+# Build zlib
+# $1 directory of the sources directory
+# $2 static or shared
+buildzlib()
+{
+ zlib_srcdir=$1
+ zlib_static=$2
+
+ if $zlib_static ; then
+ zlib_common_dir=${build_common_dir}-static
+ else
+ zlib_common_dir=${build_common_dir}
+ fi
+
+ if [ -f ${zlib_common_dir}/include/apr-1/zlib.h ]; then
+ echo "Using cached zlib in ${zlib_common_dir}"
+ return
+ fi
+ echo "Configuring zlib-${zlib_version} with --prefix=${zlib_common_dir}"
+ if $BUILD_WIN ; then
+ (cd ${zlib_srcdir}
+ 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
+ else
+ nmake -f NMAKEmakefile $wrapped_args install
+ fi
+ )
+ fi
+}
+
+#
# Build the binaries
# $1 directory where to put the resulting tarball.
# XXX: It is always $build_output_dir !
@@ -702,10 +744,14 @@
APIURLBACK=http://archive.apache.org/dist/apr/apr-iconv-${api_version}.ta...
fi
SSLURL=http://www.openssl.org/source/openssl-${ssl_version}.tar.gz
+ZLIBURL=http://www.zlib.net/zlib-${zlib_version}.tar.gz
rm -rf ${package_src_dir}
mkdir -p ${package_src_dir}/srclib
+if $has_zlib; then
+ ckeckdownload zlib-${zlib_version} $ZLIBURL ""
+fi
if $has_openssl; then
ckeckdownload openssl-${ssl_version} $SSLURL ""
fi
@@ -732,7 +778,7 @@
cat > ${package_src_dir}/package.list << EOF
# THIS FILE WAS AUTOGENERATED BY `basename $0`
#
-${PACKAGE}|${build_version}|${apr_version}|${apu_version}|${api_version}|${ssl_version}|${svn_tagname}
+${PACKAGE}|${build_version}|${apr_version}|${apu_version}|${api_version}|${ssl_version}|${zlib_version}|${svn_tagname}
EOF
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2007-12-13 07:33:59 UTC (rev 1192)
+++ trunk/build/unix/package.list 2007-12-13 07:47:12 UTC (rev 1193)
@@ -1,13 +1,13 @@
# list of the packages
# add new versions of package after existing ones.
-jboss-native|2.0.1|1.2.9|1.2.8|1.2.1|0.9.8e|TOMCAT_NATIVE_1_1_11
-jboss-native|2.0.2|1.2.9|1.2.8|1.2.1|0.9.8e|TOMCAT_NATIVE_1_1_11
-jboss-native|2.0.3-dev|1.2.8|1.2.8|1.2.1|0.9.8e|trunk
-jboss-native|2.0.3|1.2.8|1.2.8|1.2.1|0.9.8e|TOMCAT_NATIVE_1_1_11
+jboss-native|2.0.1|1.2.9|1.2.8|1.2.1|0.9.8e|1.2.3|TOMCAT_NATIVE_1_1_11
+jboss-native|2.0.2|1.2.9|1.2.8|1.2.1|0.9.8e|1.2.3|TOMCAT_NATIVE_1_1_11
+jboss-native|2.0.3-dev|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3|trunk
+jboss-native|2.0.3|1.2.8|1.2.8|1.2.1|0.9.8e|1.2.3|TOMCAT_NATIVE_1_1_11
# SIGHT
-jboss-sight|1.0.0|1.2.9|1.2.8|1.2.1||trunk
-jboss-sight|1.0.1|1.2.8|1.2.8|1.2.1||trunk
-jboss-sight|1.0.2|1.2.8|1.2.8|1.2.1||trunk
+jboss-sight|1.0.0|1.2.9|1.2.8|1.2.1|||trunk
+jboss-sight|1.0.1|1.2.8|1.2.8|1.2.1|||trunk
+jboss-sight|1.0.2|1.2.8|1.2.8|1.2.1|||trunk
# httpd
-jboss-httpd|0.0.1|||||2.2.6
-rhel-httpd|0.0.1|||||httpd-2_2_3-11_el5
+jboss-httpd|0.0.1||||||2.2.6
+rhel-httpd|0.0.1||||||httpd-2_2_3-11_el5
16 years, 5 months
JBoss Native SVN: r1192 - in trunk: srclib/zlib and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-13 02:33:59 -0500 (Thu, 13 Dec 2007)
New Revision: 1192
Added:
trunk/build/patch/zlib-1.2.3.patch
Removed:
trunk/srclib/zlib/zlib-1.2.3.patch
Log:
Zlib will be part of core libraries, cause it'll be used by OpenSSL as well.
Added: trunk/build/patch/zlib-1.2.3.patch
===================================================================
--- trunk/build/patch/zlib-1.2.3.patch (rev 0)
+++ trunk/build/patch/zlib-1.2.3.patch 2007-12-13 07:33:59 UTC (rev 1192)
@@ -0,0 +1,21 @@
+--- win32/zlib1.rc
++++ win32/zlib1.rc
+@@ -5,15 +5,15 @@
+ #else
+ VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
+ #endif
+- FILEVERSION 1,2,2,0
+- PRODUCTVERSION 1,2,2,0
++ FILEVERSION 1,2,3,0
++ PRODUCTVERSION 1,2,3,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ #ifdef _DEBUG
+ FILEFLAGS 1
+ #else
+ FILEFLAGS 0
+ #endif
+- FILEOS VOS_DOS_WINDOWS32
++ FILEOS VOS_NT
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0 // not used
+ BEGIN
Property changes on: trunk/build/patch/zlib-1.2.3.patch
___________________________________________________________________
Name: svn:eol-style
+ LF
Deleted: trunk/srclib/zlib/zlib-1.2.3.patch
===================================================================
--- trunk/srclib/zlib/zlib-1.2.3.patch 2007-12-13 07:30:06 UTC (rev 1191)
+++ trunk/srclib/zlib/zlib-1.2.3.patch 2007-12-13 07:33:59 UTC (rev 1192)
@@ -1,21 +0,0 @@
---- win32/zlib1.rc
-+++ win32/zlib1.rc
-@@ -5,15 +5,15 @@
- #else
- VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- #endif
-- FILEVERSION 1,2,2,0
-- PRODUCTVERSION 1,2,2,0
-+ FILEVERSION 1,2,3,0
-+ PRODUCTVERSION 1,2,3,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
- #ifdef _DEBUG
- FILEFLAGS 1
- #else
- FILEFLAGS 0
- #endif
-- FILEOS VOS_DOS_WINDOWS32
-+ FILEOS VOS_NT
- FILETYPE VFT_DLL
- FILESUBTYPE 0 // not used
- BEGIN
16 years, 5 months
JBoss Native SVN: r1191 - trunk/build/unix/util.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-13 02:30:06 -0500 (Thu, 13 Dec 2007)
New Revision: 1191
Modified:
trunk/build/unix/util/builddep.sh
trunk/build/unix/util/ckeckdownload.sh
trunk/build/unix/util/find_gnu.sh
Log:
Apply common properties for .sh files
Property changes on: trunk/build/unix/util/builddep.sh
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate
Name: svn:eol-style
+ LF
Property changes on: trunk/build/unix/util/ckeckdownload.sh
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate
Name: svn:eol-style
+ LF
Property changes on: trunk/build/unix/util/find_gnu.sh
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate
Name: svn:eol-style
+ LF
16 years, 5 months
JBoss Native SVN: r1190 - trunk/srclib/zlib.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-13 02:21:09 -0500 (Thu, 13 Dec 2007)
New Revision: 1190
Added:
trunk/srclib/zlib/URL
trunk/srclib/zlib/VERSION
trunk/srclib/zlib/zlib-1.2.3.patch
Removed:
trunk/srclib/zlib/zlib1.rc
Log:
Added zlib build support files.
We need zlib for httpd
Added: trunk/srclib/zlib/URL
===================================================================
--- trunk/srclib/zlib/URL (rev 0)
+++ trunk/srclib/zlib/URL 2007-12-13 07:21:09 UTC (rev 1190)
@@ -0,0 +1,2 @@
+http://www.zlib.net/zlib-1.2.3.tar.gz
+http://www.zlib.net/zlib123.zip
Property changes on: trunk/srclib/zlib/URL
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/srclib/zlib/VERSION
===================================================================
--- trunk/srclib/zlib/VERSION (rev 0)
+++ trunk/srclib/zlib/VERSION 2007-12-13 07:21:09 UTC (rev 1190)
@@ -0,0 +1 @@
+1.2.3
Property changes on: trunk/srclib/zlib/VERSION
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/srclib/zlib/zlib-1.2.3.patch
===================================================================
--- trunk/srclib/zlib/zlib-1.2.3.patch (rev 0)
+++ trunk/srclib/zlib/zlib-1.2.3.patch 2007-12-13 07:21:09 UTC (rev 1190)
@@ -0,0 +1,21 @@
+--- win32/zlib1.rc
++++ win32/zlib1.rc
+@@ -5,15 +5,15 @@
+ #else
+ VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
+ #endif
+- FILEVERSION 1,2,2,0
+- PRODUCTVERSION 1,2,2,0
++ FILEVERSION 1,2,3,0
++ PRODUCTVERSION 1,2,3,0
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ #ifdef _DEBUG
+ FILEFLAGS 1
+ #else
+ FILEFLAGS 0
+ #endif
+- FILEOS VOS_DOS_WINDOWS32
++ FILEOS VOS_NT
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0 // not used
+ BEGIN
Property changes on: trunk/srclib/zlib/zlib-1.2.3.patch
___________________________________________________________________
Name: svn:eol-style
+ LF
Deleted: trunk/srclib/zlib/zlib1.rc
===================================================================
--- trunk/srclib/zlib/zlib1.rc 2007-12-13 06:51:19 UTC (rev 1189)
+++ trunk/srclib/zlib/zlib1.rc 2007-12-13 07:21:09 UTC (rev 1190)
@@ -1,39 +0,0 @@
-#include <windows.h>
-
-#ifdef GCC_WINDRES
-VS_VERSION_INFO VERSIONINFO
-#else
-VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
-#endif
- FILEVERSION 1,2,3,0
- PRODUCTVERSION 1,2,3,0
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
- FILEFLAGS 1
-#else
- FILEFLAGS 0
-#endif
- FILEOS VOS__WINDOWS32
- FILETYPE VFT_DLL
- FILESUBTYPE 0 // not used
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904E4"
- //language ID = U.S. English, char set = Windows, Multilingual
- BEGIN
- VALUE "FileDescription", "zlib data compression library\0"
- VALUE "FileVersion", "1.2.3\0"
- VALUE "InternalName", "zlib1.dll\0"
- VALUE "LegalCopyright", "(C) 1995-2004 Jean-loup Gailly & Mark Adler\0"
- VALUE "OriginalFilename", "zlib1.dll\0"
- VALUE "ProductName", "zlib\0"
- VALUE "ProductVersion", "1.2.3\0"
- VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0409, 1252
- END
-END
16 years, 5 months
JBoss Native SVN: r1189 - trunk/sight/java/org/jboss/sight.
by jbossnative-commits＠lists.jboss.org
Author: mladen.turk(a)jboss.com
Date: 2007-12-13 01:51:19 -0500 (Thu, 13 Dec 2007)
New Revision: 1189
Modified:
trunk/sight/java/org/jboss/sight/Library.properties
Log:
Add libapriconv-1 to the list of preloaed libraries
Modified: trunk/sight/java/org/jboss/sight/Library.properties
===================================================================
--- trunk/sight/java/org/jboss/sight/Library.properties 2007-12-13 06:41:24 UTC (rev 1188)
+++ trunk/sight/java/org/jboss/sight/Library.properties 2007-12-13 06:51:19 UTC (rev 1189)
@@ -22,10 +22,11 @@
#
# Library.properties
#
-windows.count=3
+windows.count=4
windows.0=libapr-1.dll
-windows.1=libaprutil-1.dll
-windows.2=libsight-1.dll
+windows.1=libapriconv-1.dll
+windows.2=libaprutil-1.dll
+windows.3=libsight-1.dll
linux2.count=4
linux2.0=libapr-1.so
16 years, 5 months