Commit 473395ce by Victor Manuel Alvarez

Fix issues in appveyor configuration

parent db832eaf
...@@ -3,7 +3,7 @@ environment: ...@@ -3,7 +3,7 @@ environment:
# SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
# /E:ON and /V:ON options are not enabled in the batch script intepreter # /E:ON and /V:ON options are not enabled in the batch script intepreter
# See: http://stackoverflow.com/a/13751649/163740 # See: http://stackoverflow.com/a/13751649/163740
CMD_IN_ENV: "cmd /E:ON /V:ON /C run_with_env.cmd" CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
matrix: matrix:
...@@ -89,10 +89,6 @@ install: ...@@ -89,10 +89,6 @@ install:
# the parent CMD process). # the parent CMD process).
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
# Add appveyor folder to PATH for allowing run_with_env to be run from
# anywhere
- "SET PATH=C:\\projects\\yara-python\\appveyor;%PATH%"
# Check that we have the expected version and architecture for Python # Check that we have the expected version and architecture for Python
- "python --version" - "python --version"
- "python -c \"import struct; print(struct.calcsize('P') * 8)\"" - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
...@@ -114,8 +110,8 @@ install: ...@@ -114,8 +110,8 @@ install:
- cd jansson-%JANSSON_VERSION% - cd jansson-%JANSSON_VERSION%
- md build - md build
- cd build - cd build
- "%CMD_IN_ENV% cmake -DJANSSON_BUILD_DOCS=OFF -G \"%VS%\" .." - cmake -DJANSSON_BUILD_DOCS=OFF -G "%VS%" ..
- "%CMD_IN_ENV% cmake --build . --config Release" - cmake --build . --config Release
- ctest --output-on-failure - ctest --output-on-failure
- cd ../../yara-python - cd ../../yara-python
......
...@@ -211,10 +211,7 @@ class BuildExtCommand(build_ext): ...@@ -211,10 +211,7 @@ class BuildExtCommand(build_ext):
if self.enable_cuckoo: if self.enable_cuckoo:
module.define_macros.append(('CUCKOO_MODULE', '1')) module.define_macros.append(('CUCKOO_MODULE', '1'))
if building_for_windows: module.libraries.append('jansson')
module.libraries.append('jansson%s' % bits)
else:
module.libraries.append('jansson')
else: else:
exclusions.append('yara/libyara/modules/cuckoo.c') exclusions.append('yara/libyara/modules/cuckoo.c')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment