Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_50753323
TDengine
提交
a447b147
T
TDengine
项目概览
qq_50753323
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a447b147
编写于
11月 07, 2019
作者:
S
slguan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix some compilation and packaging problems under windows
上级
c2f65ef0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
15 addition
and
5 deletion
+15
-5
CMakeLists.txt
CMakeLists.txt
+1
-1
src/connector/jdbc/CMakeLists.txt
src/connector/jdbc/CMakeLists.txt
+1
-1
src/os/windows/inc/os.h
src/os/windows/inc/os.h
+2
-0
src/os/windows/src/twindows.c
src/os/windows/src/twindows.c
+8
-0
src/util/src/version.c
src/util/src/version.c
+3
-3
未找到文件。
CMakeLists.txt
浏览文件 @
a447b147
...
...
@@ -166,7 +166,7 @@ ELSEIF (TD_WINDOWS)
INSTALL
(
TARGETS taos RUNTIME DESTINATION driver
)
INSTALL
(
TARGETS shell RUNTIME DESTINATION .
)
IF
(
TD_MVN_INSTALLED
)
INSTALL
(
FILES
${
LIBRARY_OUTPUT_PATH
}
/taos-jdbcdriver-1.0.1
-dist.jar DESTINATION connector/jdbc
)
INSTALL
(
FILES
${
LIBRARY_OUTPUT_PATH
}
/taos-jdbcdriver-1.0.2
-dist.jar DESTINATION connector/jdbc
)
ENDIF
()
ENDIF
()
...
...
src/connector/jdbc/CMakeLists.txt
浏览文件 @
a447b147
...
...
@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
ADD_CUSTOM_COMMAND
(
OUTPUT
${
JDBC_CMD_NAME
}
POST_BUILD
COMMAND mvn -Dmaven.test.skip=true install -f
${
CMAKE_CURRENT_SOURCE_DIR
}
/pom.xml
COMMAND
${
CMAKE_COMMAND
}
-E copy
${
CMAKE_CURRENT_SOURCE_DIR
}
/target/taos-jdbcdriver-
*
.jar
${
LIBRARY_OUTPUT_PATH
}
COMMAND
${
CMAKE_COMMAND
}
-E copy
${
CMAKE_CURRENT_SOURCE_DIR
}
/target/taos-jdbcdriver-
1.0.2-dist
.jar
${
LIBRARY_OUTPUT_PATH
}
COMMAND mvn -Dmaven.test.skip=true clean -f
${
CMAKE_CURRENT_SOURCE_DIR
}
/pom.xml
COMMENT
"build jdbc driver"
)
ADD_CUSTOM_TARGET
(
${
JDBC_TARGET_NAME
}
ALL WORKING_DIRECTORY
${
EXECUTABLE_OUTPUT_PATH
}
DEPENDS
${
JDBC_CMD_NAME
}
)
...
...
src/os/windows/inc/os.h
浏览文件 @
a447b147
...
...
@@ -76,8 +76,10 @@ extern "C" {
int32_t
__sync_val_compare_and_swap_32
(
int32_t
*
ptr
,
int32_t
oldval
,
int32_t
newval
);
int32_t
__sync_add_and_fetch_32
(
int32_t
*
ptr
,
int32_t
val
);
int32_t
__sync_sub_and_fetch_32
(
int32_t
*
ptr
,
int32_t
val
);
int64_t
__sync_val_compare_and_swap_64
(
int64_t
*
ptr
,
int64_t
oldval
,
int64_t
newval
);
int64_t
__sync_add_and_fetch_64
(
int64_t
*
ptr
,
int64_t
val
);
int64_t
__sync_sub_and_fetch_64
(
int64_t
*
ptr
,
int64_t
val
);
int32_t
__sync_val_load_32
(
int32_t
*
ptr
);
void
__sync_val_restore_32
(
int32_t
*
ptr
,
int32_t
newval
);
...
...
src/os/windows/src/twindows.c
浏览文件 @
a447b147
...
...
@@ -70,6 +70,10 @@ int32_t __sync_add_and_fetch_32(int32_t *ptr, int32_t val) {
return
InterlockedAdd
(
ptr
,
val
);
}
int32_t
__sync_sub_and_fetch_32
(
int32_t
*
ptr
,
int32_t
val
)
{
return
InterlockedAdd
(
ptr
,
-
val
);
}
int64_t
__sync_val_compare_and_swap_64
(
int64_t
*
ptr
,
int64_t
oldval
,
int64_t
newval
)
{
return
InterlockedCompareExchange64
(
ptr
,
newval
,
oldval
);
}
...
...
@@ -78,6 +82,10 @@ int64_t __sync_add_and_fetch_64(int64_t *ptr, int64_t val) {
return
InterlockedAdd64
(
ptr
,
val
);
}
int64_t
__sync_sub_and_fetch_64
(
int64_t
*
ptr
,
int64_t
val
)
{
return
InterlockedAdd64
(
ptr
,
-
val
);
}
int32_t
__sync_val_load_32
(
int32_t
*
ptr
)
{
return
InterlockedOr
(
ptr
,
0
);
}
...
...
src/util/src/version.c
浏览文件 @
a447b147
char
version
[
64
]
=
"1.6.3.
0
"
;
char
version
[
64
]
=
"1.6.3.
1
"
;
char
compatible_version
[
64
]
=
"1.6.1.0"
;
char
gitinfo
[
128
]
=
"
49080adeee33c95d1174ac96eca9e62536e2da0f
"
;
char
buildinfo
[
512
]
=
"Built by ubuntu at 2019-1
0-21 19:33
"
;
char
gitinfo
[
128
]
=
"
c2f65ef028b41213c8c731778eff019814bd0538
"
;
char
buildinfo
[
512
]
=
"Built by ubuntu at 2019-1
1-07 11:17
"
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录