2
0
Prechádzať zdrojové kódy

Fixed compilation of messages.mc.

Compiling messages.mc failed in paths containing a space.  Eugene
Lifshitz advised how to construct a commandline which would work
in such paths.
Iain Patterson 12 rokov pred
rodič
commit
13a14267e6
3 zmenil súbory, kde vykonal 8 pridanie a 5 odobranie
  1. 2 0
      ChangeLog.txt
  2. 2 1
      README.txt
  3. 4 4
      nssm.vcproj

+ 2 - 0
ChangeLog.txt

@@ -1,5 +1,7 @@
 Changes since 2.9
 Changes since 2.9
 -----------------
 -----------------
+  * Fixed failure to compile messages.mc in paths containing spaces.
+
   * Fixed edge case with CreateProcess().
   * Fixed edge case with CreateProcess().
 
 
     Correctly handle the case where the application executable is under
     Correctly handle the case where the application executable is under

+ 2 - 1
README.txt

@@ -178,7 +178,8 @@ Thanks to Arve Knudsen for spotting that child processes of the monitored
 application could be left running on service shutdown, and that a missing
 application could be left running on service shutdown, and that a missing
 registry value for AppDirectory confused NSSM.
 registry value for AppDirectory confused NSSM.
 Thanks to Peter Wagemans and Laszlo Keresztfalvi for suggesting throttling restarts.
 Thanks to Peter Wagemans and Laszlo Keresztfalvi for suggesting throttling restarts.
-Thanks to Eugene Lifshitz for finding an edge case in CreateProcess().
+Thanks to Eugene Lifshitz for finding an edge case in CreateProcess() and for
+advising how to build messages.mc correctly in paths containing spaces.
 
 
 Licence
 Licence
 -------
 -------

+ 4 - 4
nssm.vcproj

@@ -694,7 +694,7 @@
 				<Tool
 				<Tool
 					Name="VCCustomBuildTool"
 					Name="VCCustomBuildTool"
 					Description="Compiling messages"
 					Description="Compiling messages"
-					CommandLine="mc -A $(InputDir)/$(InputName).mc -r $(InputDir) -h $(InputDir)&#x0D;&#x0A;"
+					CommandLine="mc -A $(InputName).mc -r . -h ."
 					Outputs="$(InputName).rc;$(InputName).h"
 					Outputs="$(InputName).rc;$(InputName).h"
 				/>
 				/>
 			</FileConfiguration>
 			</FileConfiguration>
@@ -704,7 +704,7 @@
 				<Tool
 				<Tool
 					Name="VCCustomBuildTool"
 					Name="VCCustomBuildTool"
 					Description="Compiling messages"
 					Description="Compiling messages"
-					CommandLine="mc -A $(InputDir)\$(InputName).mc -r $(InputDir) -h $(InputDir)&#x0D;&#x0A;"
+					CommandLine="mc -A $(InputName).mc -r . -h ."
 					Outputs="$(InputName).rc;$(InputName).h"
 					Outputs="$(InputName).rc;$(InputName).h"
 				/>
 				/>
 			</FileConfiguration>
 			</FileConfiguration>
@@ -714,7 +714,7 @@
 				<Tool
 				<Tool
 					Name="VCCustomBuildTool"
 					Name="VCCustomBuildTool"
 					Description="Compiling messages"
 					Description="Compiling messages"
-					CommandLine="mc -A $(InputDir)/$(InputName).mc -r $(InputDir) -h $(InputDir)&#x0D;&#x0A;"
+					CommandLine="mc -A $(InputName).mc -r . -h ."
 					AdditionalDependencies=""
 					AdditionalDependencies=""
 					Outputs="$(InputName).rc;$(InputName).h"
 					Outputs="$(InputName).rc;$(InputName).h"
 				/>
 				/>
@@ -725,7 +725,7 @@
 				<Tool
 				<Tool
 					Name="VCCustomBuildTool"
 					Name="VCCustomBuildTool"
 					Description="Compiling messages"
 					Description="Compiling messages"
-					CommandLine="mc -A $(InputDir)/$(InputName).mc -r $(InputDir) -h $(InputDir)&#x0D;&#x0A;"
+					CommandLine="mc -A $(InputName).mc -r . -h ."
 					AdditionalDependencies=""
 					AdditionalDependencies=""
 					Outputs="$(InputName).rc;$(InputName).h"
 					Outputs="$(InputName).rc;$(InputName).h"
 				/>
 				/>