JBoss Native SVN: r2556 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-08-21 07:35:08 -0400 (Fri, 21 Aug 2009)
New Revision: 2556
Modified:
trunk/build/unix/build.sh
Log:
Another try to get the right location...
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-08-21 09:46:51 UTC (rev 2555)
+++ trunk/build/unix/build.sh 2009-08-21 11:35:08 UTC (rev 2556)
@@ -458,7 +458,7 @@
package_output_dir=${build_working_dir}/${package_src_name}/output/${BUILD_TAG}
fi
-# Copy files according a rule like Override also copy common
+# Copy files according a rule like Override.
# $1: source dir
# $2: source file
# $3: dest dir
@@ -491,9 +491,6 @@
if [ "${srcfile}x" != "x" ]; then
echo "copying $srcfile $destdir"
cp $srcfile $destdir
- # also copy common files...
- mkdir -p $destdir/../common
- cp ${basedir}/common/* $destdir/../common
fi
}
@@ -1109,6 +1106,9 @@
applypatch $src_dir false
fi
cp -rp ${src_dir} ${package_src_dir}/srclib
+ # also copy common files...
+ mkdir -p ${package_src_dir}/srclib/common
+ cp ${basedir}/common/* ${package_src_dir}/srclib/common
cd $build_top
}
15 years, 3 months
JBoss Native SVN: r2555 - in trunk: srclib and 1 other directories.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-08-21 05:46:51 -0400 (Fri, 21 Aug 2009)
New Revision: 2555
Added:
trunk/srclib/common/
trunk/srclib/common/NMAKEcommon.inc
Modified:
trunk/build/unix/build.sh
Log:
Add missing file...
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-08-20 15:34:44 UTC (rev 2554)
+++ trunk/build/unix/build.sh 2009-08-21 09:46:51 UTC (rev 2555)
@@ -458,7 +458,7 @@
package_output_dir=${build_working_dir}/${package_src_name}/output/${BUILD_TAG}
fi
-# Copy files according a rule like Override
+# Copy files according a rule like Override also copy common
# $1: source dir
# $2: source file
# $3: dest dir
@@ -491,6 +491,9 @@
if [ "${srcfile}x" != "x" ]; then
echo "copying $srcfile $destdir"
cp $srcfile $destdir
+ # also copy common files...
+ mkdir -p $destdir/../common
+ cp ${basedir}/common/* $destdir/../common
fi
}
Added: trunk/srclib/common/NMAKEcommon.inc
===================================================================
--- trunk/srclib/common/NMAKEcommon.inc (rev 0)
+++ trunk/srclib/common/NMAKEcommon.inc 2009-08-21 09:46:51 UTC (rev 2555)
@@ -0,0 +1,344 @@
+# 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.
+#
+# ====================================================================
+#
+# NMAKEcommon.inc Master makefile definitions.
+# This file defines CPU architecture and basic compiler
+# and linker parameters.
+# Common params:
+# CPU Compile for specified CPU. Supported CPU's are:
+# X86 (Common x86 architecture)
+# X64 (AMD64/EMT64 architecture)
+# I64 (Intel IA64 architecture)
+# If not specified it will default to the
+# PROCESSOR_ARCHITECTURE environment variable
+# or to the X86 if not specified.
+# WINVER Compile for specified Windows version
+# WINNT for Windows 2000 and up(default)
+# WINXP for Windows XP and up
+# WIN2003 for Windows 2003 and up
+# VSITA for Windows Vista and up
+# Deprecated targets (may not even compile):
+# NT4 for Windows NT4 and up
+# WIN9X for Windows 95, 98 and Me
+# BUILD Build version
+# RETAIL or RELEASE (default)
+# DEBUG
+# TARGET Build application target
+# EXE Console executable (default)
+# GUI Windows GUI executable
+# DLL Dynamic Link Library
+# LIB Static library
+# Environment variables used:
+# CFLAGS Added to the common CFLAGS
+# CPPFLAGS Added to the common CPPFLAGS
+# LIBS Added to the common LIBS
+# INCLUDES Added to the common INCLUDES
+# LFLAGS Added to the common LFLAGS
+# RCFLAGS Added to the common RCFLAGS
+#
+# Compiler tools environment variables:
+# CC C compiler (defaults to cl.exe)
+# LINK Linker (defaults to link.exe)
+# RC Resource compiler (defaults to rc.exe)
+# MT Manifest toolkit (defaults to mt.exe)
+# ML Assembler (defaults to ml.exe or ml64.exe)
+#
+# Originally contributed by Mladen Turk <mturk jboss.com>
+#
+# ====================================================================
+#
+
+!IF !DEFINED(CC) || "$(CC)" == ""
+CC = cl.exe
+!ENDIF
+
+!IF !DEFINED(LINK) || "$(LINK)" == ""
+LINK = link.exe
+!ENDIF
+
+!IF !DEFINED(RC) || "$(RC)" == ""
+RC = rc.exe
+!ENDIF
+
+!IF !DEFINED(MT) || "$(MT)" == ""
+MT = mt.exe
+!ENDIF
+
+# Read the PROCESSOR_ARCHITECTURE environment value for a CPU type
+
+!IF "$(BUILD_CPU)" == "i386" || "$(BUILD_CPU)" == "x86" || "$(BUILD_CPU)" == "i686"
+CPU=X86
+!ENDIF
+!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)" == "x64"
+CPU=X64
+!ENDIF
+!IF "$(BUILD_CPU)" == "ia64" || "$(BUILD_CPU)" == "i64"
+CPU=I64
+!ENDIF
+
+!IF !DEFINED(CPU) || "$(CPU)" == ""
+!IF "$(PROCESSOR_ARCHITECTURE)" == ""
+!IF "$(PROCESSOR_ARCHITEW6432)" == ""
+CPU=X86
+!ELSE
+CPU=$(PROCESSOR_ARCHITEW6432)
+!ENDIF
+!ELSE
+CPU=$(PROCESSOR_ARCHITECTURE)
+!ENDIF
+!ENDIF
+
+
+!IF "$(CPU)" == "I386"
+CPU=X86
+!ENDIF
+!IF "$(CPU)" == "AMD64"
+CPU=X64
+!ENDIF
+!IF "$(CPU)" == "IA64"
+CPU=I64
+!ENDIF
+
+!IF "$(CPU)" != "X86"
+!IF "$(CPU)" != "X64"
+!IF "$(CPU)" != "I64"
+!ERROR Must specify CPU environment variable (X86, X64, I64) $(CPU)
+!ENDIF
+!ENDIF
+!ENDIF
+
+!IF !DEFINED(TARGET) || "$(TARGET)" == ""
+TARGET=EXE
+!ENDIF
+
+!IF "$(TARGET)" != "EXE"
+!IF "$(TARGET)" != "GUI"
+!IF "$(TARGET)" != "DLL"
+!IF "$(TARGET)" != "LIB"
+!ERROR Must specify TARGET environment variable (EXE, GUI, DLL, LIB)
+!ENDIF
+!ENDIF
+!ENDIF
+!ENDIF
+
+!IF !DEFINED(WINVER) || "$(WINVER)" == ""
+WINVER=WINXP
+!ENDIF
+
+
+!IF "$(WINVER)" != "WINNT"
+!IF "$(WINVER)" != "WINXP"
+!IF "$(WINVER)" != "WIN2003"
+!IF "$(WINVER)" != "NT4"
+!IF "$(WINVER)" != "WIN9X"
+!IF "$(WINVER)" != "WVSITA"
+!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, VSITA, NT4, WIN9X)
+!ENDIF
+!ENDIF
+!ENDIF
+!ENDIF
+!ENDIF
+!ENDIF
+
+!IF "$(WINVER)" == "WINNT"
+NMAKE_WINVER = 0x0500
+_WIN32_IE = 0x0500
+!ELSEIF "$(WINVER)" == "WINXP"
+NMAKE_WINVER = 0x0501
+_WIN32_IE = 0x0600
+!ELSEIF "$(WINVER)" == "WIN2003"
+NMAKE_WINVER = 0x0502
+_WIN32_IE = 0x0600
+!ELSEIF "$(WINVER)" == "VSITA"
+NMAKE_WINVER = 0x0600
+_WIN32_IE = 0x0700
+!ELSEIF "$(WINVER)" == "NT4"
+NMAKE_WINVER = 0x0400
+_WIN32_IE = 0x0400
+!ELSE
+!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, VSITA, NT4, WIN9X)
+!ENDIF
+
+!IF !DEFINED(NMAKE_WINVER) || "$(NMAKE_WINVER)" == ""
+NMAKE_WINVER = 0x0400
+_WIN32_IE = 0x0400
+NMAKE_WINNT = -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE)
+!ELSE
+NMAKE_WINNT = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE)
+!ENDIF
+
+!IF !DEFINED(BUILD) || "$(BUILD)" == ""
+BUILD=RELEASE
+!ENDIF
+
+!IFDEF RELEASE
+BUILD=RELEASE
+!ENDIF
+
+!IFDEF DEBUG
+BUILD=DEBUG
+!ENDIF
+
+!IFDEF NODEBUG
+BUILD=RELEASE
+!ENDIF
+
+!IF "$(BUILD)" != "RELEASE"
+!IF "$(BUILD)" != "DEBUG"
+!ERROR Must specify BUILD environment variable (RELEASE, DEBUG)
+!ENDIF
+!ENDIF
+
+# Common flags for all platforms
+CMN_CFLAGS = -c -nologo -DWIN32 -D_WIN32 -D_WINDOWS $(NMAKE_WINNT) -W3
+!IF "$(TARGET)" == "EXE"
+CMN_CFLAGS = $(CMN_CFLAGS) -D_CONSOLE
+!ENDIF
+
+!IF "$(CPU)" == "X86"
+CPU_CFLAGS = -D_X86_=1
+MACHINE=X86
+!ELSEIF "$(CPU)" == "X64"
+CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64
+MACHINE=AMD64
+!ELSEIF "$(CPU)" == "I64"
+CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64
+MACHINE=IA64
+!ENDIF
+
+!IF "$(INCLUDE_PRE64PRA)" == "1"
+!IF "$(CPU)" != "X86"
+CPU_CFLAGS = $(CPU_CFLAGS) /FIPRE64PRA.H
+!ENDIF
+!ENDIF
+
+!IF "$(BUILD)" == "RELEASE"
+!IF "$(CPU)" == "X86"
+OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG
+!ELSE
+OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG
+!ENDIF
+!ELSE
+OPT_CFLAGS = -Od -Zi -DDEBUG -D_DEBUG
+!ENDIF
+
+!IF DEFINED(STATIC_CRT)
+CRT_CFLAGS = -D_MT -MT
+!ELSE
+CRT_CFLAGS = -D_MT -MD
+!ENDIF
+
+!IF "$(BUILD)" == "DEBUG"
+CRT_CFLAGS = $(CRT_CFLAGS)d
+!ENDIF
+
+CFLAGS = $(CMN_CFLAGS) $(CPU_CFLAGS) $(OPT_CFLAGS) $(CRT_CFLAGS) $(CFLAGS)
+
+!IF DEFINED(EXTRA_CFLAGS)
+CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS)
+!ENDIF
+
+
+# Linker section
+LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib $(LIBS)
+!IF "$(INCLUDE_BUFFEROVERFLOWU)" == "1"
+!IF "$(CPU)" != "X86"
+LIBS = $(LIBS) bufferoverflowu.lib
+!ENDIF
+!ENDIF
+
+!IF DEFINED(EXTRA_LIBS)
+LIBS = $(LIBS) $(EXTRA_LIBS)
+!ENDIF
+
+COMMON_LFLAGS = /NOLOGO
+
+# Always add debugging to the linker
+OPT_LFLAGS = /INCREMENTAL:NO /DEBUG
+!IF "$(BUILD)" == "RELEASE"
+OPT_LFLAGS = /OPT:REF
+!ENDIF
+
+!IF "$(TARGET)" == "EXE"
+LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(MACHINE)
+!ELSEIF "$(TARGET)" == "GUI"
+LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE)
+!ELSEIF "$(TARGET)" == "DLL"
+LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(MACHINE)
+!ELSEIF "$(TARGET)" == "LIB"
+LFLAGS = -lib $(COMMON_LFLAGS)
+!ENDIF
+
+!IF DEFINED(EXTRA_LFLAGS)
+LFLAGS = $(LFLAGS) $(EXTRA_LFLAGS)
+!ENDIF
+
+!IF "$(TARGET)" != "LIB"
+LFLAGS = $(LFLAGS) $(OPT_LFLAGS)
+!ENDIF
+
+# Resource compiler flags
+
+BASE_RCFLAGS=/l 0x409
+!IF "$(BUILD)" == "RELEASE"
+BASE_RCFLAGS = $(BASE_RCFLAGS) /d "NDEBUG"
+!ELSE
+BASE_RCFLAGS = $(BASE_RCFLAGS) /d "_DEBUG" /d "DEBUG"
+!ENDIF
+RCFLAGS = $(BASE_RCFLAGS) $(RCFLAGS)
+
+# Build Target dir e.g. WINNT_I386_RELEASE_DLL
+!IF !DEFINED(WORKDIR) || "$(WORKDIR)" == ""
+!IF !DEFINED(WORKDIR_EXT) || "$(WORKDIR_EXT)" == ""
+WORKDIR = $(WINVER)_$(CPU)_$(TARGET)_$(BUILD)
+WORKDIR_DLL = $(WINVER)_$(CPU)_DLL_$(BUILD)
+WORKDIR_LIB = $(WINVER)_$(CPU)_LIB_$(BUILD)
+WORKDIR_EXE = $(WINVER)_$(CPU)_EXE_$(BUILD)
+!ELSE
+WORKDIR = $(WINVER)_$(CPU)_$(BUILDIR_EXT)_$(BUILD)
+!ENDIF
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+CLEANTARGET=if exist "$(WORKDIR)\$(NULL)" rd /s /q $(WORKDIR)
+!ELSE
+CLEANTARGET=deltree /y $(BUILDIR)
+!ENDIF
+
+MAKEWORKDIR=if not exist "$(WORKDIR)\$(NULL)" mkdir $(WORKDIR)
+MAKEINSTALL=if not exist "$(INSTALLLOC)" mkdir $(INSTALLLOC)
+
+!IF DEFINED(JAVA_HOME) && "$(JAVA_HOME)" != ""
+JAVA_INCLUDES=-I "$(JAVA_HOME)\include"
+!IF "$(CPU)" != "X86"
+JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)\include\win64"
+!ENDIF
+JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)\include\win32"
+!ENDIF
+
+!IF !DEFINED(ML) || "$(ML)" == ""
+!IF "$(CPU)" == "X86"
+ML = ml.exe
+AFLAGS = /coff /Zi /c
+!ELSEIF "$(CPU)" == "X64"
+ML = ml64.exe
+AFLAGS = /Zi /c
+!ELSEIF "$(CPU)" == "I64"
+ML = ml64.exe
+AFLAGS = /coff /Zi /c
+!ENDIF
+!ENDIF
15 years, 3 months
JBoss Native SVN: r2554 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-08-20 11:34:44 -0400 (Thu, 20 Aug 2009)
New Revision: 2554
Modified:
trunk/build/unix/build.sh
Log:
Oops versionstring is for things like apr-1.2.3....
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-08-20 15:28:28 UTC (rev 2553)
+++ trunk/build/unix/build.sh 2009-08-20 15:34:44 UTC (rev 2554)
@@ -471,9 +471,9 @@
versionstring=$3
file=$4
destdir=$5
- versionstring=`echo $versionstring | sed 's:\.: :g'`
- verpart1=`echo $versionstring | awk '{ print $1 }'`
- verpart2=`echo $versionstring | awk '{ print $2 }'`
+ verpart=`echo $versionstring | sed 's:\.: :g'`
+ verpart1=`echo $verpart | awk '{ print $1 }'`
+ verpart2=`echo $verpart | awk '{ print $2 }'`
srcfile=""
if [ -f ${basedir}/${prod}/${file} ]; then
15 years, 3 months
JBoss Native SVN: r2553 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-08-20 11:28:28 -0400 (Thu, 20 Aug 2009)
New Revision: 2553
Modified:
trunk/build/unix/build.sh
Log:
another typo :-(
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-08-20 15:15:50 UTC (rev 2552)
+++ trunk/build/unix/build.sh 2009-08-20 15:28:28 UTC (rev 2553)
@@ -468,7 +468,7 @@
{
basedir=$1
prod=$2
- versionstring=$4
+ versionstring=$3
file=$4
destdir=$5
versionstring=`echo $versionstring | sed 's:\.: :g'`
15 years, 3 months
JBoss Native SVN: r2552 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-08-20 11:15:50 -0400 (Thu, 20 Aug 2009)
New Revision: 2552
Modified:
trunk/build/unix/build.sh
Log:
typo :-(
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-08-20 14:57:51 UTC (rev 2551)
+++ trunk/build/unix/build.sh 2009-08-20 15:15:50 UTC (rev 2552)
@@ -488,7 +488,7 @@
if [ -f ${basedir}/${prod}/${prod}-${versionstring}/${file} ]; then
srcfile=${basedir}/${prod}/${prod}-${versionstring}/${file}
fi
- if [ "${srcfile}x" != "x"]; then
+ if [ "${srcfile}x" != "x" ]; then
echo "copying $srcfile $destdir"
cp $srcfile $destdir
fi
15 years, 3 months
JBoss Native SVN: r2551 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-08-20 10:57:51 -0400 (Thu, 20 Aug 2009)
New Revision: 2551
Modified:
trunk/build/unix/build.sh
Log:
Add logic to process srclib like RHATews.
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2009-08-20 14:56:54 UTC (rev 2550)
+++ trunk/build/unix/build.sh 2009-08-20 14:57:51 UTC (rev 2551)
@@ -458,6 +458,42 @@
package_output_dir=${build_working_dir}/${package_src_name}/output/${BUILD_TAG}
fi
+# Copy files according a rule like Override
+# $1: source dir
+# $2: source file
+# $3: dest dir
+# $4: version (something like 1.2.3)
+# overridecp $build_top/../../srclib/ ${name_prod} ${version_prod} NMAKEmakefile $src_dir
+overridecp()
+{
+ basedir=$1
+ prod=$2
+ versionstring=$4
+ file=$4
+ destdir=$5
+ versionstring=`echo $versionstring | sed 's:\.: :g'`
+ verpart1=`echo $versionstring | awk '{ print $1 }'`
+ verpart2=`echo $versionstring | awk '{ print $2 }'`
+
+ srcfile=""
+ if [ -f ${basedir}/${prod}/${file} ]; then
+ srcfile=${basedir}/${prod}/${file}
+ fi
+ if [ -f ${basedir}/${prod}/${prod}-${verpart1}/${file} ]; then
+ srcfile=${basedir}/${prod}/${prod}-${verpart1}/${file}
+ fi
+ if [ -f ${basedir}/${prod}/${prod}-${verpart1}.${verpart2}/${file} ]; then
+ srcfile=${basedir}/${prod}/${prod}-${verpart1}.${verpart2}/${file}
+ fi
+ if [ -f ${basedir}/${prod}/${prod}-${versionstring}/${file} ]; then
+ srcfile=${basedir}/${prod}/${prod}-${versionstring}/${file}
+ fi
+ if [ "${srcfile}x" != "x"]; then
+ echo "copying $srcfile $destdir"
+ cp $srcfile $destdir
+ fi
+}
+
# Override a shell command
# # $1=script $2..n
override()
@@ -1066,10 +1102,7 @@
cd $build_cache_dir
if [ ! -d ${src_dir} ]; then
downloadtaredsrc $src_url $src_url_back
- if [ -f $build_top/../../srclib/${name_prod}/NMAKEmakefile ]; then
- echo "copying $build_top/../../srclib/${name_prod}/NMAKEmakefile to $package_src_dir/srclib/${name_prod}-${version_prod}/"
- cp $build_top/../../srclib/${name_prod}/NMAKEmakefile $src_dir
- fi
+ overridecp $build_top/../../srclib/ ${name_prod} ${version_prod} NMAKEmakefile $src_dir
applypatch $src_dir false
fi
cp -rp ${src_dir} ${package_src_dir}/srclib
15 years, 3 months
JBoss Native SVN: r2550 - in trunk/srclib/apr: apr-1.3 and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-08-20 10:56:54 -0400 (Thu, 20 Aug 2009)
New Revision: 2550
Added:
trunk/srclib/apr/apr-1.3/
trunk/srclib/apr/apr-1.3/NMAKEmakefile
Log:
Add apr-1.3.x NMAKEmakefile.
Added: trunk/srclib/apr/apr-1.3/NMAKEmakefile
===================================================================
--- trunk/srclib/apr/apr-1.3/NMAKEmakefile (rev 0)
+++ trunk/srclib/apr/apr-1.3/NMAKEmakefile 2009-08-20 14:56:54 UTC (rev 2550)
@@ -0,0 +1,226 @@
+# 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)\apr_app.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
15 years, 3 months
JBoss Native SVN: r2549 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-08-20 08:35:53 -0400 (Thu, 20 Aug 2009)
New Revision: 2549
Modified:
trunk/build/unix/package.list
Log:
Back building trunk...
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2009-08-20 08:30:06 UTC (rev 2548)
+++ trunk/build/unix/package.list 2009-08-20 12:35:53 UTC (rev 2549)
@@ -31,6 +31,6 @@
mod_cluster|1.0.0.CR2|2.2.11|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:mod_cluster/1.0.0.CR2
mod_cluster|1.0.0.GA|2.2.11|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:mod_cluster/1.0.0.GA
mod_cluster|1.0.1.GA|2.2.11|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:mod_cluster/1.0.1.GA
-mod_cluster|1.1.0.dev|2.2.13|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
mod_cluster|1.0.2.dev|2.2.13|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:branches/1.0.x
mod_cluster|1.0.2.GA|2.2.13|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.0.2.GA
+mod_cluster|1.1.0.dev|2.2.13|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
15 years, 3 months
JBoss Native SVN: r2548 - trunk/build/patch.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-08-20 04:30:06 -0400 (Thu, 20 Aug 2009)
New Revision: 2548
Added:
trunk/build/patch/httpd-2.2.13.patch
Log:
Otherwise tests fail on macosx:
+++
[exec] httpd: Syntax error on line 99 of /Users/hudson/java/Mac/OS/X-10.5.7-i386/opt/jboss/httpd/httpd/conf/httpd.conf: Cannot load /Users/hudson/java/Mac/OS/X-10.5.7-i386/opt/jboss/httpd/lib/httpd/modules/mod_ssl.so into server: dlopen(/Users/hudson/java/Mac/OS/X-10.5.7-i386/opt/jboss/httpd/lib/httpd/modules/mod_ssl.so, 10): Symbol not found: _ssl_cmd_SSLCACertificateFile\n Referenced from: /Users/hudson/java/Mac/OS/X-10.5.7-i386/opt/jboss/httpd/lib/httpd/modules/mod_ssl.so\n Expected in: flat namespace\n
[exec] Result: 1
+++
Added: trunk/build/patch/httpd-2.2.13.patch
===================================================================
--- trunk/build/patch/httpd-2.2.13.patch (rev 0)
+++ trunk/build/patch/httpd-2.2.13.patch 2009-08-20 08:30:06 UTC (rev 2548)
@@ -0,0 +1,17 @@
+--- modules/ssl/config.m4 (revision 793871)
++++ modules/ssl/config.m4 (working copy)
+@@ -120,7 +120,13 @@
+ if test "x$enable_ssl" = "xshared"; then
+ # The only symbol which needs to be exported is the module
+ # structure, so ask libtool to hide everything else:
+- APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
++ case $host in
++ *-apple-darwin*)
++ ;;
++ *)
++ APR_ADDTO(MOD_SSL_LDADD, [-export-symbols-regex ssl_module])
++ ;;
++ esac
+ fi
+ ])
+
15 years, 3 months
JBoss Native SVN: r2547 - trunk/build/unix.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2009-08-19 12:26:44 -0400 (Wed, 19 Aug 2009)
New Revision: 2547
Modified:
trunk/build/unix/package.list
Log:
Release mod_cluster-1.0.2.GA
Modified: trunk/build/unix/package.list
===================================================================
--- trunk/build/unix/package.list 2009-08-18 13:51:51 UTC (rev 2546)
+++ trunk/build/unix/package.list 2009-08-19 16:26:44 UTC (rev 2547)
@@ -33,3 +33,4 @@
mod_cluster|1.0.1.GA|2.2.11|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:mod_cluster/1.0.1.GA
mod_cluster|1.1.0.dev|2.2.13|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:trunk
mod_cluster|1.0.2.dev|2.2.13|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:branches/1.0.x
+mod_cluster|1.0.2.GA|2.2.13|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11|expat:v:1.95.8|cluster:t:1.0.2.GA
15 years, 3 months