Author: markt
Date: Fri Nov 3 08:32:14 2017
New Revision: 1814140
URL: http://svn.apache.org/viewvc?rev=1814140&view=rev
Log:
Remove support for building Procrun for the Itanium platform
Modified:
commons/proper/daemon/trunk/src/changes/changes.xml
commons/proper/daemon/trunk/src/native/windows/README
commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile
commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile
commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc
commons/proper/daemon/trunk/src/native/windows/src/cmdline.c
Modified: commons/proper/daemon/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/changes/changes.xml?rev=1814140&r1=1814139&r2=1814140&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/changes/changes.xml (original)
+++ commons/proper/daemon/trunk/src/changes/changes.xml Fri Nov 3 08:32:14 2017
@@ -134,6 +134,9 @@
Add a restarts options to jsvc to control the number of permitted
restarts after a system crash.
</action>
+ <action type="remove" dev="markt">
+ Remove support for building Procrun for the Itanium platform.
+ </action>
</release>
</body>
</document>
Modified: commons/proper/daemon/trunk/src/native/windows/README
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/README?rev=1814140&r1=1814139&r2=1814140&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/README (original)
+++ commons/proper/daemon/trunk/src/native/windows/README Fri Nov 3 08:32:14
2017
@@ -55,5 +55,3 @@ Step by Step
nmake CPU=X86
- x64
nmake CPU=X64
- - ia64
- nmake CPU=I64
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile?rev=1814140&r1=1814139&r2=1814140&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunmgr/Makefile Fri
Nov 3 08:32:14 2017
@@ -28,9 +28,6 @@ SRCDIR = .\..\..
!IF "$(CPU)" == "X64"
PREFIX = $(PREFIX)\amd64
!ENDIF
-!IF "$(CPU)" == "I64"
-PREFIX = $(PREFIX)\ia64
-!ENDIF
LFLAGS = $(LFLAGS) /version:1.0 /DYNAMICBASE /NXCOMPAT
LIBS = $(LIBS) user32.lib gdi32.lib winspool.lib comdlg32.lib comctl32.lib
shlwapi.lib netapi32.lib
@@ -55,8 +52,6 @@ BUILDEXE = $(WORKDIR)\$(PROJECT).exe
BUILDLOC = $(PREFIX)
!IF "$(CPU)" == "X64"
BUILDLOC = $(PREFIX)\amd64
-!ELSEIF "$(CPU)" == "I64"
-BUILDLOC = $(PREFIX)\ia64
!ENDIF
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
BUILDRES = $(WORKDIR)\$(PROJECT).res
Modified: commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile?rev=1814140&r1=1814139&r2=1814140&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile
(original)
+++ commons/proper/daemon/trunk/src/native/windows/apps/prunsrv/Makefile Fri
Nov 3 08:32:14 2017
@@ -52,8 +52,6 @@ BUILDEXE = $(WORKDIR)\$(PROJECT).exe
BUILDLOC = $(PREFIX)
!IF "$(CPU)" == "X64"
BUILDLOC = $(PREFIX)\amd64
-!ELSEIF "$(CPU)" == "I64"
-BUILDLOC = $(PREFIX)\ia64
!ENDIF
BUILDPDB = $(WORKDIR)\$(PROJECT).pdb
BUILDRES = $(WORKDIR)\$(PROJECT).res
Modified: commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc?rev=1814140&r1=1814139&r2=1814140&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc
(original)
+++ commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc Fri Nov
3 08:32:14 2017
@@ -23,7 +23,6 @@
# CPU Compile for specified CPU. Supported CPUs are:
# X86 (Common x86 architecture)
# X64 (AMD64/EMT64 architecture)
-# I64 (Intel IA64 architecture)
# If not specified it will default to the
# BUILD_CPU environment variable, failing that
# It will default to the
@@ -114,9 +113,6 @@ CPU=X86
!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)"
== "x64"
CPU=X64
!ENDIF
-!IF "$(BUILD_CPU)" == "ia64" || "$(BUILD_CPU)" == "i64"
-CPU=I64
-!ENDIF
# did we manage to set CPU?
!IF !DEFINED(CPU) || "$(CPU)" == ""
!ERROR Unexpected value of BUILD_CPU: $(BUILD_CPU) or
PROCESSOR_ARCHITECTURE=$(PROCESSOR_ARCHITECTURE) or
PROCESSOR_ARCHITEW6432=$(PROCESSOR_ARCHITEW6432).
@@ -125,9 +121,7 @@ CPU=I64
!IF "$(CPU)" != "X86"
!IF "$(CPU)" != "X64"
-!IF "$(CPU)" != "I64"
-!ERROR Must specify CPU environment variable (X86, X64, I64) $(CPU)
-!ENDIF
+!ERROR Must specify CPU environment variable (X86, X64) $(CPU)
!ENDIF
!ENDIF
@@ -224,10 +218,6 @@ MACHINE_LC=i386
CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64
MACHINE=AMD64
MACHINE_LC=amd64
-!ELSEIF "$(CPU)" == "I64"
-CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64
-MACHINE=IA64
-MACHINE_LC=ia64
!ENDIF
!IF "$(BUILD)" == "RELEASE"
@@ -345,8 +335,5 @@ 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
Modified: commons/proper/daemon/trunk/src/native/windows/src/cmdline.c
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/cmdline.c?rev=1814140&r1=1814139&r2=1814140&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/src/cmdline.c (original)
+++ commons/proper/daemon/trunk/src/native/windows/src/cmdline.c Fri Nov 3
08:32:14 2017
@@ -22,7 +22,6 @@
#define X86_SUFFIX L".X86"
#define X64_SUFFIX L".X64"
-#define A64_SUFFIX L".I64"
/* Those two are declared in handles.c */
extern LPWSTR *_st_sys_argvw;
@@ -81,9 +80,6 @@ LPAPXCMDLINE apxCmdlineParse(
else if (lstrcmpiW(p, X64_SUFFIX) == 0) {
*p = L'\0';
}
- else if (lstrcmpiW(p, A64_SUFFIX) == 0) {
- *p = L'\0';
- }
}
if (_st_sys_argc > 1 && lstrlenW(_st_sys_argvw[1]) > 2) {
LPWSTR cp = _st_sys_argvw[1];
