From f0b99b54bba82e7ba56fa778961ea39f7297b57c Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 19 Jan 2014 00:41:39 +0100 Subject: [PATCH] RepositoryConfig rule: Make a bit more generic Instead of the repository the URL can now be passed. It can use the "$version" placeholder, which will be replaced by the content of the given version file. If the URL is not given, the one from the repository info will be used. --- build/jam/RepositoryRules | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules index af0a28f3c9..617d14fbf5 100644 --- a/build/jam/RepositoryRules +++ b/build/jam/RepositoryRules @@ -172,7 +172,7 @@ rule RemotePackageRepository repository : architecture : repositoryUrl local repositoryConfig = $(repository:G=repository-config)-config ; MakeLocate $(repositoryConfig) : $(repositoriesDir) ; RepositoryConfig $(repositoryConfig) : $(repositoryInfo) - : $(packagesChecksumFile) : $(repository) ; + : $(repositoryUrl)/$version : $(packagesChecksumFile) ; HAIKU_REPOSITORY_CACHE_FILE on $(repository) = $(repositoryFile) ; HAIKU_REPOSITORY_CONFIG_FILE on $(repository) = $(repositoryConfig) ; @@ -209,23 +209,24 @@ actions GeneratedRepositoryPackageList1 } -rule RepositoryConfig repoConfig : repoInfo : packagesChecksumFile : repository +rule RepositoryConfig repoConfig : repoInfo : url : versionFile { - repository = $(repository:G=repository) ; - - HAIKU_REPOSITORY_URL on $(repoConfig) - = [ on $(repository) return $(HAIKU_REPOSITORY_URL) ] ; + HAIKU_REPOSITORY_URL on $(repoConfig) = $(url) ; Depends $(repoConfig) - : create_repository_config $(repoInfo) $(packagesChecksumFile) ; + : create_repository_config $(repoInfo) $(versionFile) ; RepositoryConfig1 $(repoConfig) - : create_repository_config $(repoInfo) $(packagesChecksumFile) ; + : create_repository_config $(repoInfo) $(versionFile) ; } actions RepositoryConfig1 { + version= + if [ -n "$(2[3]:E)" ]; then + version=`cat "$(2[3]:E)"` + fi $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) - $(2[1]) $(HAIKU_REPOSITORY_URL)/`cat $(2[3])` $(2[2]) $(1) + $(2[1]) $(HAIKU_REPOSITORY_URL) $(2[2]) $(1) }