test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-12-02 03:47:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

compile acl on MSYS.

Browse Source
This commit is contained in:
zhengshuxin 2017-02-21 22:35:31 +08:00
parent 193ac62bf2
commit e5f7aa1b54
38 changed files with 11286 additions and 6805 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
acl_cpp_vc2012.sln
View File

@ -713,6 +713,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mmap", "lib_acl\samples\mma
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fstream", "lib_acl\samples\fstream\fstream_vc2012.vcxproj", "{5D57BF9A-188B-4250-991C-74264A146EAE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "lib_acl_cpp\samples\sqlite\sqlite_vc2012.vcxproj", "{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}"
ProjectSection(ProjectDependencies) = postProject
{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Mixed Platforms = Debug|Mixed Platforms
@ -3452,6 +3459,36 @@ Global
{5D57BF9A-188B-4250-991C-74264A146EAE}.Template|Win32.Build.0 = DebugDll|Win32
{5D57BF9A-188B-4250-991C-74264A146EAE}.Template|x64.ActiveCfg = DebugDll|x64
{5D57BF9A-188B-4250-991C-74264A146EAE}.Template|x64.Build.0 = DebugDll|x64
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Debug|Win32.ActiveCfg = Debug|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Debug|Win32.Build.0 = Debug|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Debug|x64.ActiveCfg = Debug|x64
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Debug|x64.Build.0 = Debug|x64
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.DebugDll|Win32.Build.0 = DebugDll|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.DebugDll|x64.ActiveCfg = DebugDll|x64
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.DebugDll|x64.Build.0 = DebugDll|x64
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Release|Mixed Platforms.Build.0 = Release|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Release|Win32.ActiveCfg = Release|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Release|Win32.Build.0 = Release|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Release|x64.ActiveCfg = Release|x64
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Release|x64.Build.0 = Release|x64
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Releasedll|Win32.ActiveCfg = ReleaseDll|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Releasedll|Win32.Build.0 = ReleaseDll|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Releasedll|x64.ActiveCfg = ReleaseDll|x64
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Releasedll|x64.Build.0 = ReleaseDll|x64
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Template|Mixed Platforms.ActiveCfg = DebugDll|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Template|Mixed Platforms.Build.0 = DebugDll|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Template|Win32.ActiveCfg = DebugDll|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Template|Win32.Build.0 = DebugDll|Win32
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Template|x64.ActiveCfg = DebugDll|x64
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Template|x64.Build.0 = DebugDll|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -3523,6 +3560,7 @@ Global
{2495A6D4-777F-48BF-99C0-702E4A11FD23} = {FB676B5A-D82C-45CB-9E1F-F3793419DDA9}
{EB430C52-31E4-4018-AD8A-8F56ADAD586A} = {FB676B5A-D82C-45CB-9E1F-F3793419DDA9}
{A3F59765-4327-4A1F-82EF-AE0FF3D81503} = {FB676B5A-D82C-45CB-9E1F-F3793419DDA9}
{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB} = {FB676B5A-D82C-45CB-9E1F-F3793419DDA9}
{640ABB35-FBD3-4D34-A382-9ED8CF3FCE34} = {267F658E-44AF-4080-8577-EFCE99A5E030}
{4B58485B-D846-4485-9C5E-7F2304D71701} = {267F658E-44AF-4080-8577-EFCE99A5E030}
{9073FA9F-26A1-482C-91D0-876434C3E4EB} = {267F658E-44AF-4080-8577-EFCE99A5E030}

14
app/Makefile.in
View File

@ -42,6 +42,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
SYSLIB += -lcrypt
endif
# For MINGW
ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
SYSLIB = -lpthread-2 -liconv -lz
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv -lz
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

14
app/gson/Makefile.in
View File

@ -42,6 +42,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
SYSLIB += -lcrypt
endif
# For MINGW
ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

22
app/gson/test/Makefile.in
View File

@ -2,16 +2,16 @@ CC = g++
CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
-Wno-long-long \
-Wpointer-arith -Werror -Wshadow -O3 \
-Wpointer-arith -Wshadow -O3 \
-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_USE_FAST_MACRO
#-Werror
###########################################################
#Check system:
# Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
SYSLIB = -lpthread -lz
CHECKSYSRES = @echo "Unknow system type!";exit 1
UNIXNAME = $(shell uname -sm)
OSTYPE = $(shell uname -p)
UNIXNAME = $(shell uname -s)
OSTYPE = $(shell uname -m)
RPATH = linux64
ifeq ($(CC),)
@ -51,6 +51,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
SYSLIB += -lcrypt
endif
# For MINGW
ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

18
app/master_dispatch/manager/Makefile.in
View File

@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
# Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
SYSLIB = -lpthread -lcrypt -lz
CHECKSYSRES = @echo "Unknow system type!";exit 1
UNIXNAME = $(shell uname -sm)
OSTYPE = $(shell uname -p)
UNIXNAME = $(shell uname -s)
OSTYPE = $(shell uname -m)
RPATH = linux64
ifeq ($(CC),)
@ -42,6 +42,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
CFLAGS += -DLINUX2 -D_REENTRANT
endif
# For MINGW
ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
SYSLIB = -lpthread-2 -liconv -lz
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv -lz
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

18
app/master_dispatch/server/Makefile.in
View File

@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
# Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
SYSLIB = -lpthread -lcrypt -lz
CHECKSYSRES = @echo "Unknow system type!";exit 1
UNIXNAME = $(shell uname -sm)
OSTYPE = $(shell uname -p)
UNIXNAME = $(shell uname -s)
OSTYPE = $(shell uname -m)
RPATH = linux64
ifeq ($(CC),)
@ -41,6 +41,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
CFLAGS += -DLINUX2 -D_REENTRANT
endif
# For MINGW
ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
SYSLIB = -lpthread-2 -liconv -lz
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv -lz
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

18
app/master_dispatch/test/server/Makefile.in
View File

@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
# Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
SYSLIB = -lpthread -lcrypt -lz
CHECKSYSRES = @echo "Unknow system type!";exit 1
UNIXNAME = $(shell uname -sm)
OSTYPE = $(shell uname -p)
UNIXNAME = $(shell uname -s)
OSTYPE = $(shell uname -m)
RPATH = linux64
ifeq ($(CC),)
@ -41,6 +41,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
CFLAGS += -DLINUX2 -D_REENTRANT
endif
# For MINGW
ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
SYSLIB = -lpthread-2 -liconv -lz
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv -lz
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

18
app/redis_tools/redis_builder/Makefile.in
View File

@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
# Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
SYSLIB = -lpthread -lz
CHECKSYSRES = @echo "Unknow system type!";exit 1
UNIXNAME = $(shell uname -sm)
OSTYPE = $(shell uname -p)
UNIXNAME = $(shell uname -s)
OSTYPE = $(shell uname -m)
RPATH = linux64
ifeq ($(CC),)
@ -61,6 +61,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
SYSLIB += -lcrypt
endif
# For MINGW
ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

18
app/wizard/tmpl/Makefile.in
View File

@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
# Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
SYSLIB = -lpthread -lz
CHECKSYSRES = @echo "Unknow system type!";exit 1
UNIXNAME = $(shell uname -sm)
OSTYPE = $(shell uname -p)
UNIXNAME = $(shell uname -s)
OSTYPE = $(shell uname -m)
RPATH = linux64
ifeq ($(CC),)
@ -52,6 +52,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
SYSLIB += -lcrypt
endif
# For MINGW
ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

18
app/wizard/tmpl/Makefile_fiber.in
View File

@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
# Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
SYSLIB = -lpthread -lz -ldl
CHECKSYSRES = @echo "Unknow system type!";exit 1
UNIXNAME = $(shell uname -sm)
OSTYPE = $(shell uname -p)
UNIXNAME = $(shell uname -s)
OSTYPE = $(shell uname -m)
RPATH = linux64
ifeq ($(CC),)
@ -52,6 +52,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
SYSLIB += -lcrypt
endif
# For MINGW
ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

18
app/wizard_demo/fiber_chat/Makefile.in
View File

@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
# Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
SYSLIB = -lpthread -lz -ldl
CHECKSYSRES = @echo "Unknow system type!";exit 1
UNIXNAME = $(shell uname -sm)
OSTYPE = $(shell uname -p)
UNIXNAME = $(shell uname -s)
OSTYPE = $(shell uname -m)
RPATH = linux64
ifeq ($(CC),)
@ -52,6 +52,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
SYSLIB += -lcrypt
endif
# For MINGW
ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

18
app/wizard_demo/httpd_download/Makefile.in
View File

@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
# Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
SYSLIB = -lpthread -lz
CHECKSYSRES = @echo "Unknow system type!";exit 1
UNIXNAME = $(shell uname -sm)
OSTYPE = $(shell uname -p)
UNIXNAME = $(shell uname -s)
OSTYPE = $(shell uname -m)
RPATH = linux64
ifeq ($(CC),)
@ -51,6 +51,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
SYSLIB += -lcrypt
endif
# For MINGW
ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

18
app/wizard_demo/httpd_upload/Makefile.in
View File

@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
# Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
SYSLIB = -lpthread -lz
CHECKSYSRES = @echo "Unknow system type!";exit 1
UNIXNAME = $(shell uname -sm)
OSTYPE = $(shell uname -p)
UNIXNAME = $(shell uname -s)
OSTYPE = $(shell uname -m)
RPATH = linux64
ifeq ($(CC),)
@ -52,6 +52,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
SYSLIB += -lcrypt
endif
# For MINGW
ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

2
changes.txt
View File

@ -1,5 +1,7 @@
修改历史列表：
------------------------------------------------------------------------
102) 2017.2.21
102.1) compile: 在 MSYS 编译通过
101) 2016.11.3 --- acl 3.2.2.2 版本发布！
100) 2016.11.2 --- acl 3.2.2.1 版本发布！
99) 2016.11.1 --- acl 3.2.2 版本发布！

