Skip to content

Commit af36b29

Browse files
author
zhengshuxin
committed
Seperate samples with c and c++ for fiber module.
1 parent 20b36c3 commit af36b29

File tree

486 files changed

+83
-46
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

486 files changed

+83
-46
lines changed

acl_cpp_vc2012.sln

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -723,13 +723,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfiber", "lib_fiber\c\lib
723723
EndProject
724724
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fiber", "fiber", "{D75ACD1D-AD2A-4A16-B761-6EA5202D5EA5}"
725725
EndProject
726-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fiber", "lib_fiber\samples\fiber\fiber_vc2012.vcxproj", "{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}"
726+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fiber", "lib_fiber\samples-c\fiber\fiber_vc2012.vcxproj", "{BFCE4280-B6E5-414A-A8CD-F827A4A19B6F}"
727727
EndProject
728-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server2", "lib_fiber\samples\server2\server2_vc2012.vcxproj", "{EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}"
728+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server2", "lib_fiber\samples-c\server2\server2_vc2012.vcxproj", "{EE518BE5-94B2-4F8E-82CC-C08503BBD6B2}"
729729
EndProject
730-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client2", "lib_fiber\samples\client2\client2_vc2012.vcxproj", "{A08F48F5-D359-4332-8743-F9D85887AEF6}"
730+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client2", "lib_fiber\samples-c\client2\client2_vc2012.vcxproj", "{A08F48F5-D359-4332-8743-F9D85887AEF6}"
731731
EndProject
732-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinEchod", "lib_fiber\samples\WinEchod\WinEchod.vcxproj", "{F74A61AD-A309-47A5-A7C6-BAC888660BBC}"
732+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinEchod", "lib_fiber\samples-gui\WinEchod\WinEchod.vcxproj", "{F74A61AD-A309-47A5-A7C6-BAC888660BBC}"
733733
ProjectSection(ProjectDependencies) = postProject
734734
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
735735
{A456325D-93BC-4656-8F07-A75F5526DF53} = {A456325D-93BC-4656-8F07-A75F5526DF53}

acl_cpp_vc2019.sln

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "lib_fiber\samples
4949
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
5050
EndProjectSection
5151
EndProject
52-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "master_fiber", "lib_fiber\samples\master_fiber\master_fiber_vc2019.vcxproj", "{3E725148-0807-4CBA-8FC1-7FCA46F605F3}"
52+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "master_fiber", "lib_fiber\samples-c++\master_fiber\master_fiber_vc2019.vcxproj", "{3E725148-0807-4CBA-8FC1-7FCA46F605F3}"
5353
ProjectSection(ProjectDependencies) = postProject
5454
{F2479E2C-7267-436C-A1F1-A63B39E7CB30} = {F2479E2C-7267-436C-A1F1-A63B39E7CB30}
5555
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
@@ -111,15 +111,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpc", "lib_fiber\samples-
111111
EndProject
112112
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redis_list", "lib_acl_cpp\samples\redis\redis_list\redis_list_vc2019.vcxproj", "{1D669177-07FD-4DDD-A13E-52A7DF19CA62}"
113113
EndProject
114-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client2", "lib_fiber\samples\client2\client2_vc2019.vcxproj", "{A08F48F5-D359-4332-8743-F9D85887AEF6}"
114+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client2", "lib_fiber\samples-c\client2\client2_vc2019.vcxproj", "{A08F48F5-D359-4332-8743-F9D85887AEF6}"
115115
ProjectSection(ProjectDependencies) = postProject
116116
{AD99B75A-40BF-46DC-844B-23417FDC8690} = {AD99B75A-40BF-46DC-844B-23417FDC8690}
117117
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
118118
EndProjectSection
119119
EndProject
120120
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fiber", "fiber", "{57B0C6FC-DDAE-41EC-8E04-2D2D8E803D7A}"
121121
EndProject
122-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server2", "lib_fiber\samples\server2\server2_vc2019.vcxproj", "{7F39A2AE-FE11-4C92-A174-269BE486DE4D}"
122+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server2", "lib_fiber\samples-c\server2\server2_vc2019.vcxproj", "{7F39A2AE-FE11-4C92-A174-269BE486DE4D}"
123123
ProjectSection(ProjectDependencies) = postProject
124124
{AD99B75A-40BF-46DC-844B-23417FDC8690} = {AD99B75A-40BF-46DC-844B-23417FDC8690}
125125
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
@@ -144,7 +144,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpd_proxy", "app\wizard_d
144144
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
145145
EndProjectSection
146146
EndProject
147-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fiber_tbox", "lib_fiber\samples\fiber_tbox\fiber_tbox.vcxproj", "{92668907-1B34-4B74-98A2-5849FDE67B34}"
147+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fiber_tbox", "lib_fiber\samples-c++\fiber_tbox\fiber_tbox.vcxproj", "{92668907-1B34-4B74-98A2-5849FDE67B34}"
148148
EndProject
149149
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dns-gate", "app\wizard_demo\dns-gate\service\dns-gate_vc2019.vcxproj", "{7D4D4DD5-E3E7-4D35-BA76-B451974F1E88}"
150150
EndProject

