diff --git a/src/recipe/lang/Clojure.c b/src/recipe/lang/Clojure.c index b355b2a..df3a603 100644 --- a/src/recipe/lang/Clojure.c +++ b/src/recipe/lang/Clojure.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_clojure); +def_target(pl_clojure, "clojure/clojars/cloj/lein"); void pl_clojure_prelude () diff --git a/src/recipe/lang/Dart/Flutter.c b/src/recipe/lang/Dart/Flutter.c index 21f90c0..83b1389 100644 --- a/src/recipe/lang/Dart/Flutter.c +++ b/src/recipe/lang/Dart/Flutter.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_dart_flutter); +def_target(pl_dart_flutter, "flutter"); void pl_dart_flutter_prelude (void) diff --git a/src/recipe/lang/Dart/Pub.c b/src/recipe/lang/Dart/Pub.c index 34255e8..b1ca213 100644 --- a/src/recipe/lang/Dart/Pub.c +++ b/src/recipe/lang/Dart/Pub.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_dart); +def_target(pl_dart, "dart/pub"); void pl_dart_prelude (void) diff --git a/src/recipe/lang/Go.c b/src/recipe/lang/Go.c index 65e05b2..adcee8a 100644 --- a/src/recipe/lang/Go.c +++ b/src/recipe/lang/Go.c @@ -16,7 +16,7 @@ GoProxyIO = {NotSkip, NA, NA, "https://goproxy.io/github.com/aws/aws-sdk-go/@v/v1.45.2.zip", ACCURATE} // 30 MB }; -def_target(pl_go); +def_target(pl_go, "go/golang/goproxy"); void pl_go_prelude () diff --git a/src/recipe/lang/Haskell.c b/src/recipe/lang/Haskell.c index 6505b78..af3ae78 100644 --- a/src/recipe/lang/Haskell.c +++ b/src/recipe/lang/Haskell.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_haskell); +def_target(pl_haskell, "haskell/cabal/stack/hackage"); void pl_haskell_prelude () diff --git a/src/recipe/lang/Java.c b/src/recipe/lang/Java.c index 6562b0e..b8c190e 100644 --- a/src/recipe/lang/Java.c +++ b/src/recipe/lang/Java.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_java); +def_target(pl_java, "java/maven/mvn/gradle"); void pl_java_prelude () diff --git a/src/recipe/lang/JavaScript/Bun.c b/src/recipe/lang/JavaScript/Bun.c index 539a7d1..ac7f3aa 100644 --- a/src/recipe/lang/JavaScript/Bun.c +++ b/src/recipe/lang/JavaScript/Bun.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_js_bun); +def_target(pl_js_bun, "bun"); void pl_js_bun_prelude (void) diff --git a/src/recipe/lang/JavaScript/Yarn.c b/src/recipe/lang/JavaScript/Yarn.c index 757973d..9430ab9 100644 --- a/src/recipe/lang/JavaScript/Yarn.c +++ b/src/recipe/lang/JavaScript/Yarn.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_js_yarn); +def_target(pl_js_yarn, "yarn"); void pl_js_yarn_prelude (void) diff --git a/src/recipe/lang/JavaScript/common.h b/src/recipe/lang/JavaScript/common.h index 460d8f0..b5b2d1b 100644 --- a/src/recipe/lang/JavaScript/common.h +++ b/src/recipe/lang/JavaScript/common.h @@ -9,7 +9,7 @@ static MirrorSite_t NpmMirror = {SKIP, NULL, NULL, NULL, ACCURATE} }; -def_target(pl_js_group); +def_target(pl_js_group, "js/javascript/node/nodejs"); void pl_js_group_prelude (void) diff --git a/src/recipe/lang/JavaScript/npm.c b/src/recipe/lang/JavaScript/npm.c index 13f0c4a..e4ab4a4 100644 --- a/src/recipe/lang/JavaScript/npm.c +++ b/src/recipe/lang/JavaScript/npm.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_js_npm); +def_target(pl_js_npm, "npm"); void pl_js_npm_prelude (void) diff --git a/src/recipe/lang/JavaScript/nvm.c b/src/recipe/lang/JavaScript/nvm.c index c5040d1..618c8c2 100644 --- a/src/recipe/lang/JavaScript/nvm.c +++ b/src/recipe/lang/JavaScript/nvm.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_js_nvm); +def_target(pl_js_nvm, "nvm"); void pl_js_nvm_prelude (void) diff --git a/src/recipe/lang/JavaScript/pnpm.c b/src/recipe/lang/JavaScript/pnpm.c index 922a1ef..87b9c59 100644 --- a/src/recipe/lang/JavaScript/pnpm.c +++ b/src/recipe/lang/JavaScript/pnpm.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_js_pnpm); +def_target(pl_js_pnpm, "pnpm"); void pl_js_pnpm_prelude (void) diff --git a/src/recipe/lang/Julia.c b/src/recipe/lang/Julia.c index a5ca313..86da566 100644 --- a/src/recipe/lang/Julia.c +++ b/src/recipe/lang/Julia.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_julia); +def_target(pl_julia, "julia"); void pl_julia_prelude () diff --git a/src/recipe/lang/Lua.c b/src/recipe/lang/Lua.c index e2351b8..fa1a2f8 100644 --- a/src/recipe/lang/Lua.c +++ b/src/recipe/lang/Lua.c @@ -9,7 +9,7 @@ static MirrorSite_t Api7 = {SKIP, ToFill, ToFill, NULL, ROUGH} }; -def_target(pl_lua); +def_target(pl_lua, "lua/luarocks"); void pl_lua_prelude () diff --git a/src/recipe/lang/NuGet.c b/src/recipe/lang/NuGet.c index a6effb9..4c7fc76 100644 --- a/src/recipe/lang/NuGet.c +++ b/src/recipe/lang/NuGet.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_nuget); +def_target(pl_nuget, "nuget/net/.net/dotnet"); void pl_nuget_prelude () diff --git a/src/recipe/lang/OCaml.c b/src/recipe/lang/OCaml.c index f89f656..e69f57a 100644 --- a/src/recipe/lang/OCaml.c +++ b/src/recipe/lang/OCaml.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_ocaml); +def_target(pl_ocaml, "ocaml/opam"); void pl_ocaml_prelude () diff --git a/src/recipe/lang/PHP.c b/src/recipe/lang/PHP.c index c0969c3..947ef2f 100644 --- a/src/recipe/lang/PHP.c +++ b/src/recipe/lang/PHP.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_php); +def_target(pl_php, "php/composer"); void pl_php_prelude () diff --git a/src/recipe/lang/Perl.c b/src/recipe/lang/Perl.c index 722d9f6..26ef064 100644 --- a/src/recipe/lang/Perl.c +++ b/src/recipe/lang/Perl.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_perl); +def_target(pl_perl, "perl/cpan"); void pl_perl_prelude () diff --git a/src/recipe/lang/Python/PDM.c b/src/recipe/lang/Python/PDM.c index b42fc0b..398c681 100644 --- a/src/recipe/lang/Python/PDM.c +++ b/src/recipe/lang/Python/PDM.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_python_pdm); +def_target(pl_python_pdm, "pdm"); void pl_python_pdm_prelude (void) diff --git a/src/recipe/lang/Python/Poetry.c b/src/recipe/lang/Python/Poetry.c index 566cd8b..fe6e08a 100644 --- a/src/recipe/lang/Python/Poetry.c +++ b/src/recipe/lang/Python/Poetry.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_python_poetry); +def_target(pl_python_poetry, "poetry"); void pl_python_poetry_prelude (void) diff --git a/src/recipe/lang/Python/Rye.c b/src/recipe/lang/Python/Rye.c index d2ca24d..c34c82d 100644 --- a/src/recipe/lang/Python/Rye.c +++ b/src/recipe/lang/Python/Rye.c @@ -4,7 +4,7 @@ * 由于Rye已经有后继uv了,所以我们不把该管理器纳入Python group中 * ------------------------------------------------------------*/ -def_target(pl_python_rye); +def_target(pl_python_rye, "rye"); void pl_python_rye_prelude (void) diff --git a/src/recipe/lang/Python/common.h b/src/recipe/lang/Python/common.h index e84da1c..a35bac2 100644 --- a/src/recipe/lang/Python/common.h +++ b/src/recipe/lang/Python/common.h @@ -4,7 +4,7 @@ #include "rawstr4c.h" -def_target(pl_python_group); +def_target(pl_python_group, "python/pypi/py"); /** * @note 测速链接的这个前缀是 ${host}/pipi/web/pacakges/56/e4.... diff --git a/src/recipe/lang/Python/pip.c b/src/recipe/lang/Python/pip.c index b428901..bf49c0c 100644 --- a/src/recipe/lang/Python/pip.c +++ b/src/recipe/lang/Python/pip.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_python_pip); +def_target(pl_python_pip, "pip"); void pl_python_pip_prelude (void) diff --git a/src/recipe/lang/Python/uv.c b/src/recipe/lang/Python/uv.c index d80ac86..992024c 100644 --- a/src/recipe/lang/Python/uv.c +++ b/src/recipe/lang/Python/uv.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_python_uv); +def_target(pl_python_uv, "uv"); void pl_python_uv_prelude (void) diff --git a/src/recipe/lang/R.c b/src/recipe/lang/R.c index 8166650..b2712f1 100644 --- a/src/recipe/lang/R.c +++ b/src/recipe/lang/R.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_r); +def_target(pl_r, "r/cran"); void pl_r_prelude () diff --git a/src/recipe/lang/Ruby/Ruby.c b/src/recipe/lang/Ruby/Ruby.c index 725ec73..10f0854 100644 --- a/src/recipe/lang/Ruby/Ruby.c +++ b/src/recipe/lang/Ruby/Ruby.c @@ -9,7 +9,7 @@ static MirrorSite_t RubyChina = {NotSkip, NA, NA, "https://gems.ruby-china.com/rubygems/gems/nokogiri-1.15.0-java.gem", ACCURATE} // 9.9 MB }; -def_target(pl_ruby); +def_target(pl_ruby, "gem/ruby/rb/rubygem/rubygems/bundler"); void pl_ruby_prelude (void) diff --git a/src/recipe/lang/Rust/Cargo.c b/src/recipe/lang/Rust/Cargo.c index 2a91573..616e23e 100644 --- a/src/recipe/lang/Rust/Cargo.c +++ b/src/recipe/lang/Rust/Cargo.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------*/ -def_target(pl_rust_cargo); +def_target(pl_rust_cargo, "rust/cargo/crate/crates"); void pl_rust_cargo_prelude (void) diff --git a/src/recipe/lang/Rust/rustup.c b/src/recipe/lang/Rust/rustup.c index b9152a3..be34d78 100644 --- a/src/recipe/lang/Rust/rustup.c +++ b/src/recipe/lang/Rust/rustup.c @@ -5,7 +5,7 @@ // Size: 20MB #define PL_Rustup_Speed_URL_Suffix -def_target(pl_rust_rustup); +def_target(pl_rust_rustup, "rustup"); void pl_rust_rustup_prelude (void) diff --git a/src/recipe/menu.c b/src/recipe/menu.c index 38e3497..f71f13a 100644 --- a/src/recipe/menu.c +++ b/src/recipe/menu.c @@ -14,34 +14,34 @@ TargetRegisterInfo_t chsrc_pl_menu[] = { - {t(pl_ruby), "gem ruby rb rubygem rubygems bundler"}, - {t(pl_python_group), "python pypi py"}, - {t(pl_python_pip), "pip"}, - {t(pl_python_poetry), "poetry"}, - {t(pl_python_pdm), "pdm"}, - {t(pl_python_rye), "rye"}, - {t(pl_python_uv), "uv"}, - {t(pl_js_group), "node nodejs"}, - {t(pl_js_bun), "bun"}, - {t(pl_js_npm), "npm"}, - {t(pl_js_yarn), "yarn"}, - {t(pl_js_pnpm), "pnpm"}, - {t(pl_js_nvm), "nvm"}, - {t(pl_perl), "perl cpan"}, - {t(pl_php), "php composer"}, - {t(pl_lua), "lua luarocks"}, - {t(pl_go), "go golang goproxy"}, - {t(pl_rust_cargo), "rust cargo crate crates"}, - {t(pl_rust_rustup), "rustup"}, - {t(pl_java), "java maven mvn gradle"}, - {t(pl_clojure), "clojure clojars cloj lein"}, - {t(pl_dart), "dart pub"}, - {t(pl_dart_flutter), "flutter"}, - {t(pl_nuget), "nuget net .net dotnet"}, - {t(pl_haskell), "haskell cabal stack hackage"}, - {t(pl_ocaml), "ocaml opam"}, - {t(pl_r), "cran r"}, - {t(pl_julia), "julia"}, + {t(pl_ruby)}, + {t(pl_python_group)}, + {t(pl_python_pip)}, + {t(pl_python_poetry)}, + {t(pl_python_pdm)}, + {t(pl_python_rye)}, + {t(pl_python_uv)}, + {t(pl_js_group)}, + {t(pl_js_bun)}, + {t(pl_js_npm)}, + {t(pl_js_yarn)}, + {t(pl_js_pnpm)}, + {t(pl_js_nvm)}, + {t(pl_perl)}, + {t(pl_php)}, + {t(pl_lua)}, + {t(pl_go)}, + {t(pl_rust_cargo)}, + {t(pl_rust_rustup)}, + {t(pl_java)}, + {t(pl_clojure)}, + {t(pl_dart)}, + {t(pl_dart_flutter)}, + {t(pl_nuget)}, + {t(pl_haskell)}, + {t(pl_ocaml)}, + {t(pl_r)}, + {t(pl_julia)}, };