Commit: 2ee418d5d0095069672ab0de6c01ae07336756e0 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 2ee418d5d0095069672ab0de6c01ae07336756e0 (tree)
• Zeit: 2012-01-16 21:52:22
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Merge commit '03151a6ab14a8ba2d0c163d97e596ae093003712' into test

Ändern Zusammenfassung

• modified: FFFTP.vc80ee.sln
• modified: FFFTP.vc80ee.vcproj
• modified: FFFTP_English.vc80ee.vcproj
• add: Resource/ReplaceAfxresh.js

Diff

--- a/FFFTP.vc80ee.sln
+++ b/FFFTP.vc80ee.sln
@@ -1,10 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FFFTP", "FFFTP.vcproj", "{5D9496DB-45AF-4389-8FEE-27C9A2FA207A}"
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FFFTP.vc80", "FFFTP.vc80ee.vcproj", "{5D9496DB-45AF-4389-8FEE-27C9A2FA207A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FFFTP_English", "FFFTP_English.vcproj", "{EE7CC1BD-92A9-46D5-8270-386BD7BEEA55}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PuTTY", "putty\PuTTY.vcproj", "{AF1981EB-379B-43B8-BE66-298194297B5C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FFFTP_English.vc80", "FFFTP_English.vc80ee.vcproj", "{EE7CC1BD-92A9-46D5-8270-386BD7BEEA55}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -30,14 +28,6 @@ Global
 		{EE7CC1BD-92A9-46D5-8270-386BD7BEEA55}.Release|Win32.Build.0 = Release|Win32
 		{EE7CC1BD-92A9-46D5-8270-386BD7BEEA55}.Release|x64.ActiveCfg = Release|x64
 		{EE7CC1BD-92A9-46D5-8270-386BD7BEEA55}.Release|x64.Build.0 = Release|x64
-		{AF1981EB-379B-43B8-BE66-298194297B5C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AF1981EB-379B-43B8-BE66-298194297B5C}.Debug|Win32.Build.0 = Debug|Win32
-		{AF1981EB-379B-43B8-BE66-298194297B5C}.Debug|x64.ActiveCfg = Debug|x64
-		{AF1981EB-379B-43B8-BE66-298194297B5C}.Debug|x64.Build.0 = Debug|x64
-		{AF1981EB-379B-43B8-BE66-298194297B5C}.Release|Win32.ActiveCfg = Release|Win32
-		{AF1981EB-379B-43B8-BE66-298194297B5C}.Release|Win32.Build.0 = Release|Win32
-		{AF1981EB-379B-43B8-BE66-298194297B5C}.Release|x64.ActiveCfg = Release|x64
-		{AF1981EB-379B-43B8-BE66-298194297B5C}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--- a/FFFTP.vc80ee.vcproj
+++ b/FFFTP.vc80ee.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="FFFTP"
+	Name="FFFTP.vc80"
 	ProjectGUID="{5D9496DB-45AF-4389-8FEE-27C9A2FA207A}"
 	RootNamespace="FFFTP"
 	>
@@ -28,6 +28,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cscript //nologo Resource\ReplaceAfxresh.js Resource\FFFTP.rc Resource\FFFTP._replaced_.rc&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -73,7 +74,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
+				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib user32.lib shell32.lib gdi32.lib ole32.lib comdlg32.lib advapi32.lib"
 				OutputFile=".\Debug\FFFTP.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -120,6 +121,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cscript //nologo Resource\ReplaceAfxresh.js Resource\FFFTP.rc Resource\FFFTP._replaced_.rc&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -167,7 +169,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
+				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib user32.lib shell32.lib gdi32.lib ole32.lib comdlg32.lib advapi32.lib"
 				OutputFile=".\Release\FFFTP.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -440,8 +442,28 @@
 				>
 			</File>
 			<File
+				RelativePath=".\Resource\FFFTP._replaced_.rc"
+				>
+			</File>
+			<File
 				RelativePath=".\Resource\ffftp.rc"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\filelist.c"

--- a/FFFTP_English.vc80ee.vcproj
+++ b/FFFTP_English.vc80ee.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="FFFTP_English"
+	Name="FFFTP_English.vc80"
 	ProjectGUID="{EE7CC1BD-92A9-46D5-8270-386BD7BEEA55}"
 	RootNamespace="FFFTP_English"
 	>
@@ -28,6 +28,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cscript //nologo Resource\ReplaceAfxresh.js Resource_eng\FFFTP-eng.rc Resource_eng\FFFTP-eng._replaced_.rc&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -74,7 +75,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
+				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib user32.lib shell32.lib gdi32.lib ole32.lib comdlg32.lib advapi32.lib"
 				OutputFile=".\FFFTP_Eng_Debug\FFFTP.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -121,6 +122,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				CommandLine="cscript //nologo Resource\ReplaceAfxresh.js Resource_eng\FFFTP-eng.rc Resource_eng\FFFTP-eng._replaced_.rc&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -167,7 +169,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib"
+				AdditionalDependencies="comctl32.lib crypt32.lib htmlhelp.lib imagehlp.lib rasapi32.lib sfc.lib winmm.lib wintrust.lib wsock32.lib user32.lib shell32.lib gdi32.lib ole32.lib comdlg32.lib advapi32.lib"
 				OutputFile=".\FFFTP_Eng_Release\FFFTP.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -440,8 +442,28 @@
 				>
 			</File>
 			<File
+				RelativePath=".\Resource_eng\FFFTP-eng._replaced_.rc"
+				>
+			</File>
+			<File
 				RelativePath=".\Resource_eng\FFFTP-eng.rc"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\filelist.c"

--- /dev/null
+++ b/Resource/ReplaceAfxresh.js
@@ -0,0 +1,32 @@
+function replace_afxres_h_text(s) {
+    if (s.match(/^\s*#include\s*"afxres.h"\s*$/)) {
+        var replaced = "// " + s + "\r\n";
+        replaced += "#include <windows.h>" + "\r\n";
+        replaced += "#define IDC_STATIC -1";
+        return replaced; 
+    }
+    return s;
+}
+function main() {
+    var fromFileName = "";
+    var toFileName = "";
+    var args = WScript.Arguments;
+    if (args.length < 2) {
+        WScript.StdErr.WriteLine("usage: cscript ReplaceAfxresh.js <InResFile> <OutResFile>");
+        return;
+    }
+    fromFileName = args(0);
+    toFileName = args(1);
+    WScript.StdOut.WriteLine("ReplaceAfxresh.js - in: " + fromFileName + ", out: " + toFileName);
+    var fso = new ActiveXObject("Scripting.FileSystemObject");
+    var fi = fso.OpenTextFile(fromFileName, 1, false, -2);
+    var fo = fso.CreateTextFile(toFileName, true, false);
+    while (!fi.AtEndOfStream) {
+        var line = fi.ReadLine();
+        var lineReplaced = replace_afxres_h_text(line);
+        fo.WriteLine(lineReplaced);
+    }
+    fo.Close();
+    fi.Close();
+}
+main();