acl_cpp_vc2022.sln

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redis_ssl", "lib_acl_cpp\sa
4040
EndProject
4141
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fiber_cpp", "fiber_cpp", "{FD628E34-FBB8-4C60-8176-B770EC631CD9}"
4242
EndProject
43-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "master_fiber", "lib_fiber\samples\master_fiber\master_fiber_vc2022.vcxproj", "{3E725148-0807-4CBA-8FC1-7FCA46F605F3}"
43+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "master_fiber", "lib_fiber\samples-c++\master_fiber\master_fiber_vc2022.vcxproj", "{3E725148-0807-4CBA-8FC1-7FCA46F605F3}"
4444
ProjectSection(ProjectDependencies) = postProject
4545
{F2479E2C-7267-436C-A1F1-A63B39E7CB30} = {F2479E2C-7267-436C-A1F1-A63B39E7CB30}
4646
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
@@ -102,15 +102,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "httpc", "lib_fiber\samples-
102102
EndProject
103103
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "redis_list", "lib_acl_cpp\samples\redis\redis_list\redis_list_vc2022.vcxproj", "{1D669177-07FD-4DDD-A13E-52A7DF19CA62}"
104104
EndProject
105-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client2", "lib_fiber\samples\client2\client2_vc2022.vcxproj", "{A08F48F5-D359-4332-8743-F9D85887AEF6}"
105+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client2", "lib_fiber\samples-c\client2\client2_vc2022.vcxproj", "{A08F48F5-D359-4332-8743-F9D85887AEF6}"
106106
ProjectSection(ProjectDependencies) = postProject
107107
{AD99B75A-40BF-46DC-844B-23417FDC8690} = {AD99B75A-40BF-46DC-844B-23417FDC8690}
108108
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
109109
EndProjectSection
110110
EndProject
111111
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fiber", "fiber", "{57B0C6FC-DDAE-41EC-8E04-2D2D8E803D7A}"
112112
EndProject
113-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server2", "lib_fiber\samples\server2\server2_vc2022.vcxproj", "{7F39A2AE-FE11-4C92-A174-269BE486DE4D}"
113+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server2", "lib_fiber\samples-c\server2\server2_vc2022.vcxproj", "{7F39A2AE-FE11-4C92-A174-269BE486DE4D}"
114114
ProjectSection(ProjectDependencies) = postProject
115115
{AD99B75A-40BF-46DC-844B-23417FDC8690} = {AD99B75A-40BF-46DC-844B-23417FDC8690}
116116
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
@@ -126,7 +126,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aio_client", "lib_acl\sampl
126126
EndProject
127127
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aio_client2", "lib_acl\samples\aio\client2\aio_client2_vc2022.vcxproj", "{4A56E6AE-448C-4D98-AB7F-3C077ECABE24}"
128128
EndProject
129-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fiber_tbox", "lib_fiber\samples\fiber_tbox\fiber_tbox_vc2022.vcxproj", "{92668907-1B34-4B74-98A2-5849FDE67B34}"
129+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fiber_tbox", "lib_fiber\samples-c++\fiber_tbox\fiber_tbox_vc2022.vcxproj", "{92668907-1B34-4B74-98A2-5849FDE67B34}"
130130
EndProject
131131
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "https_request", "lib_acl_cpp\samples\ssl\https_request\https_request_vc2022.vcxproj", "{4D42F462-A2FE-4B4A-A680-93668FA128A6}"
132132
EndProject

lib_fiber/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ lib_fiber:
1010
@(cd cpp; make)
1111

1212
all: lib_fiber
13-
@(cd samples; make)
13+
@(cd samples-c; make)
14+
@(cd samples-c++; make)
1415

1516
clean cl:
1617
@(cd c; make clean)
1718
@(cd cpp; make clean)
18-
@(cd samples; make clean)
19+
@(cd samples-c; make clean)
20+
@(cd samples-c++; make clean)
1921

2022

2123
packinstall:

lib_fiber/samples-c++/Makefile

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
2+
all:
3+
@(cd httpd; make)
4+
@(cd httpd3; make)
5+
@(cd httpd4; make)
6+
@(cd redis; make)
7+
@(cd redis_threads; make)
8+
@(cd redis_channel; make)
9+
@(cd master_fiber; make)
10+
@(cd master_proxy; make)
11+
@(cd fiber_cpp; make)
12+
@(cd channel_cpp; make)
13+
# @(cd https_client; make)
14+
# @(cd https_server; make)
15+
@(cd mysql; make)
16+
@(cd tcp_server; make)
17+
@(cd tcp_client; make)
18+
@(cd fiber_tbox; make)
19+
20+
cl clean:
21+
@(cd httpd; make clean)
22+
@(cd httpd3; make clean)
23+
@(cd httpd4; make clean)
24+
@(cd redis; make clean)
25+
@(cd redis_threads; make clean)
26+
@(cd redis_channel; make clean)
27+
@(cd master_fiber; make clean)
28+
@(cd master_proxy; make clean)
29+
@(cd fiber_cpp; make clean)
30+
@(cd channel_cpp; make clean)
31+
@(cd https_client; make clean)
32+
@(cd https_server; make clean)
33+
@(cd mysql; make clean)
34+
@(cd tcp_server; make clean)
35+
@(cd tcp_client; make clean)
36+
@(cd fiber_tbox; make clean)
37+
38+
rebuild rb: clean all
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)