5121
include/sqlite/sqlite3.h
View File

File diff suppressed because it is too large Load Diff

14
lib_acl/Makefile
View File

@ -43,9 +43,11 @@ CFLAGS = -c -g -W \
# Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
SYSLIB = -lpthread
CHECKSYSRES = @echo "Unknow system type!";exit 1
UNIXNAME = $(shell uname -sm)
#UNIXNAME = $(shell uname -sm)
UNIXNAME = $(shell uname -s)
UNIXTYPE = LINUX
OSTYPE = $(shell uname -p)
#OSTYPE = $(shell uname -p)
OSTYPE = $(shell uname -m)
RPATH =
ifeq ($(CC),)
@ -125,6 +127,14 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
RPATH = mingw
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
SYSLIB = -lpthread-2
RPATH = mingw
endif
# For SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

7
lib_acl/samples/Makefile.in
View File

@ -76,6 +76,13 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
CFLAGS += -DLINUX2 -DMINGW
SYSLIB = -lpthread-2 -rdynamic
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

7
lib_acl/samples/Makefile_cpp.in
View File

@ -68,6 +68,13 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

7
lib_acl/samples/aio/Makefile.in
View File

@ -44,6 +44,13 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CFLAGS += -DMACOSX

7
lib_acl/samples/master/Makefile.in
View File

