Author: mturk
Date: Sun Feb 7 09:19:19 2010
New Revision: 907399
URL: http://svn.apache.org/viewvc?rev=907399&view=rev
Log:
Embedd manifest inside .exe
Modified:
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.amd64
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.dsp
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.ia64
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.x86
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.amd64
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.ia64
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.x86
commons/proper/daemon/trunk/src/native/nt/procrun/resources/license.rtf
Modified:
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.amd64
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.amd64?rev=907399&r1=907398&r2=907399&view=diff
==============================================================================
---
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.amd64
(original)
+++
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.amd64
Sun Feb 7 09:19:19 2010
@@ -85,6 +85,7 @@
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
+ if exist $(OUTDIR)\prunmgr.exe.manifest mt.exe -manifest
$(OUTDIR)\prunmgr.exe.manifest -outputresource:$(OUTDIR)\prunmgr.exe;1
SOURCE=.\prunmgr.c
Modified:
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.dsp
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.dsp?rev=907399&r1=907398&r2=907399&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.dsp
(original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.dsp
Sun Feb 7 09:19:19 2010
@@ -7,21 +7,21 @@
CFG=prunmgr - Win32 Unicode Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "prunmgr.mak".
-!MESSAGE
+!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE
!MESSAGE NMAKE /f "prunmgr.mak" CFG="prunmgr - Win32 Unicode Debug"
-!MESSAGE
+!MESSAGE
!MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE
!MESSAGE "prunmgr - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "prunmgr - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE "prunmgr - Win32 Unicode Release" (based on "Win32 (x86) Application")
!MESSAGE "prunmgr - Win32 Unicode Debug" (based on "Win32 (x86) Application")
-!MESSAGE
+!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
@@ -81,7 +81,12 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib shlwapi.lib comctl32.lib netapi32.lib /nologo /subsystem:windows
/debug /machine:I386 /out:"Debug/prunmgrd.exe" /pdbtype:sept
-
+# Begin Special Build Tool
+TargetPath=.\Debug\httpd.exe
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest
$(TargetPath).manifest -outputresource:$(TargetPath);1
+# End Special Build Tool
!ELSEIF "$(CFG)" == "prunmgr - Win32 Unicode Release"
# PROP BASE Use_MFC 0
@@ -107,6 +112,12 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib shlwapi.lib comctl32.lib netapi32.lib /nologo /subsystem:windows
/machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib shlwapi.lib comctl32.lib netapi32.lib /nologo /subsystem:windows
/machine:I386 /out:"Unicode Release/prunmgru.exe"
+# Begin Special Build Tool
+TargetPath=.\Debug\httpd.exe
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest
$(TargetPath).manifest -outputresource:$(TargetPath);1
+# End Special Build Tool
!ELSEIF "$(CFG)" == "prunmgr - Win32 Unicode Debug"
@@ -133,8 +144,14 @@
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib shlwapi.lib comctl32.lib netapi32.lib /nologo /subsystem:windows
/debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib
odbccp32.lib shlwapi.lib comctl32.lib netapi32.lib /nologo /subsystem:windows
/debug /machine:I386 /out:"Unicode Debug/prunmgrdu.exe" /pdbtype:sept
+# Begin Special Build Tool
+TargetPath=.\Debug\httpd.exe
+SOURCE="$(InputPath)"
+PostBuild_Desc=Embed .manifest
+PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest
$(TargetPath).manifest -outputresource:$(TargetPath);1
+# End Special Build Tool
-!ENDIF
+!ENDIF
# Begin Target
Modified:
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.ia64
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.ia64?rev=907399&r1=907398&r2=907399&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.ia64
(original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.ia64
Sun Feb 7 09:19:19 2010
@@ -85,6 +85,7 @@
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
+ if exist $(OUTDIR)\prunmgr.exe.manifest mt.exe -manifest
$(OUTDIR)\prunmgr.exe.manifest -outputresource:$(OUTDIR)\prunmgr.exe;1
SOURCE=.\prunmgr.c
Modified:
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc?rev=907399&r1=907398&r2=907399&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc
(original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.rc
Sun Feb 7 09:19:19 2010
@@ -225,9 +225,9 @@
STRINGTABLE
BEGIN
IDS_APPLICATION RSTR_PSM
- IDS_APPVERSION "Version 2.0.6"
+ IDS_APPVERSION "Version 2.0.7"
IDS_APPFULLNAME RSTR_PSM " Version " PRG_VERSION
- IDS_APPCOPYRIGHT "Copyright © 2000-2009 The Apache Software Foundation"
+ IDS_APPCOPYRIGHT "Copyright © 2000-2010 The Apache Software Foundation"
IDS_APPDESCRIPTION "Apache Procrun Service Management Tool"
IDS_ALREAY_RUNING "An instance of '%S' application is already running"
IDS_ERRORCMD "Unknown command line option '%s'\nSee the manual for
command line usage."
@@ -256,8 +256,8 @@
END
1 VERSIONINFO
- FILEVERSION 2,0,6,0
- PRODUCTVERSION 2,0,6,0
+ FILEVERSION 2,0,7,0
+ PRODUCTVERSION 2,0,7,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
@@ -277,7 +277,7 @@
VALUE "FileDescription", RSTR_PSM "\0"
VALUE "FileVersion", PRG_VERSION
VALUE "InternalName", RSTR_PSM "\0"
- VALUE "LegalCopyright", "Copyright © 2000-2009 The Apache Software
Foundation.\0"
+ VALUE "LegalCopyright", "Copyright © 2000-2010 The Apache Software
Foundation.\0"
VALUE "OriginalFilename", "prunmgr.exe\0"
VALUE "ProductName", RSTR_PSM "\0"
VALUE "ProductVersion", PRG_VERSION
Modified:
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.x86
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.x86?rev=907399&r1=907398&r2=907399&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.x86
(original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunmgr/prunmgr.x86
Sun Feb 7 09:19:19 2010
@@ -85,7 +85,7 @@
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
-
+ if exist $(OUTDIR)\prunmgr.exe.manifest mt.exe -manifest
$(OUTDIR)\prunmgr.exe.manifest -outputresource:$(OUTDIR)\prunmgr.exe;1
SOURCE=.\prunmgr.c
Modified:
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.amd64
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.amd64?rev=907399&r1=907398&r2=907399&view=diff
==============================================================================
---
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.amd64
(original)
+++
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.amd64
Sun Feb 7 09:19:19 2010
@@ -84,6 +84,7 @@
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
+ if exist $(OUTDIR)\prunsrv.exe.manifest mt.exe -manifest
$(OUTDIR)\prunsrv.exe.manifest -outputresource:$(OUTDIR)\prunsrv.exe;1
SOURCE=.\prunsrv.c
Modified:
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.ia64
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.ia64?rev=907399&r1=907398&r2=907399&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.ia64
(original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.ia64
Sun Feb 7 09:19:19 2010
@@ -84,6 +84,7 @@
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
+ if exist $(OUTDIR)\prunsrv.exe.manifest mt.exe -manifest
$(OUTDIR)\prunsrv.exe.manifest -outputresource:$(OUTDIR)\prunsrv.exe;1
SOURCE=.\prunsrv.c
Modified:
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc?rev=907399&r1=907398&r2=907399&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc
(original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.rc
Sun Feb 7 09:19:19 2010
@@ -22,8 +22,8 @@
IDI_MAINICON ICON "../../resources/procrunw.ico"
1 VERSIONINFO
- FILEVERSION 2,0,6,0
- PRODUCTVERSION 2,0,6,0
+ FILEVERSION 2,0,7,0
+ PRODUCTVERSION 2,0,7,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x03L
@@ -43,7 +43,7 @@
VALUE "FileDescription", RSTR_PRUNSRV "\0"
VALUE "FileVersion", PRG_VERSION
VALUE "InternalName", RSTR_PRUNSRV "\0"
- VALUE "LegalCopyright", "Copyright © 2000-2009 The Apache Software
Foundation.\0"
+ VALUE "LegalCopyright", "Copyright © 2000-2010 The Apache Software
Foundation.\0"
VALUE "OriginalFilename", "prunsrv.exe\0"
VALUE "ProductName", RSTR_PRUNSRV "\0"
VALUE "ProductVersion", PRG_VERSION
Modified:
commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.x86
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.x86?rev=907399&r1=907398&r2=907399&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.x86
(original)
+++ commons/proper/daemon/trunk/src/native/nt/procrun/apps/prunsrv/prunsrv.x86
Sun Feb 7 09:19:19 2010
@@ -84,6 +84,7 @@
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
+ if exist $(OUTDIR)\prunsrv.exe.manifest mt.exe -manifest
$(OUTDIR)\prunsrv.exe.manifest -outputresource:$(OUTDIR)\prunsrv.exe;1
SOURCE=.\prunsrv.c
Modified:
commons/proper/daemon/trunk/src/native/nt/procrun/resources/license.rtf
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/nt/procrun/resources/license.rtf?rev=907399&r1=907398&r2=907399&view=diff
==============================================================================
Binary files - no diff available.
