10:07 a.m.
Author: mladen.turk(a)jboss.com
Date: 2008-03-26 11:07:28 -0400 (Wed, 26 Mar 2008)
New Revision: 1463
Modified:
trunk/build/NMAKEcommon.inc
trunk/build/unix/build.sh
trunk/build/windows/build.bat
trunk/httpd/httpd-2.2/NMAKEcommon.inc
trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile
trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.manifest
trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.patch
trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor
trunk/utils/windows/native/service/procrun/NMAKEcommon.inc
Log:
Use consistent platform names
Modified: trunk/build/NMAKEcommon.inc
===================================================================
--- trunk/build/NMAKEcommon.inc 2008-03-26 11:53:33 UTC (rev 1462)
+++ trunk/build/NMAKEcommon.inc 2008-03-26 15:07:28 UTC (rev 1463)
@@ -79,8 +79,8 @@
!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" ==
"x86_64" || "$(BUILD_CPU)" == "x64"
CPU=X64
!ENDIF
-!IF "$(BUILD_CPU)" == "ia64"
-CPU=IA64
+!IF "$(BUILD_CPU)" == "ia64" || "$(BUILD_CPU)" ==
"i64"
+CPU=I64
!ENDIF
!IF !DEFINED(CPU) || "$(CPU)" == ""
@@ -91,10 +91,20 @@
!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)" != "IA64"
-!ERROR Must specify CPU environment variable (X86, X64, IA64) $(CPU)
+!IF "$(CPU)" != "I64"
+!ERROR Must specify CPU environment variable (X86, X64, I64) $(CPU)
!ENDIF
!ENDIF
!ENDIF
@@ -188,7 +198,7 @@
CPU_CFLAGS = -D_X86_=1
!ELSEIF "$(CPU)" == "X64"
CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64
-!ELSEIF "$(CPU)" == "IA64"
+!ELSEIF "$(CPU)" == "I64"
CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64
!ENDIF
@@ -309,7 +319,7 @@
!ELSEIF "$(CPU)" == "X64"
ML = ml64.exe
AFLAGS = /Zi /c
-!ELSEIF "$(CPU)" == "IA64"
+!ELSEIF "$(CPU)" == "I64"
ML = ml64.exe
AFLAGS = /coff /Zi /c
!ENDIF
Modified: trunk/build/unix/build.sh
===================================================================
--- trunk/build/unix/build.sh 2008-03-26 11:53:33 UTC (rev 1462)
+++ trunk/build/unix/build.sh 2008-03-26 15:07:28 UTC (rev 1463)
@@ -260,6 +260,9 @@
x86_64*)
BUILD_CPU=x64
;;
+ ia64*)
+ BUILD_CPU=i64
+ ;;
9000/800*)
BUILD_CPU=parisc2
so_extension=sl
@@ -307,7 +310,7 @@
CC=cc
export CC
# http://hpux.cs.utah.edu/ only has a 32 bits one.
- if [ $BUILD_CPU = "ia64" ]; then
+ if [ $BUILD_CPU = "i64" ]; then
if [ $has_zlib ]; then
build_zlib=true
fi
@@ -583,7 +586,7 @@
hpux-parisc2)
./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} hpux-parisc2-cc
|| exit 1
;;
- hpux-ia64)
+ hpux-i64)
./Configure ${ssl_target} ${ssl_common_flags} ${ssl_build_flags} hpux-ia64-cc ||
exit 1
;;
linux2-ppc64)
@@ -597,7 +600,7 @@
./Configure ${ssl_target} VC-WIN64A
ms/do_win64a.bat
;;
- windows-ia64)
+ windows-i64)
./Configure ${ssl_target} VC-WIN64I
ms/do_win64i.bat
;;
@@ -617,7 +620,7 @@
make || exit 1
# To hack broken openssl Makefiles.
case ${BUILD_TAG} in
- hpux-ia64)
+ hpux-i64)
gmake install_sw CFLAGS=DSO_DLHACK || exit 1
;;
hpux-parisc2)
Modified: trunk/build/windows/build.bat
===================================================================
--- trunk/build/windows/build.bat 2008-03-26 11:53:33 UTC (rev 1462)
+++ trunk/build/windows/build.bat 2008-03-26 15:07:28 UTC (rev 1463)
@@ -106,12 +106,14 @@
@if /i "%BUILD_CPU%" == "x86" goto cpuX86
@if /i "%BUILD_CPU%" == "amd64" goto cpuX64
@if /i "%BUILD_CPU%" == "x64" goto cpuX86
-@if /i "%BUILD_CPU%" == "ia64" goto cpuIA64
+@if /i "%BUILD_CPU%" == "ia64" goto cpuI64
+@if /i "%BUILD_CPU%" == "i64" goto cpuI64
echo Usage: %PROGNAME% CPU where CPU is x86 x64 or ia64
echo or : %PROGNAME% sdk CPU if you are cross compiling
goto cmdEnd
:cpuX86
+set BUILD_CPU=x86
@if "%USE_PLATFORM_SDK%" == "1" (
call "%MSVS6VC%\vs6vars"
) else (
@@ -121,6 +123,7 @@
goto cmdBuild
:cpuX64
+set BUILD_CPU=x64
@if "%USE_PLATFORM_SDK%" == "1" (
call "%MSWPSDK%\SetEnv" /X64 /RETAIL
) else (
@@ -129,7 +132,8 @@
)
goto cmdBuild
-:cpuIA64
+:cpuI64
+set BUILD_CPU=i64
@if "%USE_PLATFORM_SDK%" == "1" (
call "%MSWPSDK%\SetEnv" /SRV64 /RETAIL
) else (
Modified: trunk/httpd/httpd-2.2/NMAKEcommon.inc
===================================================================
--- trunk/httpd/httpd-2.2/NMAKEcommon.inc 2008-03-26 11:53:33 UTC (rev 1462)
+++ trunk/httpd/httpd-2.2/NMAKEcommon.inc 2008-03-26 15:07:28 UTC (rev 1463)
@@ -79,8 +79,8 @@
!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" ==
"x86_64" || "$(BUILD_CPU)" == "x64"
CPU=X64
!ENDIF
-!IF "$(BUILD_CPU)" == "ia64"
-CPU=IA64
+!IF "$(BUILD_CPU)" == "ia64" || "$(BUILD_CPU)" ==
"i64"
+CPU=I64
!ENDIF
!IF !DEFINED(CPU) || "$(CPU)" == ""
@@ -91,10 +91,20 @@
!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)" != "IA64"
-!ERROR Must specify CPU environment variable (X86, X64, IA64) $(CPU)
+!IF "$(CPU)" != "I64"
+!ERROR Must specify CPU environment variable (X86, X64, I64) $(CPU)
!ENDIF
!ENDIF
!ENDIF
@@ -188,7 +198,7 @@
CPU_CFLAGS = -D_X86_=1
!ELSEIF "$(CPU)" == "X64"
CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64
-!ELSEIF "$(CPU)" == "IA64"
+!ELSEIF "$(CPU)" == "I64"
CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64
!ENDIF
@@ -309,7 +319,7 @@
!ELSEIF "$(CPU)" == "X64"
ML = ml64.exe
AFLAGS = /Zi /c
-!ELSEIF "$(CPU)" == "IA64"
+!ELSEIF "$(CPU)" == "I64"
ML = ml64.exe
AFLAGS = /coff /Zi /c
!ENDIF
Modified: trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile
===================================================================
--- trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2008-03-26 11:53:33 UTC (rev 1462)
+++ trunk/httpd/httpd-2.2/srclib/zlib/NMAKEmakefile 2008-03-26 15:07:28 UTC (rev 1463)
@@ -52,7 +52,7 @@
BUILDBIN = $(WORKDIR)\$(PROJECT).lib
!ENDIF
-!IF "$(CPU)" != "I386"
+!IF "$(CPU)" != "X86"
CFLAGS = -GS- $(CFLAGS)
!ENDIF
@@ -76,7 +76,7 @@
!IFDEF ZLIB_ASM
CFLAGS = -DASMV -DASMINF $(CFLAGS)
-!IF "$(CPU)" == "AMD64"
+!IF "$(CPU)" == "X64"
ASM_OBJECTS = \
$(WORKDIR)\inffas8664.obj \
$(WORKDIR)\gvmat64.obj \
@@ -101,7 +101,7 @@
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-!IF "$(CPU)" == "AMD64"
+!IF "$(CPU)" == "X64"
{$(SRCDIR)/contrib/masmx64}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
Modified: trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.manifest
===================================================================
--- trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.manifest 2008-03-26 11:53:33 UTC
(rev 1462)
+++ trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.manifest 2008-03-26 15:07:28 UTC
(rev 1463)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
manifestVersion="1.0">
-<assemblyIdentity version="2.0.1.0" processorArchitecture="X86"
name="Apache.Httpd.ApacheMonitor" type="win32" />
+<assemblyIdentity version="3.1.0.0" processorArchitecture="*"
name="Apache.Httpd.ApacheMonitor" type="win32" />
<description>Apache Service Manager.</description>
<dependency>
<dependentAssembly>
-<assemblyIdentity type="win32"
name="Microsoft.Windows.Common-Controls" version="6.0.0.0"
processorArchitecture="X86" publicKeyToken="6595b64144ccf1df"
language="*" />
+<assemblyIdentity type="win32"
name="Microsoft.Windows.Common-Controls" version="6.0.0.0"
processorArchitecture="*" publicKeyToken="6595b64144ccf1df"
language="*" />
</dependentAssembly>
</dependency>
</assembly>
Modified: trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.patch
===================================================================
--- trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.patch 2008-03-26 11:53:33 UTC (rev
1462)
+++ trunk/httpd/httpd-2.2/support/win32/ApacheMonitor.patch 2008-03-26 15:07:28 UTC (rev
1463)
@@ -20,7 +20,7 @@
#include "../../build/win32/httpd.rc"
-+#ifdef USE_MANIFEST
++#if 1
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "ApacheMonitor.manifest"
+#endif
Modified: trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor
===================================================================
--- trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor 2008-03-26 11:53:33 UTC (rev
1462)
+++ trunk/httpd/httpd-2.2/support/win32/NMAKEapachemonitor 2008-03-26 15:07:28 UTC (rev
1463)
@@ -46,10 +46,6 @@
RCFLAGS = $(RCFLAGS) /d "APP_FILE"
-!IF "$(CPU)" == "I386"
-RCFLAGS = $(RCFLAGS) /d "USE_MANIFEST"
-!ENDIF
-
OBJECTS = \
$(WORKDIR)\ApacheMonitor.obj \
Modified: trunk/utils/windows/native/service/procrun/NMAKEcommon.inc
===================================================================
--- trunk/utils/windows/native/service/procrun/NMAKEcommon.inc 2008-03-26 11:53:33 UTC
(rev 1462)
+++ trunk/utils/windows/native/service/procrun/NMAKEcommon.inc 2008-03-26 15:07:28 UTC
(rev 1463)
@@ -67,34 +67,48 @@
RC = rc.exe
!ENDIF
+!IF !DEFINED(MT) || "$(MT)" == ""
+MT = mt.exe
+!ENDIF
+
# Read the PROCESSOR_ARCHITECTURE environment value for a CPU type
-!IF "$(BUILDCPU)" == "i386" || "$(BUILDCPU)" ==
"x86" || "$(BUILDCPU)" == "i686"
-CPU=I386
+!IF "$(BUILD_CPU)" == "i386" || "$(BUILD_CPU)" ==
"x86" || "$(BUILD_CPU)" == "i686"
+CPU=X86
!ENDIF
-!IF "$(BUILDCPU)" == "amd64" || "$(BUILDCPU)" ==
"x86_64"
-CPU=AMD64
+!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" ==
"x86_64" || "$(BUILD_CPU)" == "x64"
+CPU=X64
!ENDIF
-!IF "$(BUILDCPU)" == "ia64"
-CPU=IA64
+!IF "$(BUILD_CPU)" == "ia64" || "$(BUILD_CPU)" ==
"i64"
+CPU=I64
!ENDIF
!IF !DEFINED(CPU) || "$(CPU)" == ""
!IF "$(PROCESSOR_ARCHITECTURE)" == ""
-CPU=I386
+CPU=X86
!ELSE
CPU=$(PROCESSOR_ARCHITECTURE)
!ENDIF
!ENDIF
-!IF "$(CPU)" != "I386"
-!IF "$(CPU)" != "AMD64"
-!IF "$(CPU)" != "IA64"
-!ERROR Must specify CPU environment variable (I386, AMD64, IA64) $(CPU)
+!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
@@ -180,22 +194,22 @@
# Common flags for all platforms
CMN_CFLAGS = -c -nologo -DWIN32 -D_WIN32 -D_WINDOWS $(NMAKE_WINNT) -W3
-!IF "$(CPU)" == "I386"
+!IF "$(CPU)" == "X86"
CPU_CFLAGS = -D_X86_=1
-!ELSEIF "$(CPU)" == "AMD64"
+!ELSEIF "$(CPU)" == "X64"
CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64
-!ELSEIF "$(CPU)" == "IA64"
+!ELSEIF "$(CPU)" == "I64"
CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64
!ENDIF
!IF "$(INCLUDE_PRE64PRA)" == "1"
-!IF "$(CPU)" != "I386"
+!IF "$(CPU)" != "X86"
CPU_CFLAGS = $(CPU_CFLAGS) /FIPRE64PRA.H
!ENDIF
!ENDIF
!IF "$(BUILD)" == "RELEASE"
-!IF "$(CPU)" == "I386"
+!IF "$(CPU)" == "X86"
OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG
!ELSE
OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG
@@ -224,7 +238,7 @@
# 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)" != "I386"
+!IF "$(CPU)" != "X86"
LIBS = $(LIBS) bufferoverflowu.lib
!ENDIF
!ENDIF
@@ -273,6 +287,9 @@
!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
@@ -289,20 +306,20 @@
!IF DEFINED(JAVA_HOME) && "$(JAVA_HOME)" != ""
JAVA_INCLUDES=-I "$(JAVA_HOME)\include"
-!IF "$(CPU)" != "I386"
+!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)" == "I386"
+!IF "$(CPU)" == "X86"
ML = ml.exe
AFLAGS = /coff /Zi /c
-!ELSEIF "$(CPU)" == "AMD64"
+!ELSEIF "$(CPU)" == "X64"
ML = ml64.exe
AFLAGS = /Zi /c
-!ELSEIF "$(CPU)" == "IA64"
+!ELSEIF "$(CPU)" == "I64"
ML = ml64.exe
AFLAGS = /coff /Zi /c
!ENDIF