@ -46,6 +46,13 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

7
lib_acl/samples/thread/Makefile.in
View File

@ -44,6 +44,13 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For Darwin
ifeq ($(findstring Darwin, $(UNIXNAME)), Darwin)
CFLAGS += -DMACOSX

8
lib_acl/samples/vstream_popen/main.cpp
View File

@ -18,7 +18,7 @@ static void child(int argc acl_unused, char *argv[] acl_unused)
const char *ptr;
int ret, i;
acl_init();
acl_lib_init();
env_list = acl_getenv_list();
acl_vstring_sprintf(vbuf, "env_list(%s)", env_list);
@ -65,7 +65,7 @@ static void child(int argc acl_unused, char *argv[] acl_unused)
printf("%s(%d): child over\r\n", myname, getpid());
fflush(stdout);
acl_end();
acl_lib_end();
}
static void pipe_fd_status(ACL_FILE_HANDLE fd)
@ -99,7 +99,7 @@ static void parent(int argc acl_unused, char *argv[])
char buf[1024];
int ret, i;
acl_init();
acl_lib_init();
printf("%s: pid = %d\r\n", myname, getpid());
command = argv[0];
acl_argv_add(args, command, "-c", NULL);
@ -146,7 +146,7 @@ error_end:
acl_argv_free(env);
acl_argv_free(args);
acl_end();
acl_lib_end();
}
static void usage(const char *procname)

