[haiku-commits] haiku: hrev46310 - build/jam
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 4 Nov 2013 00:20:41 +0100 (CET)
hrev46310 adds 1 changeset to branch 'master'
old head: 79f5b73db60b3602172b4278bf68310231022820
new head: e4bd712d11c4882e19b2145d257f0dbc498f6f79
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=e4bd712+%5E79f5b73
----------------------------------------------------------------------------
e4bd712: 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.
[ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46310
Commit: e4bd712d11c4882e19b2145d257f0dbc498f6f79
URL: http://cgit.haiku-os.org/haiku/commit/?id=e4bd712
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Sun Nov 3 22:53:31 2013 UTC
----------------------------------------------------------------------------
2 files changed, 11 insertions(+), 18 deletions(-)
build/jam/CommandLineArguments | 10 +++++-----
build/jam/RepositoryRules | 19 ++++++-------------
----------------------------------------------------------------------------
diff --git a/build/jam/CommandLineArguments b/build/jam/CommandLineArguments
index bb0aab7..79c7f9e 100644
--- a/build/jam/CommandLineArguments
+++ b/build/jam/CommandLineArguments
@@ -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) ;
diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index a7f358f..673a1af 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -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@xxxxxxxxxxxxxxx
+ 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"
}
Other related posts:
