Skip to content

Commit c1538d0

Browse files
author
zsx
committed
fix bugs in wizard
1 parent c4f436f commit c1538d0

File tree

5 files changed

+45
-4
lines changed

5 files changed

+45
-4
lines changed

‎acl_cpp_vc2010.sln‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "http_rpc_client", "lib_rpc\
116116
EndProject
117117
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "http_rpc_server", "lib_rpc\samples\http_rpc_server\http_rpc_server.vcxproj", "{8D69EA4C-C980-4168-85B6-BAC9CB99E0DC}"
118118
EndProject
119-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{45F520CE-D837-4D25-8A09-E58C9D4F9BA8}"
119+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples_acl_cpp", "samples_acl_cpp", "{45F520CE-D837-4D25-8A09-E58C9D4F9BA8}"
120120
EndProject
121121
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "aio", "aio", "{0C3E1FB7-2436-4CC7-B671-AE907ABF6FDE}"
122122
EndProject
@@ -259,6 +259,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redis_list_vc2010", "lib_ac
259259
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
260260
EndProjectSection
261261
EndProject
262+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{DC80E4B1-1DC2-49D8-9FC3-BD3E60337968}"
263+
EndProject
264+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wizard", "app\wizard\wizard_vc2010.vcxproj", "{84376B60-FF20-4FD0-967E-C568FC2FBC53}"
265+
EndProject
262266
Global
263267
GlobalSection(SolutionConfigurationPlatforms) = preSolution
264268
Debug|Win32 = Debug|Win32
@@ -728,6 +732,16 @@ Global
728732
{EB081E3C-5E45-4881-83F0-34D329F35DAB}.Releasedll|Win32.Build.0 = Releasedll|Win32
729733
{EB081E3C-5E45-4881-83F0-34D329F35DAB}.Template|Win32.ActiveCfg = Release|Win32
730734
{EB081E3C-5E45-4881-83F0-34D329F35DAB}.Template|Win32.Build.0 = Release|Win32
735+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Debug|Win32.ActiveCfg = Debug|Win32
736+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Debug|Win32.Build.0 = Debug|Win32
737+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.DebugDll|Win32.ActiveCfg = Debug|Win32
738+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.DebugDll|Win32.Build.0 = Debug|Win32
739+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Release|Win32.ActiveCfg = Release|Win32
740+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Release|Win32.Build.0 = Release|Win32
741+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Releasedll|Win32.ActiveCfg = Release|Win32
742+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Releasedll|Win32.Build.0 = Release|Win32
743+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Template|Win32.ActiveCfg = Release|Win32
744+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Template|Win32.Build.0 = Release|Win32
731745
EndGlobalSection
732746
GlobalSection(SolutionProperties) = preSolution
733747
HideSolutionNode = FALSE
@@ -782,5 +796,6 @@ Global
782796
{8E015F36-55F9-455E-9A5B-F57C2AE74644} = {7B001BDA-0EFF-4EE0-89E7-C0EECE8955A9}
783797
{20219FF9-CB29-44A1-86A1-FEA70E3EA9D0} = {7B001BDA-0EFF-4EE0-89E7-C0EECE8955A9}
784798
{EB081E3C-5E45-4881-83F0-34D329F35DAB} = {7B001BDA-0EFF-4EE0-89E7-C0EECE8955A9}
799+
{84376B60-FF20-4FD0-967E-C568FC2FBC53} = {DC80E4B1-1DC2-49D8-9FC3-BD3E60337968}
785800
EndGlobalSection
786801
EndGlobal

