remove BITPRIM_BUILD_NUMBER envvar (#13)

* remove BITPRIM_BUILD_NUMBER envvar

* dynamic import of Conan Packager

.appveyor.yml

@@ -70,20 +70,6 @@ test_script:
       Write-Host $a
       Invoke-Expression $a
 
-  - python ci_utils/print_version.py
-
-  - for /f %%i in ('python ci_utils/print_version.py') do set BITPRIM_BUILD_NUMBER=%%i
-  - set BITPRIM_CONAN_VERSION=%BITPRIM_BUILD_NUMBER%
-  - echo %BITPRIM_BUILD_NUMBER%
-  - echo %BITPRIM_CONAN_VERSION%
-
-  - ps: |
-      if ([System.IO.File]::Exists("conan_version")) {
-        Write-Host "Creating conan_version file"
-        $Env:BITPRIM_BUILD_NUMBER | Out-File conan_version
-      }
-
-
   - python build.py
 
 

.travis.yml

@@ -75,7 +75,6 @@ script:
   - |
     if [[ "${CHECK_FORMATTING}" != "true" ]]; then
       cd ${TRAVIS_BUILD_DIR}
-      ls -ltra ci_utils
       chmod +x ci_utils/.travis/run.sh
       ./ci_utils/.travis/run.sh
     fi

CMakeLists.txt

@@ -71,8 +71,6 @@ set(WITH_SCALAR "auto" CACHE STRING "Specify scalar implementation (64bit|32bit|
 set(WITH_BIGNUM "auto" CACHE STRING "Specify Bignum Implementation (gmp|mpir|no|auto).")
 
 
-set(BITPRIM_BUILD_NUMBER "-" CACHE STRING "Specify the Bitprim Build Number.")
-# message(${BITPRIM_BUILD_NUMBER})
 set(BITPRIM_PROJECT_VERSION "-" CACHE STRING "Specify the Bitprim Project Version.")
 # message(${BITPRIM_PROJECT_VERSION})
 
@@ -278,7 +276,6 @@ elseif (${WITH_BIGNUM} STREQUAL "no")
   target_compile_definitions(secp256k1 PUBLIC -DUSE_SCALAR_INV_BUILTIN=1)
 endif()
 
-target_compile_definitions(secp256k1 PUBLIC -DBITPRIM_BUILD_NUMBER="\\"${BITPRIM_BUILD_NUMBER}\\"") #TODO(fernando): manage with Conan????
 target_compile_definitions(secp256k1 PUBLIC -DBITPRIM_PROJECT_VERSION="\\"${BITPRIM_PROJECT_VERSION}\\"") #TODO(fernando): manage with Conan????
 
 # message(CONAN_LIBS)

conanfile.py

@@ -90,11 +90,9 @@ class Secp256k1Conan(ConanFile):
         # "with_bignum='auto'"
 
     generators = "cmake"
-    build_policy = "missing"
-
-    exports = "conan_*", "ci_utils/*"      #"conan_channel", "conan_user", "conan_version", "conan_req_version"
+    exports = "conan_*", "ci_utils/*"
     exports_sources = "src/*", "include/*", "CMakeLists.txt", "cmake/*", "secp256k1Config.cmake.in", "contrib/*", "test/*"
-    #, "bitprimbuildinfo.cmake"
+    build_policy = "missing"
 
     # with_benchmark = False
     # with_tests = True
@@ -174,7 +172,6 @@ def package_id(self):
 
     def build(self):
         cmake = CMake(self)
-
         cmake.definitions["USE_CONAN"] = option_on_off(True)
         cmake.definitions["NO_CONAN_AT_ALL"] = option_on_off(False)
         cmake.verbose = self.options.verbose
@@ -209,6 +206,7 @@ def build(self):
 
 
         cmake.definitions["MICROARCHITECTURE"] = self.options.microarchitecture
+        cmake.definitions["BITPRIM_PROJECT_VERSION"] = self.version
 
         if self.settings.os == "Windows":
             if self.settings.compiler == "Visual Studio" and (self.settings.compiler.version != 12):
@@ -228,7 +226,6 @@ def build(self):
 
         pass_march_to_compiler(self, cmake)
 
-        cmake.definitions["BITPRIM_BUILD_NUMBER"] = os.getenv('BITPRIM_BUILD_NUMBER', '-')
         cmake.configure(source_dir=self.source_folder)
         cmake.build()