7
lib_acl/samples/vstream_popen2/Makefile
View File

@ -47,6 +47,13 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

7
lib_acl/samples/vstream_popen3/Makefile
View File

@ -47,6 +47,13 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

2
lib_acl/src/event/acl_events.c
View File

@ -62,7 +62,7 @@ static int event_limit(int fdsize)
{
const char *myname = "event_limit";
#ifdef ACL_UNIX
#if defined(ACL_UNIX) && !defined(MINGW)
if ((fdsize = acl_open_limit(fdsize)) < 0) {
acl_msg_fatal("%s: unable to determine open file limit, err=%s",
myname, acl_last_serror());

2
lib_acl/src/stdlib/acl_vstring.c
View File

@ -285,7 +285,7 @@ static void mmap_buf_init(ACL_VSTRING *vp)
#ifdef ACL_UNIX
vp->vbuf.data = (unsigned char*) mmap(NULL, vp->maxlen,
PROT_READ | PROT_WRITE, MAP_SHARED, vp->fd, 0);
if (vp->vbuf.data == MAP_FAILED)
if ((void *) vp->vbuf.data == MAP_FAILED)
acl_msg_fatal("mmap error: %s", acl_last_serror());
#elif defined(_WIN32) || defined(_WIN64)
vp->hmap = CreateFileMapping(vp->fd, NULL, PAGE_READWRITE, 0,

2
lib_acl/src/thread/acl_pthread_pool.c
View File

@ -1002,7 +1002,7 @@ acl_pthread_pool_t *acl_pthread_pool_create(const acl_pthread_pool_attr_t *attr)
__FILE__, __LINE__, myname, acl_last_serror());
}
#if defined(ACL_UNIX) && !defined(__FreeBSD__)
#if defined(ACL_UNIX) && !defined(__FreeBSD__) && !defined(MINGW)
status = pthread_attr_setscope(&thr_pool->attr, PTHREAD_SCOPE_SYSTEM);
if (status != 0) {
SET_ERRNO(status);

6
lib_acl_cpp/Makefile
View File

@ -95,6 +95,12 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

7
lib_acl_cpp/samples/Makefile.in
View File

@ -74,6 +74,13 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -liconv
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(OSNAME)), SunOS)
ifeq ($(findstring 86, $(OSNAME)), 86)

136
lib_acl_cpp/samples/sqlite/sqlite.cpp
View File

