diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index adce9a5..5c2a171 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,8 +8,12 @@ jobs: vmImage: ubuntu-16.04 strategy: matrix: - linux_64_: - CONFIG: linux_64_ + linux_64_ogre1.10: + CONFIG: linux_64_ogre1.10 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_64_ogre1.12: + CONFIG: linux_64_ogre1.12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 0c89240..56cc9a1 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,8 +8,11 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_: - CONFIG: osx_64_ + osx_64_ogre1.10: + CONFIG: osx_64_ogre1.10 + UPLOAD_PACKAGES: 'True' + osx_64_ogre1.12: + CONFIG: osx_64_ogre1.12 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 1fd8ea1..8c384f8 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,8 +8,11 @@ jobs: vmImage: vs2017-win2016 strategy: matrix: - win_64_: - CONFIG: win_64_ + win_64_ogre1.10: + CONFIG: win_64_ogre1.10 + UPLOAD_PACKAGES: 'True' + win_64_ogre1.12: + CONFIG: win_64_ogre1.12 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_ogre1.10.yaml similarity index 95% rename from .ci_support/linux_64_.yaml rename to .ci_support/linux_64_ogre1.10.yaml index 0f6e58e..1942bb2 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_ogre1.10.yaml @@ -14,6 +14,8 @@ cxx_compiler_version: - '9' docker_image: - quay.io/condaforge/linux-anvil-comp7 +ogre: +- '1.10' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_ogre1.12.yaml b/.ci_support/linux_64_ogre1.12.yaml new file mode 100644 index 0000000..2f66d5e --- /dev/null +++ b/.ci_support/linux_64_ogre1.12.yaml @@ -0,0 +1,25 @@ +c_compiler: +- gcc +c_compiler_version: +- '9' +cdt_name: +- cos6 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '9' +docker_image: +- quay.io/condaforge/linux-anvil-comp7 +ogre: +- '1.12' +target_platform: +- linux-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - cdt_name + - docker_image diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_ogre1.10.yaml similarity index 96% rename from .ci_support/osx_64_.yaml rename to .ci_support/osx_64_ogre1.10.yaml index 6d22761..5b09ed9 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_ogre1.10.yaml @@ -16,6 +16,8 @@ macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: - '10.14' +ogre: +- '1.10' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_64_ogre1.12.yaml b/.ci_support/osx_64_ogre1.12.yaml new file mode 100644 index 0000000..e5a2600 --- /dev/null +++ b/.ci_support/osx_64_ogre1.12.yaml @@ -0,0 +1,25 @@ +MACOSX_DEPLOYMENT_TARGET: +- '10.14' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +macos_machine: +- x86_64-apple-darwin13.4.0 +macos_min_version: +- '10.14' +ogre: +- '1.12' +target_platform: +- osx-64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_ogre1.10.yaml similarity index 90% rename from .ci_support/win_64_.yaml rename to .ci_support/win_64_ogre1.10.yaml index feb31b8..bd2baf3 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_ogre1.10.yaml @@ -6,5 +6,7 @@ channel_targets: - conda-forge main cxx_compiler: - vs2017 +ogre: +- '1.10' target_platform: - win-64 diff --git a/.ci_support/win_64_ogre1.12.yaml b/.ci_support/win_64_ogre1.12.yaml new file mode 100644 index 0000000..82b3eb0 --- /dev/null +++ b/.ci_support/win_64_ogre1.12.yaml @@ -0,0 +1,12 @@ +c_compiler: +- vs2017 +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- vs2017 +ogre: +- '1.12' +target_platform: +- win-64 diff --git a/README.md b/README.md index d73a1cd..7e4e2bb 100644 --- a/README.md +++ b/README.md @@ -27,24 +27,45 @@ Current build status - + - + - + + + + + + + + + + diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index fe398bd..7cbad50 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -2,3 +2,7 @@ macos_min_version: # [osx] - 10.14 # [osx] MACOSX_DEPLOYMENT_TARGET: # [osx] - 10.14 # [osx] + +ogre: + - 1.10 + - 1.12 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 81bf01e..5d7fbb1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,9 +9,11 @@ package: source: url: https://github.com/ignitionrobotics/ign-rendering/archive/ignition-rendering{{ version.split('.')[0] }}_{{ version }}.tar.gz sha256: f9c23e604e785b7a2352686f044964899b87146dc2000a9f1ddfa04fd09560c9 + patches: + - ogre-version.patch build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage(name, max_pin='x') }} @@ -39,7 +41,7 @@ requirements: - libignition-math6 >=6.6 - libignition-common3 - libignition-plugin1 - - ogre + - ogre {{ ogre }} run: - xorg-libx11 # [unix] - xorg-libxext # [unix] @@ -47,7 +49,7 @@ requirements: - libignition-math6 >=6.6 - libignition-common3 - libignition-plugin1 - - ogre + - {{ pin_compatible('ogre', max_pin='x.x') }} - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] test: diff --git a/recipe/ogre-version.patch b/recipe/ogre-version.patch new file mode 100644 index 0000000..1b26738 --- /dev/null +++ b/recipe/ogre-version.patch @@ -0,0 +1,17 @@ +diff --git a/ogre/src/CMakeLists.txt b/ogre/src/CMakeLists.txt +index bb38fd8b..b214b02d 100644 +--- a/ogre/src/CMakeLists.txt ++++ b/ogre/src/CMakeLists.txt +@@ -15,10 +15,10 @@ set(engine_name "ogre") + + ign_add_component(${engine_name} SOURCES ${sources} GET_TARGET_NAME ogre_target) + +-if(OGRE_VERSION VERSION_LESS 1.10.3) ++if(OGRE_VERSION VERSION_LESS 1.11.0) + add_definitions(-DOGRE_VERSION_LT_1_10_3) + endif() +-if(OGRE_VERSION VERSION_LESS 1.10.1) ++if(OGRE_VERSION VERSION_LESS 1.11.0) + add_definitions(-DOGRE_VERSION_LT_1_10_1) + endif() + if(OGRE_VERSION VERSION_LESS 1.12.0)
VariantStatus
linux_64linux_64_ogre1.10 - variant + variant
osx_64linux_64_ogre1.12 - variant + variant
win_64osx_64_ogre1.10 - variant + variant + +
osx_64_ogre1.12 + + variant + +
win_64_ogre1.10 + + variant + +
win_64_ogre1.12 + + variant