Move files form inculde to subdir qingstor.

qingstor · Feb 24, 2018 · ce13a1e · ce13a1e
1 parent fb00dc4
commit ce13a1e
Show file tree

Hide file tree

Showing 45 changed files with 22 additions and 2 deletions.
diff --git a/include/Bucket.h → include/qingstor/Bucket.h b/include/Bucket.h → include/qingstor/Bucket.h
diff --git a/include/HttpCommon.h → include/qingstor/HttpCommon.h b/include/HttpCommon.h → include/qingstor/HttpCommon.h
diff --git a/include/QingStor.h → include/qingstor/QingStor.h b/include/QingStor.h → include/qingstor/QingStor.h
diff --git a/include/QsBaseType.h → include/qingstor/QsBaseType.h b/include/QsBaseType.h → include/qingstor/QsBaseType.h
diff --git a/include/QsConfig.h → include/qingstor/QsConfig.h b/include/QsConfig.h → include/qingstor/QsConfig.h
diff --git a/include/QsErrors.h → include/qingstor/QsErrors.h b/include/QsErrors.h → include/qingstor/QsErrors.h
diff --git a/include/qingstor/QsSdkOption.h b/include/qingstor/QsSdkOption.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#define BUILD_C_STYLE_INTERFACE
+
+#define QS_SDK_API
+
+#ifdef _WIN32
+#include <stdint.h>
+#endif
+
+typedef enum LogLevel
+{
+    None = 0,
+    Fatal = 1,
+    Error = 2,
+    Warning = 3,
+    Info = 4,
+    Debug = 5,
+    Verbose = 6
+}LogLevel;
diff --git a/include/StringUtils.h → include/qingstor/StringUtils.h b/include/StringUtils.h → include/qingstor/StringUtils.h
diff --git a/include/Types.h → include/qingstor/Types.h b/include/Types.h → include/qingstor/Types.h
diff --git a/...ude/service_with_c_style/QingStorCStyle.h → ...tor/service_with_c_style/QingStorCStyle.h b/...ude/service_with_c_style/QingStorCStyle.h → ...tor/service_with_c_style/QingStorCStyle.h
diff --git a/include/service_with_c_style/QsList.h → ...de/qingstor/service_with_c_style/QsList.h b/include/service_with_c_style/QsList.h → ...de/qingstor/service_with_c_style/QsList.h
diff --git a/include/service_with_c_style/Types.h → ...ude/qingstor/service_with_c_style/Types.h b/include/service_with_c_style/Types.h → ...ude/qingstor/service_with_c_style/Types.h
diff --git a/include/service_with_c_style/types/ACLType.h → ...stor/service_with_c_style/types/ACLType.h b/include/service_with_c_style/types/ACLType.h → ...stor/service_with_c_style/types/ACLType.h
diff --git a/...e/service_with_c_style/types/BucketType.h → ...r/service_with_c_style/types/BucketType.h b/...e/service_with_c_style/types/BucketType.h → ...r/service_with_c_style/types/BucketType.h
diff --git a/...service_with_c_style/types/CORSRuleType.h → ...service_with_c_style/types/CORSRuleType.h b/...service_with_c_style/types/CORSRuleType.h → ...service_with_c_style/types/CORSRuleType.h
diff --git a/...ervice_with_c_style/types/ConditionType.h → ...ervice_with_c_style/types/ConditionType.h b/...ervice_with_c_style/types/ConditionType.h → ...ervice_with_c_style/types/ConditionType.h
diff --git a/.../service_with_c_style/types/GranteeType.h → .../service_with_c_style/types/GranteeType.h b/.../service_with_c_style/types/GranteeType.h → .../service_with_c_style/types/GranteeType.h
diff --git a/...ervice_with_c_style/types/IPAddressType.h → ...ervice_with_c_style/types/IPAddressType.h b/...ervice_with_c_style/types/IPAddressType.h → ...ervice_with_c_style/types/IPAddressType.h
diff --git a/...e/service_with_c_style/types/IsNullType.h → ...r/service_with_c_style/types/IsNullType.h b/...e/service_with_c_style/types/IsNullType.h → ...r/service_with_c_style/types/IsNullType.h
diff --git a/...e_with_c_style/types/KeyDeleteErrorType.h → ...e_with_c_style/types/KeyDeleteErrorType.h b/...e_with_c_style/types/KeyDeleteErrorType.h → ...e_with_c_style/types/KeyDeleteErrorType.h
diff --git a/include/service_with_c_style/types/KeyType.h → ...stor/service_with_c_style/types/KeyType.h b/include/service_with_c_style/types/KeyType.h → ...stor/service_with_c_style/types/KeyType.h
diff --git a/...ice_with_c_style/types/NotIPAddressType.h → ...ice_with_c_style/types/NotIPAddressType.h b/...ice_with_c_style/types/NotIPAddressType.h → ...ice_with_c_style/types/NotIPAddressType.h
diff --git a/...rvice_with_c_style/types/ObjectPartType.h → ...rvice_with_c_style/types/ObjectPartType.h b/...rvice_with_c_style/types/ObjectPartType.h → ...rvice_with_c_style/types/ObjectPartType.h
diff --git a/...de/service_with_c_style/types/OwnerType.h → ...or/service_with_c_style/types/OwnerType.h b/...de/service_with_c_style/types/OwnerType.h → ...or/service_with_c_style/types/OwnerType.h
diff --git a/...ervice_with_c_style/types/StatementType.h → ...ervice_with_c_style/types/StatementType.h b/...ervice_with_c_style/types/StatementType.h → ...ervice_with_c_style/types/StatementType.h
diff --git a/...rvice_with_c_style/types/StringLikeType.h → ...rvice_with_c_style/types/StringLikeType.h b/...rvice_with_c_style/types/StringLikeType.h → ...rvice_with_c_style/types/StringLikeType.h
diff --git a/...ce_with_c_style/types/StringNotLikeType.h → ...ce_with_c_style/types/StringNotLikeType.h b/...ce_with_c_style/types/StringNotLikeType.h → ...ce_with_c_style/types/StringNotLikeType.h
diff --git a/.../service_with_c_style/types/UploadsType.h → .../service_with_c_style/types/UploadsType.h b/.../service_with_c_style/types/UploadsType.h → .../service_with_c_style/types/UploadsType.h
diff --git a/include/types/ACLType.h → include/qingstor/types/ACLType.h b/include/types/ACLType.h → include/qingstor/types/ACLType.h
diff --git a/include/types/BucketType.h → include/qingstor/types/BucketType.h b/include/types/BucketType.h → include/qingstor/types/BucketType.h
diff --git a/include/types/CORSRuleType.h → include/qingstor/types/CORSRuleType.h b/include/types/CORSRuleType.h → include/qingstor/types/CORSRuleType.h
diff --git a/include/types/ConditionType.h → include/qingstor/types/ConditionType.h b/include/types/ConditionType.h → include/qingstor/types/ConditionType.h
diff --git a/include/types/GranteeType.h → include/qingstor/types/GranteeType.h b/include/types/GranteeType.h → include/qingstor/types/GranteeType.h
diff --git a/include/types/IPAddressType.h → include/qingstor/types/IPAddressType.h b/include/types/IPAddressType.h → include/qingstor/types/IPAddressType.h
diff --git a/include/types/IsNullType.h → include/qingstor/types/IsNullType.h b/include/types/IsNullType.h → include/qingstor/types/IsNullType.h
diff --git a/include/types/KeyDeleteErrorType.h → include/qingstor/types/KeyDeleteErrorType.h b/include/types/KeyDeleteErrorType.h → include/qingstor/types/KeyDeleteErrorType.h
diff --git a/include/types/KeyType.h → include/qingstor/types/KeyType.h b/include/types/KeyType.h → include/qingstor/types/KeyType.h
diff --git a/include/types/NotIPAddressType.h → include/qingstor/types/NotIPAddressType.h b/include/types/NotIPAddressType.h → include/qingstor/types/NotIPAddressType.h
diff --git a/include/types/ObjectPartType.h → include/qingstor/types/ObjectPartType.h b/include/types/ObjectPartType.h → include/qingstor/types/ObjectPartType.h
diff --git a/include/types/OwnerType.h → include/qingstor/types/OwnerType.h b/include/types/OwnerType.h → include/qingstor/types/OwnerType.h
diff --git a/include/types/StatementType.h → include/qingstor/types/StatementType.h b/include/types/StatementType.h → include/qingstor/types/StatementType.h
diff --git a/include/types/StringLikeType.h → include/qingstor/types/StringLikeType.h b/include/types/StringLikeType.h → include/qingstor/types/StringLikeType.h
diff --git a/include/types/StringNotLikeType.h → include/qingstor/types/StringNotLikeType.h b/include/types/StringNotLikeType.h → include/qingstor/types/StringNotLikeType.h
diff --git a/include/types/UploadsType.h → include/qingstor/types/UploadsType.h b/include/types/UploadsType.h → include/qingstor/types/UploadsType.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -8,7 +8,7 @@ SET(libqingstor_VERSION_API 1)
 
 GET_FILENAME_COMPONENT(PARENT_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 SET(libqingstor_ROOT_SOURCES_DIR ${PARENT_DIR}/src)
-SET(libqingstor_INCLUDE_DIR ${PARENT_DIR}/include ${libqingstor_ROOT_SOURCES_DIR}/include)
+SET(libqingstor_INCLUDE_DIR ${PARENT_DIR}/include/qingstor ${libqingstor_ROOT_SOURCES_DIR}/include)
 
 GET_FILENAME_COMPONENT(COMPILER_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
 GET_FILENAME_COMPONENT(VC_DIR ${COMPILER_DIR} DIRECTORY)
@@ -32,7 +32,7 @@ IF(ENABLE_DEBUG)
 ENDIF(ENABLE_DEBUG)
 
 
-CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/QsSdkOption.h.in" "${PARENT_DIR}/include/QsSdkOption.h")
+CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/QsSdkOption.h.in" "${PARENT_DIR}/include/qingstor/QsSdkOption.h")
 
 AUTO_SOURCES(files "external/yaml/*.c" "RECURSE" "${CMAKE_CURRENT_SOURCE_DIR}")
 LIST(APPEND libqingstor_SOURCES ${files})