@ -151,9 +151,84 @@ static bool tbl_delete(acl::db_handle& db, int n)
return (true);
}
class db_thread : public acl::thread
{
public:
db_thread(acl::db_sqlite& db, acl::locker& lk, int min, int max)
: db_(db), lk_(lk), min_(min), max_(max) {}
~db_thread(void) {}
protected:
// @override
void* run(void)
{
for (int i = min_; i < max_; i++)
{
lk_.lock();
if (tbl_insert(db_, i))
printf(">>insert ok: i=%d, affected: %d\r",
i, db_.affect_count());
else
{
printf(">>insert error: i = %d\r\n", i);
abort();
}
lk_.unlock();
}
printf("\r\n");
printf(">>insert total affect: %d\n", db_.affect_total_count());
int n = 0;
for (int i = min_; i < max_; i++)
{
lk_.lock();
int ret = tbl_select(db_, i);
lk_.unlock();
if (ret >= 0)
{
n += ret;
printf(">>select ok: i=%d, ret=%d\r", i, ret);
}
else
{
printf(">>select error: i = %d\r\n", i);
abort();
}
}
printf("\r\n");
printf(">>select total: %d\r\n", n);
for (int i = min_; i < max_; i++)
{
lk_.lock();
if (tbl_delete(db_, i))
printf(">>delete ok: %d, affected: %d\r",
i, (int) db_.affect_count());
else
{
printf(">>delete error: i = %d\r\n", i);
abort();
}
lk_.unlock();
}
printf("\r\n");
printf(">>delete total affected: %d\n", db_.affect_total_count());
return NULL;
}
private:
acl::db_sqlite& db_;
acl::locker& lk_;
int min_;
int max_;
};
int main(void)
{
acl::acl_cpp_init();
acl::log::stdout_open(true);
acl::stdin_stream in;
acl::stdout_stream out;
@ -180,12 +255,12 @@ int main(void)
// 设置动态库加载的全路径
acl::db_handle::set_loadpath(path);
acl::string dbfile("test.db");
//acl::string dbfile("测试数据库.db");
acl::string dbfile("./数据库路径/二级路径/数据库.db");
// db_sqlite 类对象的声明需在 set_loadpath 之后，因为在 db_sqlite 的
// 构造函数中需要运行加载 libsqlite3.so
acl::db_sqlite db(dbfile);
int max = 100;
acl::db_sqlite db(dbfile, "gbk");
if (db.open() == false)
{
@ -211,51 +286,30 @@ int main(void)
printf(">>PRAGMA encoding: %s\r\n", buf.c_str());
db.show_conf();
acl::meter_time(__FILE__, __LINE__, "---begin insert---");
for (int i = 0; i < max; i++)
{
bool ret = tbl_insert(db, i);
if (ret)
printf(">>insert ok: i=%d, affected: %d\r",
i, db.affect_count());
else
printf(">>insert error: i = %d\r\n", i);
}
printf("\r\n");
printf(">>insert total affect: %d\n", db.affect_total_count());
int max = 10000, nstep = 100;
std::vector<db_thread*> threads;
acl::meter_time(__FILE__, __LINE__, "---end insert---");
acl::meter_time(__FILE__, __LINE__, "---begin select---");
acl::meter_time(__FILE__, __LINE__, "---begin---");
int n = 0;
for (int i = 0; i < max; i++)
acl::locker lk;
int j;
for (int i = 0; i < max; i = j)
{
int ret = tbl_select(db, i);
if (ret >= 0)
{
n += ret;
printf(">>select ok: i=%d, ret=%d\r", i, ret);
j = i + nstep;
db_thread* thread = new db_thread(db, lk, i, j);
threads.push_back(thread);
thread->set_detachable(false);
thread->start();
}
else
printf(">>select error: i = %d\r\n", i);
}
printf("\r\n");
printf(">>select total: %d\r\n", n);
acl::meter_time(__FILE__, __LINE__, "---end select---");
acl::meter_time(__FILE__, __LINE__, "---begin delete---");
for (int i = 0; i < max; i++)
for (std::vector<db_thread*>::iterator it = threads.begin();
it != threads.end(); ++it)
{
bool ret = tbl_delete(db, i);
if (ret)
printf(">>delete ok: %d, affected: %d\r",
i, (int) db.affect_count());
else
printf(">>delete error: i = %d\r\n", i);
(*it)->wait();
delete *it;
}
printf("\r\n");
printf(">>delete total affected: %d\n", db.affect_total_count());
acl::meter_time(__FILE__, __LINE__, "---end delete---");
acl::meter_time(__FILE__, __LINE__, "---end---");
printf("Enter any key to exit.\r\n");
getchar();

354
lib_acl_cpp/samples/sqlite/sqlite_vc2012.vcxproj Normal file
View File

@ -0,0 +1,354 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DebugDll|Win32">
<Configuration>DebugDll</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="DebugDll|x64">
<Configuration>DebugDll</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseDll|Win32">
<Configuration>ReleaseDll</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="ReleaseDll|x64">
<Configuration>ReleaseDll</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<ProjectName>sqlite</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugDll|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|x64'">false</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugDll|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" />
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugDll|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugDll|x64'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" />
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|x64'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>lib_acl_vc2012d.lib;lib_acl_cpp_vc2012d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)sqlite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib\win32;..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)sqlite.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>lib_acl_vc2012d.lib;lib_acl_cpp_vc2012d.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)sqlite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib\win64;..\..\..\dist\lib\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)sqlite.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>lib_acl_vc2012.lib;lib_acl_cpp_vc2012.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)sqlite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalDependencies>lib_acl_vc2012.lib;lib_acl_cpp_vc2012.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)sqlite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;..\..\..\dist\lib\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ACL_CPP_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<OutputFile>$(OutDir)sqlite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)sqlite.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>lib_acl_cpp_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ACL_CPP_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<OutputFile>$(OutDir)sqlite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;..\..\..\dist\lib\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)sqlite.pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>lib_acl_cpp_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;ACL_CPP_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<OutputFile>$(OutDir)sqlite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;..\..\..\dist\lib\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>lib_acl_cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;ACL_CPP_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<OutputFile>$(OutDir)sqlite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;..\..\..\dist\lib\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<AdditionalDependencies>lib_acl_cpp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="sqlite.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugDll|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseDll|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h" />
</ItemGroup>
<ItemGroup>
<None Include="ReadMe.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

23
lib_acl_cpp/src/db/db_sqlite.cpp
View File

@ -1,4 +1,7 @@
#include "acl_stdafx.hpp"
#ifdef ACL_WINDOWS
#include <io.h>
#endif
#include "sqlite3.h"
#ifndef ACL_PREPARE_COMPILE
#include "acl_cpp/stdlib/charset_conv.hpp"
@ -12,7 +15,8 @@
#ifndef STDCALL
# ifdef ACL_WINDOWS
# define STDCALL __stdcall
//# define STDCALL __stdcall
# define STDCALL
# else
# define STDCALL
# endif // ACL_WINDOWS
@ -264,6 +268,7 @@ const char* db_sqlite::get_error() const
else
return "sqlite not opened yet!";
}
bool db_sqlite::dbopen(const char* charset /* = NULL */)
{
// 如果数据库已经打开，则直接返回 true
@ -291,6 +296,22 @@ bool db_sqlite::dbopen(const char* charset /* = NULL */)
else
ptr = buf.c_str();
string path;
string& dir = path.dirname(dbfile_);
#ifdef ACL_WINDOWS
if (!dir.empty() && dir != "." &&
_access(dir.c_str(), 6) == -1 && errno == ENOENT)
#else
if (!dir.empty() && dir != "." &&
access(dir.c_str(), R_OK | W_OK | X_OK) == -1 && errno == ENOENT)
#endif
{
if (acl_make_dirs(dir.c_str(), 0755) == -1)
logger_error("make dirs error %s, dir: %s",
last_serror(), dir.c_str());
}
// 打开 sqlite 数据库
int ret = __sqlite3_open(ptr, &db_);
if (ret != SQLITE_OK)

6
lib_fiber/c/Makefile
View File

@ -90,6 +90,12 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

6
lib_protocol/Makefile
View File

@ -87,6 +87,12 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
# For SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

7
lib_protocol/samples/Makefile.in
View File

@ -71,6 +71,13 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2 -rdynamic
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

7
lib_protocol/samples/Makefile_cpp.in
View File

@ -68,6 +68,13 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX -rdynamic
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX -rdynamic
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

7
lib_protocol/samples/http/Makefile.in
View File

@ -42,6 +42,13 @@ ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
UNIXTYPE = LINUX
endif
# For MSYS
ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
SYSLIB = -lpthread-2
CFLAGS += -DLINUX2 -DMINGW
UNIXTYPE = LINUX
endif
#Path for SunOS
ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
ifeq ($(findstring 86, $(UNIXNAME)), 86)

2
lib_protocol/samples/httpd/main.c
View File

@ -265,7 +265,7 @@ static void test(void)
int main(int argc, char *argv[])
{
char addr[256] = "0.0.0.0:80", filename[256];
char addr[256] = "0.0.0.0:8080", filename[256];
int ch, client_mode = 0;
#if 1