Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4368 - in labs/jbossweb/trunk/src: share/native/build share/native/php5servlet share/native/srclib/apr share/native/srclib/openssl windows/native/service/jbosssvc
Author: mla...@jb... Date: 2006-05-23 03:39:38 -0400 (Tue, 23 May 2006) New Revision: 4368 Modified: labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc labs/jbossweb/trunk/src/share/native/build/buildprep.bat labs/jbossweb/trunk/src/share/native/build/buildsvc.bat labs/jbossweb/trunk/src/share/native/build/buildworld.bat labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.rc Log: Use svn:eol-style CRLF for windows-only resources Modified: labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc =================================================================== --- labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc 2006-05-23 07:33:59 UTC (rev 4367) +++ labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc 2006-05-23 07:39:38 UTC (rev 4368) @@ -1,264 +1,264 @@ -# Copyright 2001-2006 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: -# i386 -# AMD64 -# IA64 -# If not specified it will default to the -# PROCESSOR_ARCHITECTURE environment variable -# or to the i386 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 -# 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 -# -# 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 - -# Read the PROCESSOR_ARCHITECTURE environment value for a CPU type - -!IF !DEFINED(CPU) || "$(CPU)" == "" -!IF "$(PROCESSOR_ARCHITECTURE)" == "" -CPU=I386 -!ELSE -CPU = $(PROCESSOR_ARCHITECTURE) -!ENDIF -!ENDIF - -!IF "$(CPU)" == "i386" || "$(CPU)" == "x86" -CPU=I386 -!ENDIF - -!IF "$(CPU)" != "I386" -!IF "$(CPU)" != "AMD64" -!IF "$(CPU)" != "IA64" -!ERROR Must specify CPU environment variable (I386, AMD64, IA64) -!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=WINNT -!ENDIF - - -!IF "$(WINVER)" != "WINNT" -!IF "$(WINVER)" != "WINXP" -!IF "$(WINVER)" != "WIN2003" -!IF "$(WINVER)" != "NT4" -!IF "$(WINVER)" != "WIN9X" -!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, NT4, WIN9X) -!ENDIF -!ENDIF -!ENDIF -!ENDIF -!ENDIF - -!IF "$(WINVER)" == "WINNT" -NMAKE_WINVER = 0x0500 -!ELSEIF "$(WINVER)" == "WINXP" -NMAKE_WINVER = 0x0501 -!ELSEIF "$(WINVER)" == "WIN2003" -NMAKE_WINVER = 0x0502 -!ELSEIF "$(WINVER)" == "NT4" -NMAKE_WINVER = 0x0400 -!ENDIF - -!IF !DEFINED(NMAKE_WINVER) || "$(NMAKE_WINVER)" == "" -NMAKE_WINVER = 0x0400 -NMAKE_WINNT = -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER) -!ELSE -NMAKE_WINNT = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -!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) - -!IF "$(CPU)" == "I386" -CPU_CFLAGS = -D_X86_=1 -W3 -!ELSEIF "$(CPU)" == "AMD64" -CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 /FIPRE64PRA.H -!ELSEIF "$(CPU)" == "IA64" -CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 -Ap64 /FIPRE64PRA.H -!ENDIF - -!IF "$(BUILD)" == "RELEASE" -OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG -!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 "$(CPU)" == "AMD64" || "$(CPU)" == "IA64" -LIBS = $(LIBS) bufferoverflowu.lib -!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:$(CPU) -!ELSEIF "$(TARGET)" == "GUI" -LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) -!ELSEIF "$(TARGET)" == "DLL" -LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) -!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(BUILDIR) || "$(BUILDIR)" == "" -!IF !DEFINED(BUILDIR_EXT) || "$(BUILDIR_EXT)" == "" -BUILDIR = $(WINVER)_$(CPU)_$(TARGET)_$(BUILD) -!ELSE -BUILDIR = $(WINVER)_$(CPU)_$(BUILDIR_EXT)_$(BUILD) -!ENDIF -!ENDIF - -!IF "$(OS)" == "Windows_NT" -CLEANTARGET=if exist "$(BUILDIR)/$(NULL)" rd /s /q $(BUILDIR) -!ELSE -CLEANTARGET=deltree /y $(BUILDIR) -!ENDIF - -MAKETARGET=if not exist "$(BUILDIR)/$(NULL)" mkdir $(BUILDIR) - -!IF DEFINED(JAVA_HOME) && "$(JAVA_HOME)" != "" -JAVA_INCLUDES=-I "$(JAVA_HOME)/include" -!IF "$(CPU)" != "I386" -JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)/include/win64" -!ENDIF -JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)/include/win32" -!ENDIF +# Copyright 2001-2006 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: +# i386 +# AMD64 +# IA64 +# If not specified it will default to the +# PROCESSOR_ARCHITECTURE environment variable +# or to the i386 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 +# 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 +# +# 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 + +# Read the PROCESSOR_ARCHITECTURE environment value for a CPU type + +!IF !DEFINED(CPU) || "$(CPU)" == "" +!IF "$(PROCESSOR_ARCHITECTURE)" == "" +CPU=I386 +!ELSE +CPU = $(PROCESSOR_ARCHITECTURE) +!ENDIF +!ENDIF + +!IF "$(CPU)" == "i386" || "$(CPU)" == "x86" +CPU=I386 +!ENDIF + +!IF "$(CPU)" != "I386" +!IF "$(CPU)" != "AMD64" +!IF "$(CPU)" != "IA64" +!ERROR Must specify CPU environment variable (I386, AMD64, IA64) +!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=WINNT +!ENDIF + + +!IF "$(WINVER)" != "WINNT" +!IF "$(WINVER)" != "WINXP" +!IF "$(WINVER)" != "WIN2003" +!IF "$(WINVER)" != "NT4" +!IF "$(WINVER)" != "WIN9X" +!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, NT4, WIN9X) +!ENDIF +!ENDIF +!ENDIF +!ENDIF +!ENDIF + +!IF "$(WINVER)" == "WINNT" +NMAKE_WINVER = 0x0500 +!ELSEIF "$(WINVER)" == "WINXP" +NMAKE_WINVER = 0x0501 +!ELSEIF "$(WINVER)" == "WIN2003" +NMAKE_WINVER = 0x0502 +!ELSEIF "$(WINVER)" == "NT4" +NMAKE_WINVER = 0x0400 +!ENDIF + +!IF !DEFINED(NMAKE_WINVER) || "$(NMAKE_WINVER)" == "" +NMAKE_WINVER = 0x0400 +NMAKE_WINNT = -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER) +!ELSE +NMAKE_WINNT = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) +!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) + +!IF "$(CPU)" == "I386" +CPU_CFLAGS = -D_X86_=1 -W3 +!ELSEIF "$(CPU)" == "AMD64" +CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 /FIPRE64PRA.H +!ELSEIF "$(CPU)" == "IA64" +CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 -Ap64 /FIPRE64PRA.H +!ENDIF + +!IF "$(BUILD)" == "RELEASE" +OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG +!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 "$(CPU)" == "AMD64" || "$(CPU)" == "IA64" +LIBS = $(LIBS) bufferoverflowu.lib +!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:$(CPU) +!ELSEIF "$(TARGET)" == "GUI" +LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +!ELSEIF "$(TARGET)" == "DLL" +LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(CPU) +!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(BUILDIR) || "$(BUILDIR)" == "" +!IF !DEFINED(BUILDIR_EXT) || "$(BUILDIR_EXT)" == "" +BUILDIR = $(WINVER)_$(CPU)_$(TARGET)_$(BUILD) +!ELSE +BUILDIR = $(WINVER)_$(CPU)_$(BUILDIR_EXT)_$(BUILD) +!ENDIF +!ENDIF + +!IF "$(OS)" == "Windows_NT" +CLEANTARGET=if exist "$(BUILDIR)/$(NULL)" rd /s /q $(BUILDIR) +!ELSE +CLEANTARGET=deltree /y $(BUILDIR) +!ENDIF + +MAKETARGET=if not exist "$(BUILDIR)/$(NULL)" mkdir $(BUILDIR) + +!IF DEFINED(JAVA_HOME) && "$(JAVA_HOME)" != "" +JAVA_INCLUDES=-I "$(JAVA_HOME)/include" +!IF "$(CPU)" != "I386" +JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)/include/win64" +!ENDIF +JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)/include/win32" +!ENDIF Property changes on: labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc ___________________________________________________________________ Name: svn:eol-style - native + CRLF Modified: labs/jbossweb/trunk/src/share/native/build/buildprep.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/build/buildprep.bat 2006-05-23 07:33:59 UTC (rev 4367) +++ labs/jbossweb/trunk/src/share/native/build/buildprep.bat 2006-05-23 07:39:38 UTC (rev 4368) @@ -1,60 +1,60 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM -REM -REM -@if "%OS%" == "Windows_NT" setlocal -set NATIVETAG=HEAD - -REM Replace NATIVEEXT with tagged version number, like 1.1.0 -set NATIVEEXT=current - -REM Use tag or trunk -REM NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/trunk -set NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_3 - -set NATIVEDIST=tomcat-native-%NATIVEEXT% -@rmdir /S /Q %NATIVEDIST% 2>NUL -svn export -r %NATIVETAG% %NATIVESVN%/jni/native %NATIVEDIST% - -set APRVER=1.2.7 -set SSLVER=0.9.8b - -REM Prebuild -cd %NATIVEDIST% -mkdir srclib -cd srclib - -REM Download APR -wget http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-%APRVER%-win32-src.zip -unzip -qo apr-%APRVER%-win32-src.zip -@del /Q apr-%APRVER%-win32-src.zip - -REM Download OpenSSL -wget http://www.openssl.org/source/openssl-%SSLVER%.tar.gz -tar zxf openssl-%SSLVER%.tar.gz 2>NUL -@del /Q openssl-%SSLVER%.tar.gz -cd .. -cd .. - -cp ./buildworld.bat %NATIVEDIST%/ -cp ./buildsvc.bat %NATIVEDIST%/ -cp ./NMAKEcommon.inc %NATIVEDIST%/build/ -cp ../NMAKEmakefile %NATIVEDIST%/ -cp ../srclib/apr/NMAKEmakefile %NATIVEDIST%/srclib/apr-%APRVER%/ -cp ../srclib/openssl/*.bat %NATIVEDIST%/srclib/openssl-%SSLVER%/ - -REM zip -9rqo ../../%NATIVEDIST%.zip %NATIVEDIST% -REM tar cfz ../../%NATIVEDIST%.tar.gz %NATIVEDIST% - -REM @rmdir /S /Q %NATIVEDIST% -REM Instead packing move the prepared sources. -@rmdir /S /Q ..\..\%NATIVEDIST% 2>NUL -@mv %NATIVEDIST% ../../ +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM +REM +REM +@if "%OS%" == "Windows_NT" setlocal +set NATIVETAG=HEAD + +REM Replace NATIVEEXT with tagged version number, like 1.1.0 +set NATIVEEXT=current + +REM Use tag or trunk +REM NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/trunk +set NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_3 + +set NATIVEDIST=tomcat-native-%NATIVEEXT% +@rmdir /S /Q %NATIVEDIST% 2>NUL +svn export -r %NATIVETAG% %NATIVESVN%/jni/native %NATIVEDIST% + +set APRVER=1.2.7 +set SSLVER=0.9.8b + +REM Prebuild +cd %NATIVEDIST% +mkdir srclib +cd srclib + +REM Download APR +wget http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-%APRVER%-win32-src.zip +unzip -qo apr-%APRVER%-win32-src.zip +@del /Q apr-%APRVER%-win32-src.zip + +REM Download OpenSSL +wget http://www.openssl.org/source/openssl-%SSLVER%.tar.gz +tar zxf openssl-%SSLVER%.tar.gz 2>NUL +@del /Q openssl-%SSLVER%.tar.gz +cd .. +cd .. + +cp ./buildworld.bat %NATIVEDIST%/ +cp ./buildsvc.bat %NATIVEDIST%/ +cp ./NMAKEcommon.inc %NATIVEDIST%/build/ +cp ../NMAKEmakefile %NATIVEDIST%/ +cp ../srclib/apr/NMAKEmakefile %NATIVEDIST%/srclib/apr-%APRVER%/ +cp ../srclib/openssl/*.bat %NATIVEDIST%/srclib/openssl-%SSLVER%/ + +REM zip -9rqo ../../%NATIVEDIST%.zip %NATIVEDIST% +REM tar cfz ../../%NATIVEDIST%.tar.gz %NATIVEDIST% + +REM @rmdir /S /Q %NATIVEDIST% +REM Instead packing move the prepared sources. +@rmdir /S /Q ..\..\%NATIVEDIST% 2>NUL +@mv %NATIVEDIST% ../../ Property changes on: labs/jbossweb/trunk/src/share/native/build/buildprep.bat ___________________________________________________________________ Name: svn:eol-style - native + CRLF Modified: labs/jbossweb/trunk/src/share/native/build/buildsvc.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/build/buildsvc.bat 2006-05-23 07:33:59 UTC (rev 4367) +++ labs/jbossweb/trunk/src/share/native/build/buildsvc.bat 2006-05-23 07:39:38 UTC (rev 4368) @@ -1,46 +1,46 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM -REM -REM -@if "%OS%" == "Windows_NT" setlocal -set MSVS8VC=C:\opt\MSVS8\VC\bin -REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin - - -@if not "%1" == "d" goto checkCPU -@shift -@rmdir /S /Q jbosssvc 2>NUL -svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/windows/native/service/jbosssvc -svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/share/native/build jbosssvc/build - -:checkCPU -@if /i "%1" == "x86" goto cpuX86 -@if /i "%1" == "amd64" goto cpuAMD64 -@if /i "%1" == "ia64" goto cpuIA64 -echo Usage: buildsvc <CPU> -goto cmdEnd - -:cpuX86 -set CPU=I386 -call %MSVS8VC%\vcvars32 -goto cmdBuild - -:cpuAMD64 -set CPU=AMD64 -call %MSVS8VC%\amd64\vcvarsamd64 -goto cmdBuild - -:cmdBuild -cd jbosssvc -nmake -f NMAKEMakefile -nmake -f NMAKEMakefile install - -:cmdEnd +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM +REM +REM +@if "%OS%" == "Windows_NT" setlocal +set MSVS8VC=C:\opt\MSVS8\VC\bin +REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin + + +@if not "%1" == "d" goto checkCPU +@shift +@rmdir /S /Q jbosssvc 2>NUL +svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/windows/native/service/jbosssvc +svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/share/native/build jbosssvc/build + +:checkCPU +@if /i "%1" == "x86" goto cpuX86 +@if /i "%1" == "amd64" goto cpuAMD64 +@if /i "%1" == "ia64" goto cpuIA64 +echo Usage: buildsvc <CPU> +goto cmdEnd + +:cpuX86 +set CPU=I386 +call %MSVS8VC%\vcvars32 +goto cmdBuild + +:cpuAMD64 +set CPU=AMD64 +call %MSVS8VC%\amd64\vcvarsamd64 +goto cmdBuild + +:cmdBuild +cd jbosssvc +nmake -f NMAKEMakefile +nmake -f NMAKEMakefile install + +:cmdEnd Property changes on: labs/jbossweb/trunk/src/share/native/build/buildsvc.bat ___________________________________________________________________ Name: svn:eol-style - native + CRLF Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/build/buildworld.bat 2006-05-23 07:33:59 UTC (rev 4367) +++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat 2006-05-23 07:39:38 UTC (rev 4368) @@ -1,83 +1,83 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM -REM -REM -@if "%OS%" == "Windows_NT" setlocal -set MSVS8VC=C:\opt\msvs8\VC\bin -REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin -set PSDK5=C:\opt\psdk6 -REM PSDK5=C:\D\PSDK6 - -set OPENSSLBIN=buildssl -set OPENSSLVER=0.9.8b -set APRVER=1.2.7 -set FLAVOR=DLL - -@if not "%1" == "sdk" goto checkFLAVOR -shift -set usesdk=1 - -:checkFLAVOR -@if /i "%1" == "dll" goto makeDLL -set FLAVOR=STATIC -goto checkCPU -:makeDLL -set FLAVOR=DLL - -:checkCPU -@if /i "%2" == "x86" goto cpuX86 -@if /i "%2" == "amd64" goto cpuAMD64 -@if /i "%2" == "ia64" goto cpuIA64 -echo Usage: buildworld <CPU> -goto cmdEnd - -:cpuX86 -set CPU=I386 -set OPENSSLBIN=buildsslasm %1 -@if "%usesdk%" == "1" ( - call %PSDK5%\SetEnv /XP32 /RETAIL -) else ( - call %MSVS8VC%\vcvars32 -) -goto cmdBuild - -:cpuAMD64 -set CPU=AMD64 -set OPENSSLBIN=buildsslamd64 %1 -@if "%usesdk%" == "1" ( - call %PSDK5%\SetEnv /X64 /RETAIL -) else ( - call %MSVS8VC%\amd64\vcvarsamd64 -) -goto cmdBuild - -:cpuIA64 -set CPU=IA64 -set OPENSSLBIN=buildsslia64 %1 -@if "%usesdk%" == "1" ( - call %PSDK5%\SetEnv /SRV64 /RETAIL -) else ( - call %MSVS8VC%\amd64\vcvarsamd64 -) -goto cmdBuild - -:cmdBuild -cd srclib/openssl-%OPENSSLVER% -call %OPENSSLBIN% %1 -cd .. -cd apr-%APRVER% -nmake -f NMAKEMakefile %FLAVOR%=1 -cd .. -cd .. -nmake -f NMAKEMakefile %FLAVOR%=1 -nmake -f NMAKEMakefile %FLAVOR%=1 install - -:cmdEnd +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM +REM +REM +@if "%OS%" == "Windows_NT" setlocal +set MSVS8VC=C:\opt\msvs8\VC\bin +REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin +set PSDK5=C:\opt\psdk6 +REM PSDK5=C:\D\PSDK6 + +set OPENSSLBIN=buildssl +set OPENSSLVER=0.9.8b +set APRVER=1.2.7 +set FLAVOR=DLL + +@if not "%1" == "sdk" goto checkFLAVOR +shift +set usesdk=1 + +:checkFLAVOR +@if /i "%1" == "dll" goto makeDLL +set FLAVOR=STATIC +goto checkCPU +:makeDLL +set FLAVOR=DLL + +:checkCPU +@if /i "%2" == "x86" goto cpuX86 +@if /i "%2" == "amd64" goto cpuAMD64 +@if /i "%2" == "ia64" goto cpuIA64 +echo Usage: buildworld <CPU> +goto cmdEnd + +:cpuX86 +set CPU=I386 +set OPENSSLBIN=buildsslasm %1 +@if "%usesdk%" == "1" ( + call %PSDK5%\SetEnv /XP32 /RETAIL +) else ( + call %MSVS8VC%\vcvars32 +) +goto cmdBuild + +:cpuAMD64 +set CPU=AMD64 +set OPENSSLBIN=buildsslamd64 %1 +@if "%usesdk%" == "1" ( + call %PSDK5%\SetEnv /X64 /RETAIL +) else ( + call %MSVS8VC%\amd64\vcvarsamd64 +) +goto cmdBuild + +:cpuIA64 +set CPU=IA64 +set OPENSSLBIN=buildsslia64 %1 +@if "%usesdk%" == "1" ( + call %PSDK5%\SetEnv /SRV64 /RETAIL +) else ( + call %MSVS8VC%\amd64\vcvarsamd64 +) +goto cmdBuild + +:cmdBuild +cd srclib/openssl-%OPENSSLVER% +call %OPENSSLBIN% %1 +cd .. +cd apr-%APRVER% +nmake -f NMAKEMakefile %FLAVOR%=1 +cd .. +cd .. +nmake -f NMAKEMakefile %FLAVOR%=1 +nmake -f NMAKEMakefile %FLAVOR%=1 install + +:cmdEnd Property changes on: labs/jbossweb/trunk/src/share/native/build/buildworld.bat ___________________________________________________________________ Name: svn:eol-style - native + CRLF Modified: labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile =================================================================== --- labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile 2006-05-23 07:33:59 UTC (rev 4367) +++ labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile 2006-05-23 07:39:38 UTC (rev 4368) @@ -1,87 +1,87 @@ -# Copyright 2001-2006 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 PHP5 Servlet SAPI makefile. -# Usage: -# DEBUG=1 Build DEBUG version of TCN -# -# Originally contributed by Mladen Turk <mturk jboss.com> -# -# ==================================================================== -# - -TARGET = DLL -BUILDIR_EXT = DLL -PROJECT = php5servlet -PHP5_LIB = php5ts.lib - -!include <../build/NMAKEcommon.inc> - -CFLAGS = $(CFLAGS) -DPHP5SERVLET_EXPORTS -DZTS -DZEND_WIN32 -DPHP_WIN32 - -!IFDEF DEBUG -CFLAGS = $(CFLAGS) -DZEND_DEBUG=1 -!ELSE -CFLAGS = $(CFLAGS) -DZEND_DEBUG=0 -!ENDIF - -!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" -SRCDIR = . -!ENDIF - -INCLUDES = -I$(SRCDIR)/include $(JAVA_INCLUDES) - -!IFNDEF WITH_PHP5 -WITH_PHP5 = ../srclib/php -!ENDIF - -INCLUDES = $(INCLUDES) -I$(WITH_PHP5)/include/php -I$(WITH_PHP5)/include/php/win32 \ - -I$(WITH_PHP5)/include/php/Zend -I$(WITH_PHP5)/include/php/main -I$(WITH_PHP5)/include/php/TSRM - -LDIRS = /libpath:"$(WITH_PHP5)/dev" -LFLAGS = $(LFLAGS) $(PHP5_LIB) -LFLAGS = $(LFLAGS) user32.lib - -PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src -OBJECTS = \ - $(BUILDIR)\php5servlet.obj - -BUILDLIB = $(BUILDIR)\$(PROJECT).dll -BUILDPDB = $(BUILDIR)\$(PROJECT).pdb -BUILDRES = $(BUILDIR)\$(PROJECT).res -BUILDMAN = $(BUILDLIB).manifest - -all : $(BUILDIR) $(BUILDLIB) - -$(BUILDIR) : - @$(MAKETARGET) - -{$(SRCDIR)}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -$(OBJECTS): $(SRCDIR)/*.c - -$(BUILDRES): $(SRCDIR)/php5servlet.rc - $(RC) $(RCFLAGS) /fo $(BUILDRES) $(SRCDIR)/php5servlet.rc - -$(BUILDLIB): $(BUILDIR) $(OBJECTS) $(BUILDRES) - $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDLIB) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2 - -clean: - @$(CLEANTARGET) +# Copyright 2001-2006 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 PHP5 Servlet SAPI makefile. +# Usage: +# DEBUG=1 Build DEBUG version of TCN +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + +TARGET = DLL +BUILDIR_EXT = DLL +PROJECT = php5servlet +PHP5_LIB = php5ts.lib + +!include <../build/NMAKEcommon.inc> + +CFLAGS = $(CFLAGS) -DPHP5SERVLET_EXPORTS -DZTS -DZEND_WIN32 -DPHP_WIN32 + +!IFDEF DEBUG +CFLAGS = $(CFLAGS) -DZEND_DEBUG=1 +!ELSE +CFLAGS = $(CFLAGS) -DZEND_DEBUG=0 +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +INCLUDES = -I$(SRCDIR)/include $(JAVA_INCLUDES) + +!IFNDEF WITH_PHP5 +WITH_PHP5 = ../srclib/php +!ENDIF + +INCLUDES = $(INCLUDES) -I$(WITH_PHP5)/include/php -I$(WITH_PHP5)/include/php/win32 \ + -I$(WITH_PHP5)/include/php/Zend -I$(WITH_PHP5)/include/php/main -I$(WITH_PHP5)/include/php/TSRM + +LDIRS = /libpath:"$(WITH_PHP5)/dev" +LFLAGS = $(LFLAGS) $(PHP5_LIB) +LFLAGS = $(LFLAGS) user32.lib + +PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src +OBJECTS = \ + $(BUILDIR)\php5servlet.obj + +BUILDLIB = $(BUILDIR)\$(PROJECT).dll +BUILDPDB = $(BUILDIR)\$(PROJECT).pdb +BUILDRES = $(BUILDIR)\$(PROJECT).res +BUILDMAN = $(BUILDLIB).manifest + +all : $(BUILDIR) $(BUILDLIB) + +$(BUILDIR) : + @$(MAKETARGET) + +{$(SRCDIR)}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(OBJECTS): $(SRCDIR)/*.c + +$(BUILDRES): $(SRCDIR)/php5servlet.rc + $(RC) $(RCFLAGS) /fo $(BUILDRES) $(SRCDIR)/php5servlet.rc + +$(BUILDLIB): $(BUILDIR) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDLIB) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2 + +clean: + @$(CLEANTARGET) Property changes on: labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style - native + CRLF Modified: labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc =================================================================== --- labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc 2006-05-23 07:33:59 UTC (rev 4367) +++ labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc 2006-05-23 07:39:38 UTC (rev 4368) @@ -1,80 +1,80 @@ -/* - * JBoss, the OpenSource webOS - * - * Distributable under LGPL license. - * See terms of license at gnu.org. - */ - -#include <windows.h> - -#define PRODUCT_VER_STRING "1.0.1.0\0" - -#define STR_COPYRIGHT "Copyright 2006 JBoss inc. " \ - "or its licensors, as applicable." - -#define STR_LICENSE "Distributable under LGPL license. " \ - "See terms of license at gnu.org." - -#define STR_COMPANY "JBoss, Inc." -#define STR_TRADEMARK " JBoss Inc." -#define STR_PRODUCT "PHP5 Servlet SAPI" -#define STR_VERISON "1.0.1.0" -#define CSV_VERISON 1,0,1,0 - -#define PRIVATE_BUILD 0 -#define PRERELEASE_BUILD 0 - -#if PRIVATE_BUILD -#define STR_PRIVATE "Initial Prerelease" -#define STR_SPECIAL "Basic functionality" -#define STD_FILEFLAGS VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD -#else -#define STD_FILEFLAGS 0x0L -#endif - -#if RERELEASE_BUILD -#define PSTD_FILEFLAGS STD_FILEFLAGS | VS_FF_PRERELEASE -#else -#define PSTD_FILEFLAGS STD_FILEFLAGS -#endif - -#ifdef _DEBUG -#define APP_FILEFLAGS STD_FILEFLAGS | VS_FF_DEBUG -#else -#define APP_FILEFLAGS STD_FILEFLAGS -#endif - -1 VERSIONINFO - FILEVERSION CSV_VERISON - PRODUCTVERSION CSV_VERISON - FILEFLAGSMASK VS_FFI_FILEFLAGSMASK - FILEFLAGS APP_FILEFLAGS - FILEOS VOS_NT - FILETYPE VFT_DLL - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments", STR_LICENSE "\0" - VALUE "CompanyName", STR_COMPANY "\0" - VALUE "FileDescription", "PHP5 Servlet SAPI Module\0" - VALUE "FileVersion", STR_VERISON "\0" - VALUE "InternalName", "php5servlet" - VALUE "LegalCopyright", STR_COPYRIGHT "\0" - VALUE "LegalTrademarks", STR_TRADEMARK "\0" - VALUE "OriginalFilename", "php5servlet.dll" - VALUE "ProductName", STR_PRODUCT "\0" - VALUE "ProductVersion", STR_VERISON "\0" -#if PRIVATE_BUILD - VALUE "PrivateBuild", STR_PRIVATE "\0" - VALUE "SpecialBuild", STR_SPECIAL "\0" -#endif - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +/* + * JBoss, the OpenSource webOS + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ + +#include <windows.h> + +#define PRODUCT_VER_STRING "1.0.1.0\0" + +#define STR_COPYRIGHT "Copyright 2006 JBoss inc. " \ + "or its licensors, as applicable." + +#define STR_LICENSE "Distributable under LGPL license. " \ + "See terms of license at gnu.org." + +#define STR_COMPANY "JBoss, Inc." +#define STR_TRADEMARK " JBoss Inc." +#define STR_PRODUCT "PHP5 Servlet SAPI" +#define STR_VERISON "1.0.1.0" +#define CSV_VERISON 1,0,1,0 + +#define PRIVATE_BUILD 0 +#define PRERELEASE_BUILD 0 + +#if PRIVATE_BUILD +#define STR_PRIVATE "Initial Prerelease" +#define STR_SPECIAL "Basic functionality" +#define STD_FILEFLAGS VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD +#else +#define STD_FILEFLAGS 0x0L +#endif + +#if RERELEASE_BUILD +#define PSTD_FILEFLAGS STD_FILEFLAGS | VS_FF_PRERELEASE +#else +#define PSTD_FILEFLAGS STD_FILEFLAGS +#endif + +#ifdef _DEBUG +#define APP_FILEFLAGS STD_FILEFLAGS | VS_FF_DEBUG +#else +#define APP_FILEFLAGS STD_FILEFLAGS +#endif + +1 VERSIONINFO + FILEVERSION CSV_VERISON + PRODUCTVERSION CSV_VERISON + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS APP_FILEFLAGS + FILEOS VOS_NT + FILETYPE VFT_DLL + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", STR_LICENSE "\0" + VALUE "CompanyName", STR_COMPANY "\0" + VALUE "FileDescription", "PHP5 Servlet SAPI Module\0" + VALUE "FileVersion", STR_VERISON "\0" + VALUE "InternalName", "php5servlet" + VALUE "LegalCopyright", STR_COPYRIGHT "\0" + VALUE "LegalTrademarks", STR_TRADEMARK "\0" + VALUE "OriginalFilename", "php5servlet.dll" + VALUE "ProductName", STR_PRODUCT "\0" + VALUE "ProductVersion", STR_VERISON "\0" +#if PRIVATE_BUILD + VALUE "PrivateBuild", STR_PRIVATE "\0" + VALUE "SpecialBuild", STR_SPECIAL "\0" +#endif + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END Property changes on: labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc ___________________________________________________________________ Name: svn:eol-style - native + CRLF Modified: labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile =================================================================== --- labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile 2006-05-23 07:33:59 UTC (rev 4367) +++ labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile 2006-05-23 07:39:38 UTC (rev 4368) @@ -1,213 +1,213 @@ -# Copyright 2001-2006 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 jboss.com> -# -# ==================================================================== -# - -!IFDEF DLL -CFLAGS = -DAPR_DECLARE_EXPORT $(CFLAGS) -TARGET = DLL -PROJECT = libapr-1 -!ELSE -CFLAGS = -DAPR_DECLARE_STATIC $(CFLAGS) -TARGET = LIB -PROJECT = apr-1 -!ENDIF - -!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" -SRCDIR = . -!ENDIF - -!include <../../build/NMAKEcommon.inc> - -INCLUDES = -I$(SRCDIR)/include -I$(SRCDIR)/include/arch -I$(SRCDIR)/include/arch/win32 -I$(SRCDIR)/include/arch/unix -PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src -OBJECTS = \ - $(BUILDIR)\apr_atomic.obj \ - $(BUILDIR)\dso.obj \ - $(BUILDIR)\copy.obj \ - $(BUILDIR)\dir.obj \ - $(BUILDIR)\fileacc.obj \ - $(BUILDIR)\filedup.obj \ - $(BUILDIR)\filepath.obj \ - $(BUILDIR)\filepath_util.obj \ - $(BUILDIR)\filestat.obj \ - $(BUILDIR)\filesys.obj \ - $(BUILDIR)\flock.obj \ - $(BUILDIR)\fullrw.obj \ - $(BUILDIR)\mktemp.obj \ - $(BUILDIR)\open.obj \ - $(BUILDIR)\pipe.obj \ - $(BUILDIR)\readwrite.obj \ - $(BUILDIR)\seek.obj \ - $(BUILDIR)\tempdir.obj \ - $(BUILDIR)\proc_mutex.obj \ - $(BUILDIR)\thread_cond.obj \ - $(BUILDIR)\thread_mutex.obj \ - $(BUILDIR)\thread_rwlock.obj \ - $(BUILDIR)\apr_pools.obj \ - $(BUILDIR)\charset.obj \ - $(BUILDIR)\env.obj \ - $(BUILDIR)\errorcodes.obj \ - $(BUILDIR)\getopt.obj \ - $(BUILDIR)\internal.obj \ - $(BUILDIR)\misc.obj \ - $(BUILDIR)\otherchild.obj \ - $(BUILDIR)\rand.obj \ - $(BUILDIR)\start.obj \ - $(BUILDIR)\utf8.obj \ - $(BUILDIR)\version.obj \ - $(BUILDIR)\common.obj \ - $(BUILDIR)\mmap.obj \ - $(BUILDIR)\inet_ntop.obj \ - $(BUILDIR)\inet_pton.obj \ - $(BUILDIR)\select.obj \ - $(BUILDIR)\multicast.obj \ - $(BUILDIR)\sendrecv.obj \ - $(BUILDIR)\sockaddr.obj \ - $(BUILDIR)\sockets.obj \ - $(BUILDIR)\sockopt.obj \ - $(BUILDIR)\apr_getpass.obj \ - $(BUILDIR)\apr_random.obj \ - $(BUILDIR)\sha2.obj \ - $(BUILDIR)\sha2_glue.obj \ - $(BUILDIR)\shm.obj \ - $(BUILDIR)\apr_cpystrn.obj \ - $(BUILDIR)\apr_fnmatch.obj \ - $(BUILDIR)\apr_snprintf.obj \ - $(BUILDIR)\apr_strings.obj \ - $(BUILDIR)\apr_strnatcmp.obj \ - $(BUILDIR)\apr_strtok.obj \ - $(BUILDIR)\apr_hash.obj \ - $(BUILDIR)\apr_tables.obj \ - $(BUILDIR)\proc.obj \ - $(BUILDIR)\signals.obj \ - $(BUILDIR)\thread.obj \ - $(BUILDIR)\threadpriv.obj \ - $(BUILDIR)\access.obj \ - $(BUILDIR)\time.obj \ - $(BUILDIR)\timestr.obj \ - $(BUILDIR)\groupinfo.obj \ - $(BUILDIR)\userinfo.obj - - -!IFDEF DLL -BUILDLIB = $(BUILDIR)\$(PROJECT).dll -BUILDPDB = $(BUILDIR)\$(PROJECT).pdb -BUILDRES = $(BUILDIR)\$(PROJECT).res -BUILDMAN = $(BUILDLIB).manifest -!ELSE -BUILDLIB = $(BUILDIR)\$(PROJECT).lib -!ENDIF - -all : $(BUILDIR) $(BUILDLIB) - -$(BUILDIR) : - @$(MAKETARGET) - -$(SRCDIR)/include/apr.h: $(SRCDIR)/include/apr.hw - <<nmaketmp.bat - @echo off - @type $(SRCDIR)\include\apr.hw > $(SRCDIR)\include\apr.h -<< - -{$(SRCDIR)/atomic/win32}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/dso/win32}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/file_io/unix}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/file_io/win32}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/locks/win32}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/memory/unix}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/misc/unix}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/misc/win32}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/mmap/unix}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/mmap/win32}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/network_io/unix}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/network_io/win32}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/passwd}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/poll/unix}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/random/unix}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/shmem/win32}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/strings}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/tables}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/threadproc/win32}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/time/win32}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -{$(SRCDIR)/user/win32}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -$(OBJECTS): $(SRCDIR)/include/*.h $(SRCDIR)/include/arch/*.h $(SRCDIR)/include/arch/win32/*.h $(SRCDIR)/include/arch/unix/*.h - -!IFDEF DLL -$(BUILDRES): libapr.rc $(SRCDIR)/include/*.h - $(RC) $(RCFLAGS) /i "$(SRCDIR)/include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc -$(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS) $(BUILDRES) - $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDLIB) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2 -!ELSE -$(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS) - $(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDLIB) -!ENDIF - -clean: - @$(CLEANTARGET) +# Copyright 2001-2006 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 jboss.com> +# +# ==================================================================== +# + +!IFDEF DLL +CFLAGS = -DAPR_DECLARE_EXPORT $(CFLAGS) +TARGET = DLL +PROJECT = libapr-1 +!ELSE +CFLAGS = -DAPR_DECLARE_STATIC $(CFLAGS) +TARGET = LIB +PROJECT = apr-1 +!ENDIF + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +!include <../../build/NMAKEcommon.inc> + +INCLUDES = -I$(SRCDIR)/include -I$(SRCDIR)/include/arch -I$(SRCDIR)/include/arch/win32 -I$(SRCDIR)/include/arch/unix +PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src +OBJECTS = \ + $(BUILDIR)\apr_atomic.obj \ + $(BUILDIR)\dso.obj \ + $(BUILDIR)\copy.obj \ + $(BUILDIR)\dir.obj \ + $(BUILDIR)\fileacc.obj \ + $(BUILDIR)\filedup.obj \ + $(BUILDIR)\filepath.obj \ + $(BUILDIR)\filepath_util.obj \ + $(BUILDIR)\filestat.obj \ + $(BUILDIR)\filesys.obj \ + $(BUILDIR)\flock.obj \ + $(BUILDIR)\fullrw.obj \ + $(BUILDIR)\mktemp.obj \ + $(BUILDIR)\open.obj \ + $(BUILDIR)\pipe.obj \ + $(BUILDIR)\readwrite.obj \ + $(BUILDIR)\seek.obj \ + $(BUILDIR)\tempdir.obj \ + $(BUILDIR)\proc_mutex.obj \ + $(BUILDIR)\thread_cond.obj \ + $(BUILDIR)\thread_mutex.obj \ + $(BUILDIR)\thread_rwlock.obj \ + $(BUILDIR)\apr_pools.obj \ + $(BUILDIR)\charset.obj \ + $(BUILDIR)\env.obj \ + $(BUILDIR)\errorcodes.obj \ + $(BUILDIR)\getopt.obj \ + $(BUILDIR)\internal.obj \ + $(BUILDIR)\misc.obj \ + $(BUILDIR)\otherchild.obj \ + $(BUILDIR)\rand.obj \ + $(BUILDIR)\start.obj \ + $(BUILDIR)\utf8.obj \ + $(BUILDIR)\version.obj \ + $(BUILDIR)\common.obj \ + $(BUILDIR)\mmap.obj \ + $(BUILDIR)\inet_ntop.obj \ + $(BUILDIR)\inet_pton.obj \ + $(BUILDIR)\select.obj \ + $(BUILDIR)\multicast.obj \ + $(BUILDIR)\sendrecv.obj \ + $(BUILDIR)\sockaddr.obj \ + $(BUILDIR)\sockets.obj \ + $(BUILDIR)\sockopt.obj \ + $(BUILDIR)\apr_getpass.obj \ + $(BUILDIR)\apr_random.obj \ + $(BUILDIR)\sha2.obj \ + $(BUILDIR)\sha2_glue.obj \ + $(BUILDIR)\shm.obj \ + $(BUILDIR)\apr_cpystrn.obj \ + $(BUILDIR)\apr_fnmatch.obj \ + $(BUILDIR)\apr_snprintf.obj \ + $(BUILDIR)\apr_strings.obj \ + $(BUILDIR)\apr_strnatcmp.obj \ + $(BUILDIR)\apr_strtok.obj \ + $(BUILDIR)\apr_hash.obj \ + $(BUILDIR)\apr_tables.obj \ + $(BUILDIR)\proc.obj \ + $(BUILDIR)\signals.obj \ + $(BUILDIR)\thread.obj \ + $(BUILDIR)\threadpriv.obj \ + $(BUILDIR)\access.obj \ + $(BUILDIR)\time.obj \ + $(BUILDIR)\timestr.obj \ + $(BUILDIR)\groupinfo.obj \ + $(BUILDIR)\userinfo.obj + + +!IFDEF DLL +BUILDLIB = $(BUILDIR)\$(PROJECT).dll +BUILDPDB = $(BUILDIR)\$(PROJECT).pdb +BUILDRES = $(BUILDIR)\$(PROJECT).res +BUILDMAN = $(BUILDLIB).manifest +!ELSE +BUILDLIB = $(BUILDIR)\$(PROJECT).lib +!ENDIF + +all : $(BUILDIR) $(BUILDLIB) + +$(BUILDIR) : + @$(MAKETARGET) + +$(SRCDIR)/include/apr.h: $(SRCDIR)/include/apr.hw + <<nmaketmp.bat + @echo off + @type $(SRCDIR)\include\apr.hw > $(SRCDIR)\include\apr.h +<< + +{$(SRCDIR)/atomic/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/dso/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/file_io/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/file_io/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/locks/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/memory/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/misc/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/misc/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/mmap/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/mmap/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/network_io/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/network_io/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/passwd}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/poll/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/random/unix}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/shmem/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/strings}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/tables}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/threadproc/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/time/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +{$(SRCDIR)/user/win32}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(OBJECTS): $(SRCDIR)/include/*.h $(SRCDIR)/include/arch/*.h $(SRCDIR)/include/arch/win32/*.h $(SRCDIR)/include/arch/unix/*.h + +!IFDEF DLL +$(BUILDRES): libapr.rc $(SRCDIR)/include/*.h + $(RC) $(RCFLAGS) /i "$(SRCDIR)/include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc +$(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDLIB) + IF EXIST $(BUILDMAN) \ + mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2 +!ELSE +$(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS) + $(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDLIB) +!ENDIF + +clean: + @$(CLEANTARGET) Property changes on: labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile ___________________________________________________________________ Name: svn:eol-style - native + CRLF Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat 2006-05-23 07:33:59 UTC (rev 4367) +++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat 2006-05-23 07:39:38 UTC (rev 4368) @@ -1,31 +1,31 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM @version $Revision$, $Date$ -REM -REM -REM call vsvars32 -REM -@if "%OS%" == "Windows_NT" setlocal -@rmdir /S /Q out32 -@rmdir /S /Q out32dll -@rmdir /S /Q tmp32 -@rmdir /S /Q tmp32dll - -perl Configure VC-NT -call ms\do_nt - -@if "%1" == "dll" goto DLL -@goto LIB -:DLL -nmake -f ms\ntdll.mak -@goto END -:LIB -nmake -f ms\nt.mak -:END +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM @version $Revision$, $Date$ +REM +REM +REM call vsvars32 +REM +@if "%OS%" == "Windows_NT" setlocal +@rmdir /S /Q out32 +@rmdir /S /Q out32dll +@rmdir /S /Q tmp32 +@rmdir /S /Q tmp32dll + +perl Configure VC-NT +call ms\do_nt + +@if "%1" == "dll" goto DLL +@goto LIB +:DLL +nmake -f ms\ntdll.mak +@goto END +:LIB +nmake -f ms\nt.mak +:END Property changes on: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat ___________________________________________________________________ Name: svn:eol-style - native + CRLF Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat 2006-05-23 07:33:59 UTC (rev 4367) +++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat 2006-05-23 07:39:38 UTC (rev 4368) @@ -1,31 +1,31 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM @version $Revision$, $Date$ -REM -REM -REM call vsvars32 -REM -@if "%OS%" == "Windows_NT" setlocal -@rmdir /S /Q out32 -@rmdir /S /Q out32dll -@rmdir /S /Q tmp32 -@rmdir /S /Q tmp32dll - -perl Configure VC-WIN64A -call ms\do_win64a - -@if "%1" == "dll" goto DLL -@goto LIB -:DLL -nmake -f ms\ntdll.mak -@goto END -:LIB -nmake -f ms\nt.mak -:END +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM @version $Revision$, $Date$ +REM +REM +REM call vsvars32 +REM +@if "%OS%" == "Windows_NT" setlocal +@rmdir /S /Q out32 +@rmdir /S /Q out32dll +@rmdir /S /Q tmp32 +@rmdir /S /Q tmp32dll + +perl Configure VC-WIN64A +call ms\do_win64a + +@if "%1" == "dll" goto DLL +@goto LIB +:DLL +nmake -f ms\ntdll.mak +@goto END +:LIB +nmake -f ms\nt.mak +:END Property changes on: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat ___________________________________________________________________ Name: svn:eol-style - native + CRLF Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat 2006-05-23 07:33:59 UTC (rev 4367) +++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat 2006-05-23 07:39:38 UTC (rev 4368) @@ -1,31 +1,31 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM @version $Revision$, $Date$ -REM -REM -REM call vsvars32 -REM -@if "%OS%" == "Windows_NT" setlocal -@rmdir /S /Q out32 -@rmdir /S /Q out32dll -@rmdir /S /Q tmp32 -@rmdir /S /Q tmp32dll - -perl Configure VC-NT -call ms\do_masm - -@if "%1" == "dll" goto DLL -@goto LIB -:DLL -nmake -f ms\ntdll.mak -@goto END -:LIB -nmake -f ms\nt.mak -:END +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM @version $Revision$, $Date$ +REM +REM +REM call vsvars32 +REM +@if "%OS%" == "Windows_NT" setlocal +@rmdir /S /Q out32 +@rmdir /S /Q out32dll +@rmdir /S /Q tmp32 +@rmdir /S /Q tmp32dll + +perl Configure VC-NT +call ms\do_masm + +@if "%1" == "dll" goto DLL +@goto LIB +:DLL +nmake -f ms\ntdll.mak +@goto END +:LIB +nmake -f ms\nt.mak +:END Property changes on: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat ___________________________________________________________________ Name: svn:eol-style - native + CRLF Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat 2006-05-23 07:33:59 UTC (rev 4367) +++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat 2006-05-23 07:39:38 UTC (rev 4368) @@ -1,31 +1,31 @@ -@echo off -REM -REM JBoss, the OpenSource J2EE webOS -REM -REM Distributable under LGPL license. -REM See terms of license at gnu.org. -REM -REM -REM @author Mladen Turk -REM @version $Revision$, $Date$ -REM -REM -REM call vsvars32 -REM -@if "%OS%" == "Windows_NT" setlocal -@rmdir /S /Q out32 -@rmdir /S /Q out32dll -@rmdir /S /Q tmp32 -@rmdir /S /Q tmp32dll - -perl Configure VC-WIN64I -call ms\do_win64i - -@if "%1" == "dll" goto DLL -@goto LIB -:DLL -nmake -f ms\ntdll.mak -@goto END -:LIB -nmake -f ms\nt.mak -:END +@echo off +REM +REM JBoss, the OpenSource J2EE webOS +REM +REM Distributable under LGPL license. +REM See terms of license at gnu.org. +REM +REM +REM @author Mladen Turk +REM @version $Revision$, $Date$ +REM +REM +REM call vsvars32 +REM +@if "%OS%" == "Windows_NT" setlocal +@rmdir /S /Q out32 +@rmdir /S /Q out32dll +@rmdir /S /Q tmp32 +@rmdir /S /Q tmp32dll + +perl Configure VC-WIN64I +call ms\do_win64i + +@if "%1" == "dll" goto DLL +@goto LIB +:DLL +nmake -f ms\ntdll.mak +@goto END +:LIB +nmake -f ms\nt.mak +:END Property changes on: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat ___________________________________________________________________ Name: svn:eol-style - native + CRLF Modified: labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile =================================================================== --- labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile 2006-05-23 07:33:59 UTC (rev 4367) +++ labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile 2006-05-23 07:39:38 UTC (rev 4368) @@ -1,71 +1,71 @@ -# Copyright 2001-2005 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 JBoss Service Make file. -# Usage: -# DEBUG=1 Build DEBUG version -# -# Originally contributed by Mladen Turk <mturk jboss.com> -# -# ==================================================================== -# - -TARGET = EXE -PROJECT = jbosssvc -!include <build/NMAKEcommon.inc> - -!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" -SRCDIR = . -!ENDIF - -LFLAGS = $(LFLAGS) user32.lib - -PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src -OBJECTS = \ - $(BUILDIR)\jboss.obj - -BUILDEXE = $(BUILDIR)\$(PROJECT).exe -BUILDPDB = $(BUILDIR)\$(PROJECT).pdb -BUILDRES = $(BUILDIR)\$(PROJECT).res -BUILDMAN = $(BUILDLIB).manifest - -all : $(BUILDIR) $(BUILDEXE) - -$(BUILDIR) : - @$(MAKETARGET) - -{$(SRCDIR)}.c{$(BUILDIR)}.obj: - $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< - -$(BUILDRES): $(SRCDIR)/jboss.rc - $(RC) $(RCFLAGS) /fo $(BUILDRES) $(SRCDIR)/jboss.rc - -$(BUILDEXE): $(BUILDIR) $(OBJECTS) $(BUILDRES) - $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDEXE) - IF EXIST $(BUILDMAN) \ - mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);1 - -clean: - @$(CLEANTARGET) - -!IFNDEF INSTALLDIR -INSTALLDIR = ../../native-builds/windows-%CPU%/bin -!ENDIF - -install: all - @gmkdir -p $(INSTALLDIR) - @cp -f -t $(INSTALLDIR) $(BUILDEXE) +# Copyright 2001-2005 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 JBoss Service Make file. +# Usage: +# DEBUG=1 Build DEBUG version +# +# Originally contributed by Mladen Turk <mturk jboss.com> +# +# ==================================================================== +# + +TARGET = EXE +PROJECT = jbosssvc +!include <build/NMAKEcommon.inc> + +!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == "" +SRCDIR = . +!ENDIF + +LFLAGS = $(LFLAGS) user32.lib + +PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src +OBJECTS = \ + $(BUILDIR)\jboss.obj + +BUILDEXE = $(BUILDIR)\$(PROJECT).exe +BUILDPDB = $(BUILDIR)\$(PROJECT).pdb +BUILDRES = $(BUILDIR)\$(PROJECT).res +BUILDMAN = $(BUILDLIB).manifest + +all : $(BUILDIR) $(BUILDEXE) + +$(BUILDIR) : + @$(MAKETARGET) + +{$(SRCDIR)}.c{$(BUILDIR)}.obj: + $(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $< + +$(BUILDRES): $(SRCDIR)/jboss.rc + $(RC) $(RCFLAGS) /fo $(BUILDRES) $(SRCDIR)/jboss.rc + +$(BUILDEXE): $(BUILDIR) $(OBJECTS) $(BUILDRES) + $(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES... [truncated message content] |
