some changes & begin v1.2.2

Author: xssss1

.travis.yml

@@ -1,38 +1,49 @@
-os: linux
-services:
-   - docker
-sudo: required
-language: python
 env:
-  global:
-    - CONAN_UPLOAD=1
-    - CONAN_REFERENCE="estring/1.2.1"
-    - CONAN_USERNAME="sunxfancy"
-    - CONAN_CHANNEL="testing"
-    - CONAN_TOTAL_PAGES=1
-    - CONAN_CURRENT_PAGE=1
+   global:
+     - CONAN_REFERENCE: "estring/1.2.2"
+     - CONAN_USERNAME: "sunxfancy"
+    #  - CONAN_LOGIN_USERNAME: "sunxfancy"
+     - CONAN_CHANNEL: "ci"
+    #  - CONAN_UPLOAD: "https://api.bintray.com/conan/elite-lang/eobject"
+     - CONAN_STABLE_BRANCH_PATTERN: "master"
 
-  matrix:
-    - CONAN_GCC_VERSIONS=4.6 CONAN_USE_DOCKER=1
-    - CONAN_GCC_VERSIONS=4.8 CONAN_USE_DOCKER=1
-    - CONAN_GCC_VERSIONS=4.9 CONAN_USE_DOCKER=1
-    - CONAN_GCC_VERSIONS=5.2 CONAN_USE_DOCKER=1
-    - CONAN_GCC_VERSIONS=5.3 CONAN_USE_DOCKER=1
+linux: &linux
+   os: linux
+   sudo: required
+   language: python
+   python: "3.6"
+   services:
+     - docker
+osx: &osx
+   os: osx
+   language: generic
+   
 matrix:
    include:
-       - os: osx
-         osx_image: xcode8.2 # apple-clang 8.0
-         language: generic
-         env:
-       - os: osx
-         osx_image: xcode7.3 # apple-clang 7.3
-         language: generic
-         env:
-       - os: osx
-         osx_image: xcode6.4 # apple-clang 6.1
-         language: generic
-         env:
+      - <<: *linux
+        env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=lasote/conangcc49
+      - <<: *linux
+        env: CONAN_GCC_VERSIONS=5.4 CONAN_DOCKER_IMAGE=lasote/conangcc54
+      - <<: *linux
+        env: CONAN_GCC_VERSIONS=6.3 CONAN_DOCKER_IMAGE=lasote/conangcc63
+      - <<: *linux
+        env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=lasote/conanclang39
+      - <<: *linux
+        env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=lasote/conanclang40
+      - <<: *osx
+        osx_image: xcode7.3
+        env: CONAN_APPLE_CLANG_VERSIONS=7.3
+      - <<: *osx
+        osx_image: xcode8.2
+        env: CONAN_APPLE_CLANG_VERSIONS=8.0
+      - <<: *osx
+        osx_image: xcode8.3
+        env: CONAN_APPLE_CLANG_VERSIONS=8.1
+
 install:
-  - bash ./.travis/install.sh
+  - chmod +x .travis/install.sh
+  - ./.travis/install.sh
+
 script:
-  - bash ./.travis/run.sh
+  - chmod +x .travis/run.sh
+  - ./.travis/run.sh

CMakeLists.txt

@@ -10,7 +10,7 @@ conan_basic_setup()
 
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "2")
-SET(VERSION_PATCH "0")
+SET(VERSION_PATCH "2")
 
 SET (CMAKE_BUILD_TYPE Debug) # 默认构建Debug模式
 

appveyor.yml

@@ -1,23 +1,32 @@
 build: false
+
 environment:
     PYTHON: "C:\\Python27"
-    PYTHON_VERSION: "2.7.11"
+    PYTHON_VERSION: "2.7.8"
     PYTHON_ARCH: "32"
 
-    CONAN_UPLOAD: 1
-    CONAN_REFERENCE: "estring/1.2.1"
+    CONAN_REFERENCE: "estring/1.2.2"
     CONAN_USERNAME: "sunxfancy"
-    CONAN_CHANNEL: "testing"
-    CONAN_TOTAL_PAGES: 4
+    # CONAN_LOGIN_USERNAME: "sunxfancy"
+    CONAN_CHANNEL: "ci"
+    VS150COMNTOOLS: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\Tools\\"
+    # CONAN_UPLOAD: "https://api.bintray.com/conan/elite-lang/eobject"
+    CONAN_STABLE_BRANCH_PATTERN: "master"
+
     matrix:
-        - CONAN_CURRENT_PAGE: 1
-        - CONAN_CURRENT_PAGE: 2
-        - CONAN_CURRENT_PAGE: 3
-        - CONAN_CURRENT_PAGE: 4
+        - MINGW_CONFIGURATIONS: "4.9@x86_64@seh@posix, 4.9@x86_64@sjlj@posix, 4.9@x86@sjlj@posix, 4.9@x86@dwarf2@posix"
+        - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+          CONAN_VISUAL_VERSIONS: 12
+        - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+          CONAN_VISUAL_VERSIONS: 14
+        - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+          CONAN_VISUAL_VERSIONS: 15
+
 install:
   - set PATH=%PATH%;%PYTHON%/Scripts/
-  - pip.exe install conan_package_tools # It install conan too
-  - conan user sunxfancy # It creates the conan data directory
+  - pip.exe install conan --upgrade
+  - pip.exe install conan_package_tools
+  - conan user # It creates the conan data directory
 
 test_script:
-  - C:\Python27\python build.py
+  - python build.py

build.py

@@ -1,6 +1,6 @@
 from conan.packager import ConanMultiPackager
 
 if __name__ == "__main__":
-    builder = ConanMultiPackager(username="sunxfancy", args="--build missing")
+    builder = ConanMultiPackager(args="--build missing")
     builder.add_common_builds(pure_c=False)
     builder.run()

conanfile.py

@@ -4,12 +4,12 @@
 
 class EstringConan(ConanFile):
     name = "estring"
-    version = "1.2.1"
+    version = "1.2.2"
     license = "MIT"
     url = "https://github.com/sunxfancy/estring"
     settings = "os", "compiler", "build_type", "arch"
     options = {"shared": [True, False]}
-    requires = "libiconv/1.14@sunxfancy/stable", "libcharsetdetect/1.0@sunxfancy/stable", "gtest/1.8.0@lasote/stable"
+    requires = "libiconv/1.14.2@sunxfancy/stable", "libcharsetdetect/1.0@sunxfancy/stable", "gtest/1.8.0@lasote/stable"
     default_options = "shared=False", "gtest:shared=False"
     generators = "cmake"
     build_policy = "missing"