From d42389ced63b8fdc60d2407393e9124f6820d0fa Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 6 Dec 2020 09:57:43 -0500 Subject: [PATCH 01/13] add coursier 2.0.7 --- recipes/coursier/bld.bat | 15 +++++++++ recipes/coursier/build.sh | 17 ++++++++++ recipes/coursier/conda_build_config.yaml | 9 ++++++ recipes/coursier/meta.yaml | 41 ++++++++++++++++++++++++ 4 files changed, 82 insertions(+) create mode 100644 recipes/coursier/bld.bat create mode 100644 recipes/coursier/build.sh create mode 100644 recipes/coursier/conda_build_config.yaml create mode 100644 recipes/coursier/meta.yaml diff --git a/recipes/coursier/bld.bat b/recipes/coursier/bld.bat new file mode 100644 index 0000000000000..f10a6e4ae98fb --- /dev/null +++ b/recipes/coursier/bld.bat @@ -0,0 +1,15 @@ +@echo on + +set COURSIER_CACHE=%SRC_DIR%\cache + +md /s /q %COURSIER_CACHE% + +.\coursier.bat ^ + bootstrap ^ + "io.get-coursier::coursier-cli:%PKG_VERSION%" ^ + --java-opt "-noverify" ^ + --no-default ^ + -r central ^ + -r typesafe:ivy-releases ^ + -f -o "%PREFIX%\Scripts\coursier.bat" ^ + --standalone diff --git a/recipes/coursier/build.sh b/recipes/coursier/build.sh new file mode 100644 index 0000000000000..6e9b2cb772931 --- /dev/null +++ b/recipes/coursier/build.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +# derived from https://github.com/2m/coursier-pkgbuild/blob/master/PKGBUILD +set -eux + +export COURSIER_CACHE="$SRC_DIR/cache" + +mkdir -p $COURSIER_CACHE + +bash ./coursier \ + bootstrap \ + "io.get-coursier::coursier-cli:${PKG_VERSION}" \ + --java-opt "-noverify" \ + --no-default \ + -r central \ + -r typesafe:ivy-releases \ + -f -o "$PREFIX/bin/coursier" \ + --standalone diff --git a/recipes/coursier/conda_build_config.yaml b/recipes/coursier/conda_build_config.yaml new file mode 100644 index 0000000000000..ed54f60ae5748 --- /dev/null +++ b/recipes/coursier/conda_build_config.yaml @@ -0,0 +1,9 @@ +openjdk: + - 8 + - 9 + - 10 + - 11 + +pin_run_as_build: + openjdk: + max_pin: x.x diff --git a/recipes/coursier/meta.yaml b/recipes/coursier/meta.yaml new file mode 100644 index 0000000000000..952676eac75e9 --- /dev/null +++ b/recipes/coursier/meta.yaml @@ -0,0 +1,41 @@ +{% set name = "coursier" %} +{% set version = "2.0.7" %} + +package: + name: {{ name }} + version: {{ version }} + +source: + - url: https://raw.githubusercontent.com/{{ name }}/{{ name }}/v{{ version }}/LICENSE + sha256: cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 + - url: https://github.com/{{ name }}/{{ name }}/releases/download/v{{ version }}/{{ name }} # [unix] + sha256: d3ba37e53d9cfa778af481c7099cd1dc485242283e9d2c5c2753f3859908cbd4 # [unix] + - url: https://github.com/{{ name }}/{{ name }}/releases/download/v{{ version }}/{{ name }}.bat # [win] + sha256: d3ba37e53d9cfa778af481c7099cd1dc485242283e9d2c5c2753f3859908cbd4 # [win] + +build: + number: 0 + +requirements: + host: + - openjdk + run: + - openjdk + +test: + commands: + - coursier --version + - coursier --help + +about: + home: https://get-coursier.io + license: Apache-2.0 + license_family: APACHE + license_file: LICENSE + summary: Pure Scala Artifact Fetching + doc_url: https://get-coursier.io/docs/overview + dev_url: https://github.com/coursier/coursier + +extra: + recipe-maintainers: + - bollwyvl From 63f6d0ca7a1363ee70ae309d8c223b7eb5e02b60 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 6 Dec 2020 10:03:40 -0500 Subject: [PATCH 02/13] fix windows shasum --- recipes/coursier/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/coursier/meta.yaml b/recipes/coursier/meta.yaml index 952676eac75e9..94f85504c5daf 100644 --- a/recipes/coursier/meta.yaml +++ b/recipes/coursier/meta.yaml @@ -11,7 +11,7 @@ source: - url: https://github.com/{{ name }}/{{ name }}/releases/download/v{{ version }}/{{ name }} # [unix] sha256: d3ba37e53d9cfa778af481c7099cd1dc485242283e9d2c5c2753f3859908cbd4 # [unix] - url: https://github.com/{{ name }}/{{ name }}/releases/download/v{{ version }}/{{ name }}.bat # [win] - sha256: d3ba37e53d9cfa778af481c7099cd1dc485242283e9d2c5c2753f3859908cbd4 # [win] + sha256: 843319e0a3c57e588a0dd25edd2fee4621ec9cd152741d3128a5f5366264a593 # [win] build: number: 0 From 9981454faca739e78a4804912593080a969a9ad7 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 6 Dec 2020 12:44:13 -0500 Subject: [PATCH 03/13] try downloading both coursier(.bat) on windows --- recipes/coursier/bld.bat | 6 ++++-- recipes/coursier/meta.yaml | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/recipes/coursier/bld.bat b/recipes/coursier/bld.bat index f10a6e4ae98fb..4ea83ba9603a3 100644 --- a/recipes/coursier/bld.bat +++ b/recipes/coursier/bld.bat @@ -1,10 +1,12 @@ @echo on - +:: derived from https://github.com/2m/coursier-pkgbuild/blob/master/PKGBUILD set COURSIER_CACHE=%SRC_DIR%\cache md /s /q %COURSIER_CACHE% -.\coursier.bat ^ +courser --help + +coursier ^ bootstrap ^ "io.get-coursier::coursier-cli:%PKG_VERSION%" ^ --java-opt "-noverify" ^ diff --git a/recipes/coursier/meta.yaml b/recipes/coursier/meta.yaml index 94f85504c5daf..b10560328f2b9 100644 --- a/recipes/coursier/meta.yaml +++ b/recipes/coursier/meta.yaml @@ -8,9 +8,9 @@ package: source: - url: https://raw.githubusercontent.com/{{ name }}/{{ name }}/v{{ version }}/LICENSE sha256: cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 - - url: https://github.com/{{ name }}/{{ name }}/releases/download/v{{ version }}/{{ name }} # [unix] - sha256: d3ba37e53d9cfa778af481c7099cd1dc485242283e9d2c5c2753f3859908cbd4 # [unix] - - url: https://github.com/{{ name }}/{{ name }}/releases/download/v{{ version }}/{{ name }}.bat # [win] + - url: https://github.com/{{ name }}/{{ name }}/releases/download/v{{ version }}/{{ name }} + sha256: d3ba37e53d9cfa778af481c7099cd1dc485242283e9d2c5c2753f3859908cbd4 + - url: https://github.com/{{ name }}/{{ name }}/releases/download/v{{ version }}/{{ name }}.bat # [win] sha256: 843319e0a3c57e588a0dd25edd2fee4621ec9cd152741d3128a5f5366264a593 # [win] build: From 50e51ad96ef4b9b504763907e5727f727c10f485 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 6 Dec 2020 13:01:05 -0500 Subject: [PATCH 04/13] more error handling on windows --- recipes/coursier/bld.bat | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/recipes/coursier/bld.bat b/recipes/coursier/bld.bat index 4ea83ba9603a3..19d9e32d67b82 100644 --- a/recipes/coursier/bld.bat +++ b/recipes/coursier/bld.bat @@ -2,16 +2,22 @@ :: derived from https://github.com/2m/coursier-pkgbuild/blob/master/PKGBUILD set COURSIER_CACHE=%SRC_DIR%\cache -md /s /q %COURSIER_CACHE% +md /s /q %COURSIER_CACHE% || goto :ERROR +md /s /q %SCRIPTS% || goto :ERROR -courser --help - -coursier ^ +call coursier ^ bootstrap ^ "io.get-coursier::coursier-cli:%PKG_VERSION%" ^ --java-opt "-noverify" ^ --no-default ^ -r central ^ -r typesafe:ivy-releases ^ - -f -o "%PREFIX%\Scripts\coursier.bat" ^ - --standalone + -f -o "%SCRIPTS%\coursier.bat" ^ + --standalone ^ + || goto :ERROR + +goto :EOF + +:ERROR +echo FAIL Building %PKG_NAME% with error #%errorlevel%. +exit /b 1 From 6fdb853d55781702facba6c2a9c02064172bfc9d Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 6 Dec 2020 13:21:34 -0500 Subject: [PATCH 05/13] quote windows more --- recipes/coursier/bld.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/coursier/bld.bat b/recipes/coursier/bld.bat index 19d9e32d67b82..4362567586dab 100644 --- a/recipes/coursier/bld.bat +++ b/recipes/coursier/bld.bat @@ -1,9 +1,9 @@ @echo on :: derived from https://github.com/2m/coursier-pkgbuild/blob/master/PKGBUILD -set COURSIER_CACHE=%SRC_DIR%\cache +set "COURSIER_CACHE=%SRC_DIR%\cache" -md /s /q %COURSIER_CACHE% || goto :ERROR -md /s /q %SCRIPTS% || goto :ERROR +md "%COURSIER_CACHE%" || goto :ERROR +md "%SCRIPTS%" || goto :ERROR call coursier ^ bootstrap ^ From 3d86ef3c9069b69c5eb82b3cc4131cb2986ce566 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 6 Dec 2020 13:42:40 -0500 Subject: [PATCH 06/13] remove extra bat prefix (it adds its own) --- recipes/coursier/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/coursier/bld.bat b/recipes/coursier/bld.bat index 4362567586dab..284f93b039f57 100644 --- a/recipes/coursier/bld.bat +++ b/recipes/coursier/bld.bat @@ -12,7 +12,7 @@ call coursier ^ --no-default ^ -r central ^ -r typesafe:ivy-releases ^ - -f -o "%SCRIPTS%\coursier.bat" ^ + -f -o "%SCRIPTS%\coursier" ^ --standalone ^ || goto :ERROR From cff75a06a9e89528cf7f34cbfdd7e22f91560248 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sat, 19 Dec 2020 15:59:59 -0500 Subject: [PATCH 07/13] create no-jdk coursier-core --- .../coursier/{bld.bat => build_coursier.bat} | 0 .../coursier/{build.sh => build_coursier.sh} | 0 recipes/coursier/conda_build_config.yaml | 9 ---- recipes/coursier/meta.yaml | 47 +++++++++++++++---- 4 files changed, 39 insertions(+), 17 deletions(-) rename recipes/coursier/{bld.bat => build_coursier.bat} (100%) rename recipes/coursier/{build.sh => build_coursier.sh} (100%) delete mode 100644 recipes/coursier/conda_build_config.yaml diff --git a/recipes/coursier/bld.bat b/recipes/coursier/build_coursier.bat similarity index 100% rename from recipes/coursier/bld.bat rename to recipes/coursier/build_coursier.bat diff --git a/recipes/coursier/build.sh b/recipes/coursier/build_coursier.sh similarity index 100% rename from recipes/coursier/build.sh rename to recipes/coursier/build_coursier.sh diff --git a/recipes/coursier/conda_build_config.yaml b/recipes/coursier/conda_build_config.yaml deleted file mode 100644 index ed54f60ae5748..0000000000000 --- a/recipes/coursier/conda_build_config.yaml +++ /dev/null @@ -1,9 +0,0 @@ -openjdk: - - 8 - - 9 - - 10 - - 11 - -pin_run_as_build: - openjdk: - max_pin: x.x diff --git a/recipes/coursier/meta.yaml b/recipes/coursier/meta.yaml index b10560328f2b9..442e8c0c462c9 100644 --- a/recipes/coursier/meta.yaml +++ b/recipes/coursier/meta.yaml @@ -6,7 +6,8 @@ package: version: {{ version }} source: - - url: https://raw.githubusercontent.com/{{ name }}/{{ name }}/v{{ version }}/LICENSE + - fn: {{ name }}-{{ version }}-LICENSE-APACHE + url: https://raw.githubusercontent.com/{{ name }}/{{ name }}/v{{ version }}/LICENSE sha256: cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 - url: https://github.com/{{ name }}/{{ name }}/releases/download/v{{ version }}/{{ name }} sha256: d3ba37e53d9cfa778af481c7099cd1dc485242283e9d2c5c2753f3859908cbd4 @@ -16,22 +17,51 @@ source: build: number: 0 +test: + commands: + - echo "TBD" + requirements: - host: + build: - openjdk - run: + host: - openjdk -test: - commands: - - coursier --version - - coursier --help +outputs: + - name: {{ name }}-base + requirements: + build: + - openjdk + build: + script: call "%RECIPE_DIR%\build_{{ name }}.bat" # [win] + script: bash "${RECIPE_DIR}/build_{{ name }}.sh" # [unix] + test: + commands: + - dir "%SCRIPTS%\{{ name }}.bat" # [win] + - ls "${PREFIX}/bin/{{ name }}" # [unix] + + - name: {{ name }} + build: + noarch: generic + requirements: + run: + - openjdk + - {{ name }}-base ={{ version }} + test: + requirements: + - openjdk + commands: + - java -version + - {{ name }} --version + - {{ name }} --help + about: + summary: Pure Scala Artifact Fetching (with conda JDK) about: home: https://get-coursier.io license: Apache-2.0 license_family: APACHE - license_file: LICENSE + license_file: {{ name }}-{{ version }}-LICENSE-APACHE summary: Pure Scala Artifact Fetching doc_url: https://get-coursier.io/docs/overview dev_url: https://github.com/coursier/coursier @@ -39,3 +69,4 @@ about: extra: recipe-maintainers: - bollwyvl + - dbast From 06f2c943b07a69013db4412ee40af21a6c87c15e Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sat, 19 Dec 2020 16:01:40 -0500 Subject: [PATCH 08/13] linting --- recipes/coursier/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/coursier/meta.yaml b/recipes/coursier/meta.yaml index 442e8c0c462c9..cd45466707576 100644 --- a/recipes/coursier/meta.yaml +++ b/recipes/coursier/meta.yaml @@ -17,16 +17,16 @@ source: build: number: 0 -test: - commands: - - echo "TBD" - requirements: build: - openjdk host: - openjdk +test: + commands: + - echo "TBD" + outputs: - name: {{ name }}-base requirements: From 5c2782859c0132cb441e02e67c72d0d0e79be30c Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sat, 19 Dec 2020 16:11:16 -0500 Subject: [PATCH 09/13] try flipping some more req locations --- recipes/coursier/meta.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipes/coursier/meta.yaml b/recipes/coursier/meta.yaml index cd45466707576..e738a3eae8e19 100644 --- a/recipes/coursier/meta.yaml +++ b/recipes/coursier/meta.yaml @@ -30,7 +30,7 @@ test: outputs: - name: {{ name }}-base requirements: - build: + host: - openjdk build: script: call "%RECIPE_DIR%\build_{{ name }}.bat" # [win] @@ -41,8 +41,6 @@ outputs: - ls "${PREFIX}/bin/{{ name }}" # [unix] - name: {{ name }} - build: - noarch: generic requirements: run: - openjdk From ed093632f726b529e8a216fd597d1c7e7e5cc375 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sat, 19 Dec 2020 16:17:13 -0500 Subject: [PATCH 10/13] try different windows path --- recipes/coursier/build_coursier.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/coursier/build_coursier.bat b/recipes/coursier/build_coursier.bat index 284f93b039f57..8e31f48a591ba 100644 --- a/recipes/coursier/build_coursier.bat +++ b/recipes/coursier/build_coursier.bat @@ -3,7 +3,7 @@ set "COURSIER_CACHE=%SRC_DIR%\cache" md "%COURSIER_CACHE%" || goto :ERROR -md "%SCRIPTS%" || goto :ERROR +md "%PREFIX%\Scripts" || goto :ERROR call coursier ^ bootstrap ^ @@ -12,7 +12,7 @@ call coursier ^ --no-default ^ -r central ^ -r typesafe:ivy-releases ^ - -f -o "%SCRIPTS%\coursier" ^ + -f -o "%PREFIX%\Scripts\coursier" ^ --standalone ^ || goto :ERROR From 42cfea16843a528990d45a79888709b8029031b8 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sat, 19 Dec 2020 17:04:30 -0500 Subject: [PATCH 11/13] try more debugging on windows --- recipes/coursier/build_coursier.bat | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/coursier/build_coursier.bat b/recipes/coursier/build_coursier.bat index 8e31f48a591ba..2b334d2fd43fa 100644 --- a/recipes/coursier/build_coursier.bat +++ b/recipes/coursier/build_coursier.bat @@ -5,6 +5,9 @@ set "COURSIER_CACHE=%SRC_DIR%\cache" md "%COURSIER_CACHE%" || goto :ERROR md "%PREFIX%\Scripts" || goto :ERROR +:: TODO: remove debugging +dir + call coursier ^ bootstrap ^ "io.get-coursier::coursier-cli:%PKG_VERSION%" ^ @@ -19,5 +22,5 @@ call coursier ^ goto :EOF :ERROR -echo FAIL Building %PKG_NAME% with error #%errorlevel%. +echo FAIL Building %PKG_NAME% %PKG_VERSION% with error #%errorlevel%. exit /b 1 From d63b0aaa8e6d284d845e8fef0278bd24e8218fe9 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sat, 19 Dec 2020 18:41:45 -0500 Subject: [PATCH 12/13] try using java -jar on windows --- recipes/coursier/build_coursier.bat | 4 +++- recipes/coursier/meta.yaml | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/coursier/build_coursier.bat b/recipes/coursier/build_coursier.bat index 2b334d2fd43fa..8aeada6f0b2ec 100644 --- a/recipes/coursier/build_coursier.bat +++ b/recipes/coursier/build_coursier.bat @@ -8,7 +8,9 @@ md "%PREFIX%\Scripts" || goto :ERROR :: TODO: remove debugging dir -call coursier ^ +java ^ + -noverify ^ + -jar coursier ^ bootstrap ^ "io.get-coursier::coursier-cli:%PKG_VERSION%" ^ --java-opt "-noverify" ^ diff --git a/recipes/coursier/meta.yaml b/recipes/coursier/meta.yaml index e738a3eae8e19..30e3da569bc03 100644 --- a/recipes/coursier/meta.yaml +++ b/recipes/coursier/meta.yaml @@ -11,8 +11,6 @@ source: sha256: cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 - url: https://github.com/{{ name }}/{{ name }}/releases/download/v{{ version }}/{{ name }} sha256: d3ba37e53d9cfa778af481c7099cd1dc485242283e9d2c5c2753f3859908cbd4 - - url: https://github.com/{{ name }}/{{ name }}/releases/download/v{{ version }}/{{ name }}.bat # [win] - sha256: 843319e0a3c57e588a0dd25edd2fee4621ec9cd152741d3128a5f5366264a593 # [win] build: number: 0 @@ -30,7 +28,7 @@ test: outputs: - name: {{ name }}-base requirements: - host: + build: - openjdk build: script: call "%RECIPE_DIR%\build_{{ name }}.bat" # [win] From 4bc6641755d5c30bed0c3b816771789db2c2925c Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Fri, 3 Sep 2021 10:44:11 -0500 Subject: [PATCH 13/13] coursier 2.0.16 --- recipes/coursier/meta.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/recipes/coursier/meta.yaml b/recipes/coursier/meta.yaml index 30e3da569bc03..dcdde216ff3e1 100644 --- a/recipes/coursier/meta.yaml +++ b/recipes/coursier/meta.yaml @@ -1,5 +1,5 @@ {% set name = "coursier" %} -{% set version = "2.0.7" %} +{% set version = "2.0.16" %} package: name: {{ name }} @@ -10,7 +10,7 @@ source: url: https://raw.githubusercontent.com/{{ name }}/{{ name }}/v{{ version }}/LICENSE sha256: cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 - url: https://github.com/{{ name }}/{{ name }}/releases/download/v{{ version }}/{{ name }} - sha256: d3ba37e53d9cfa778af481c7099cd1dc485242283e9d2c5c2753f3859908cbd4 + sha256: 631e8fbc1a3beb71a7130539b3b01852cfbe02edb94c5e9c6785981a0aee1e9c build: number: 0 @@ -57,7 +57,10 @@ about: home: https://get-coursier.io license: Apache-2.0 license_family: APACHE - license_file: {{ name }}-{{ version }}-LICENSE-APACHE + license_file: + - {{ name }}-{{ version }}-LICENSE-APACHE + # TODO: get licenses + # - library_licenses/ summary: Pure Scala Artifact Fetching doc_url: https://get-coursier.io/docs/overview dev_url: https://github.com/coursier/coursier