Merge pull request #4 from sunxfancy/dev

Dev

Author: xssss1

.travis.yml

@@ -1,6 +1,6 @@
 env:
    global:
-     - CONAN_REFERENCE: "estring/1.2.2"
+     - CONAN_REFERENCE: "estring/1.2.3"
      - CONAN_USERNAME: "sunxfancy"
      - CONAN_LOGIN_USERNAME: "sunxfancy"
      - CONAN_CHANNEL: "ci"
@@ -35,12 +35,12 @@ matrix:
       - <<: *osx
         osx_image: xcode7.3
         env: CONAN_APPLE_CLANG_VERSIONS=7.3
-      - <<: *osx
-        osx_image: xcode8.1
-        env: CONAN_APPLE_CLANG_VERSIONS=8.0
       - <<: *osx
         osx_image: xcode8.3
         env: CONAN_APPLE_CLANG_VERSIONS=8.1
+      - <<: *osx
+        osx_image: xcode9.2
+        env: CONAN_APPLE_CLANG_VERSIONS=9.0
 
 install:
   - chmod +x .travis/install.sh

CMakeLists.txt

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

appveyor.yml

@@ -5,7 +5,7 @@ environment:
     PYTHON_VERSION: "2.7.8"
     PYTHON_ARCH: "32"
 
-    CONAN_REFERENCE: "estring/1.2.2"
+    CONAN_REFERENCE: "estring/1.2.3"
     CONAN_USERNAME: "sunxfancy"
     CONAN_LOGIN_USERNAME: "sunxfancy"
     CONAN_CHANNEL: "ci"

conanfile.py

@@ -4,12 +4,12 @@
 
 class EstringConan(ConanFile):
     name = "estring"
-    version = "1.2.2"
+    version = "1.2.3"
     license = "MIT"
     url = "https://github.com/sunxfancy/estring"
     settings = "os", "compiler", "build_type", "arch"
     options = {"shared": [True, False]}
-    requires = "libiconv/1.14.3@sunxfancy/stable", "libcharsetdetect/1.1.1@sunxfancy/stable", "gtest/1.8.0@lasote/stable"
+    requires = "libiconv/1.14.4@sunxfancy/stable", "libcharsetdetect/1.1.2@sunxfancy/stable", "gtest/1.8.0@lasote/stable"
     default_options = "shared=False", "gtest:shared=False"
     generators = "cmake"
     build_policy = "missing"
@@ -18,8 +18,8 @@ class EstringConan(ConanFile):
     def build(self):
         cmake = CMake(self)
         shared = "-DBUILD_SHARED_LIBS=ON" if self.options.shared else ""
-        self.run('cmake %s %s %s' % (self.conanfile_directory, cmake.command_line, shared))
-        self.run("cmake --build . %s" % cmake.build_config)
+        cmake.configure(shared)
+        cmake.build()
 
     def imports(self):
         self.copy(pattern="*.dll", dst="bin", src="bin")

test_package/conanfile.py

@@ -7,16 +7,15 @@
 
 class HelloReuseConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
-    requires = "estring/1.2.2@%s/%s" % (username, channel)
+    requires = "estring/1.2.3@%s/%s" % (username, channel)
     generators = "cmake"
     build_policy = "missing"
 
     def build(self):
         cmake = CMake(self)
-        print('cmake "%s" %s' % (self.conanfile_directory, cmake.command_line))
-        self.run('cmake "%s" %s' % (self.conanfile_directory, cmake.command_line))
-        self.run("cmake --build . %s" % cmake.build_config)
-
+        cmake.configure()
+        cmake.build()
+        
     def test(self):
         # equal to ./bin/greet, but portable win: .\bin\greet
         self.run(os.sep.join([".","bin", "libtest"]))