‎acl_cpp_vc2012.sln‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "master_threads", "lib_acl_c
427427
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
428428
EndProjectSection
429429
EndProject
430+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wizard", "app\wizard\wizard_vc2012.vcxproj", "{84376B60-FF20-4FD0-967E-C568FC2FBC53}"
431+
ProjectSection(ProjectDependencies) = postProject
432+
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
433+
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
434+
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
435+
EndProjectSection
436+
EndProject
430437
Global
431438
GlobalSection(SolutionConfigurationPlatforms) = preSolution
432439
Debug|Win32 = Debug|Win32
@@ -1446,6 +1453,21 @@ Global
14461453
{CD9495C6-83D7-4273-A2B7-6217B67D8999}.Template|Win32.ActiveCfg = DebugDll|Win32
14471454
{CD9495C6-83D7-4273-A2B7-6217B67D8999}.Template|Win32.Build.0 = DebugDll|Win32
14481455
{CD9495C6-83D7-4273-A2B7-6217B67D8999}.Template|x64.ActiveCfg = DebugDll|Win32
1456+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Debug|Win32.ActiveCfg = Debug|Win32
1457+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Debug|Win32.Build.0 = Debug|Win32
1458+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Debug|x64.ActiveCfg = Debug|Win32
1459+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.DebugDll|Win32.ActiveCfg = Debug|Win32
1460+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.DebugDll|Win32.Build.0 = Debug|Win32
1461+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.DebugDll|x64.ActiveCfg = Debug|Win32
1462+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Release|Win32.ActiveCfg = Release|Win32
1463+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Release|Win32.Build.0 = Release|Win32
1464+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Release|x64.ActiveCfg = Release|Win32
1465+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Releasedll|Win32.ActiveCfg = Release|Win32
1466+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Releasedll|Win32.Build.0 = Release|Win32
1467+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Releasedll|x64.ActiveCfg = Release|Win32
1468+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Template|Win32.ActiveCfg = Release|Win32
1469+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Template|Win32.Build.0 = Release|Win32
1470+
{84376B60-FF20-4FD0-967E-C568FC2FBC53}.Template|x64.ActiveCfg = Release|Win32
14491471
EndGlobalSection
14501472
GlobalSection(SolutionProperties) = preSolution
14511473
HideSolutionNode = FALSE
@@ -1510,6 +1532,7 @@ Global
15101532
{640ABB35-FBD3-4D34-A382-9ED8CF3FCE34} = {267F658E-44AF-4080-8577-EFCE99A5E030}
15111533
{4B58485B-D846-4485-9C5E-7F2304D71701} = {267F658E-44AF-4080-8577-EFCE99A5E030}
15121534
{D232833B-57A9-4167-B37C-A4594953F93D} = {3CC8D45A-8E3F-4F5C-A7DF-4D8027E4EA9C}
1535+
{84376B60-FF20-4FD0-967E-C568FC2FBC53} = {3CC8D45A-8E3F-4F5C-A7DF-4D8027E4EA9C}
15131536
{3C74E826-5E72-48A1-9DFD-777F4A7C9E1F} = {D232833B-57A9-4167-B37C-A4594953F93D}
15141537
{B59C7CB6-5708-4522-B833-CEB160AA4817} = {D232833B-57A9-4167-B37C-A4594953F93D}
15151538
{2DABFAD1-114B-4F96-9185-DC0C56A3662D} = {C799E376-2F01-4877-AF18-7F3CC8B95792}

‎app/wizard/http_creator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void http_creator()
135135
if (n == ACL_VSTREAM_EOF)
136136
break;
137137
if (n == 0)
138-
::snprintf(buf, sizeof(buf), "http_demo");
138+
acl::safe_snprintf(buf, sizeof(buf), "http_demo");
139139

140140
tmpl.set_project_name(buf);
141141
// 创建目录

‎app/wizard/master_creator.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void master_creator()
131131
if (n == ACL_VSTREAM_EOF)
132132
break;
133133
if (n == 0)
134-
::snprintf(buf, sizeof(buf), "master_service");
134+
acl::safe_snprintf(buf, sizeof(buf), "master_service");
135135

136136
tmpl.set_project_name(buf);
137137
// 创建目录

‎app/wizard/wizard_vc2012.vcxproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,12 @@
7373
</ItemDefinitionGroup>
7474
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7575
<ClCompile>
76-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
76+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7777
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
7878
<PrecompiledHeader>Use</PrecompiledHeader>
7979
<WarningLevel>Level3</WarningLevel>
8080
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
81+
<AdditionalIncludeDirectories>..\..\lib_acl\include;..\..\lib_protocol\include;..\..\lib_acl_cpp\include;</AdditionalIncludeDirectories>
8182
</ClCompile>
8283
<Link>
8384
<OutputFile>$(OutDir)wizard.exe</OutputFile>
@@ -86,6 +87,8 @@
8687
<OptimizeReferences>true</OptimizeReferences>
8788
<EnableCOMDATFolding>true</EnableCOMDATFolding>
8889
<TargetMachine>MachineX86</TargetMachine>
90+
<AdditionalLibraryDirectories>..\..\dist\lib\win32;</AdditionalLibraryDirectories>
91+
<AdditionalDependencies>lib_acl_cpp_vc2012.lib;lib_acl_vc2012.lib;lib_protocol_vc2012.lib;%(AdditionalDependencies)</AdditionalDependencies>
8992
</Link>
9093
</ItemDefinitionGroup>
9194
<ItemGroup>

0 commit comments

Comments
 (0)