Replace jam build-remote-repository with jam upload-packages

* We are moving the HaikuPorts repositories over from haiku-files.org
  to packages.haiku-os.org, and we will be creating new repositories
  during a push hook from now on. As a result, only a small helper for
  uploading new packages into the appropriate upload folder is required.
This commit is contained in:
Oliver Tappe 2013-11-03 23:53:31 +01:00
parent 79f5b73db6
commit e4bd712d11
2 changed files with 11 additions and 18 deletions

View File

@ -66,11 +66,11 @@ rule ProcessCommandLineArguments
}
}
# Copy the given set of local package files to the remote repository
# and create a new version of that remote repository.
case build-remote-repository : {
BuildRemoteHaikuPortsRepository $(JAM_TARGETS[1])
: $(JAM_TARGETS[2-]) ;
# Copy the given set of local package files to the git repository
# server, where they will be used for creating a new repository
# during the push hook.
case upload-packages : {
UploadPackages $(JAM_TARGETS[1]) : $(JAM_TARGETS[2-]) ;
JAM_TARGETS = $(JAM_TARGETS[1]) ;
NotFile $(JAM_TARGETS) ;
Always $(JAM_TARGETS) ;

View File

@ -626,19 +626,19 @@ EOF
}
rule BuildRemoteHaikuPortsRepository target : packages
rule UploadPackages target : packages
{
local packageListFile = <repository-package-list>HaikuPorts-packages ;
Depends $(target) : $(packageListFile) ;
HAIKU_REMOTE_REPOSITORY_PACKAGES on $(target) = $(packages) ;
BuildRemoteHaikuPortsRepository1 $(target) : $(packageListFile) ;
UploadPackages1 $(target) : $(packageListFile) ;
}
actions BuildRemoteHaikuPortsRepository1
actions UploadPackages1
{
remote=haiku_files@haiku-files.org
remote=git.haiku-os.org
if [ -n "$(HAIKU_REMOTE_REPOSITORY_PACKAGES:E=:J)" ]; then
for package in $(HAIKU_REMOTE_REPOSITORY_PACKAGES) ; do
@ -648,14 +648,7 @@ actions BuildRemoteHaikuPortsRepository1
exit 1
fi
done
scp $(HAIKU_REMOTE_REPOSITORY_PACKAGES) \
$remote:haiku-files.org/files/hpkg/
ssh $remote mkdir -p 'hpkg-upload'
scp $(HAIKU_REMOTE_REPOSITORY_PACKAGES) $remote:hpkg-upload/
fi
packageList=package-list.$(TARGET_PACKAGING_ARCH)
scp $(2) $remote:build_repository/$packageList
ssh $remote \
"cd build_repository \
&& ./build_repo.sh $(TARGET_PACKAGING_ARCH) $packageList"
}