diff --git a/build/jam/CommandLineArguments b/build/jam/CommandLineArguments index 6eedbcb5c4..033d5652dc 100644 --- a/build/jam/CommandLineArguments +++ b/build/jam/CommandLineArguments @@ -74,13 +74,6 @@ rule ProcessCommandLineArguments Echo " mount - Mount the Haiku image in the" " bfs_shell." ; Echo ; - Echo "Package upload to (git.haiku-os.org/hpkg-upload):" ; - Echo " jam upload-packages " ; - Echo ; - Echo "Remote repository creation (for testing a set of" - " packages):" ; - Echo " jam build-remote-test-repository " ; - Echo ; Echo "For more details on how to customize Haiku builds read" ; Echo "build/jam/UserBuildConfig.ReadMe." ; Exit ; @@ -97,27 +90,6 @@ rule ProcessCommandLineArguments } } - # 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) ; - } - - # Copy the given set of local package files to the remote repository - # and create a new version of that remote repository (useful for - # testing the package repository before pushing). - case build-remote-test-repository : { - BuildRemoteHaikuPortsRepository $(JAM_TARGETS[1]) - : $(JAM_TARGETS[2-]) ; - JAM_TARGETS = $(JAM_TARGETS[1]) ; - NotFile $(JAM_TARGETS) ; - Always $(JAM_TARGETS) ; - } - # A target starting with "@" is a build profile. case @* : { HAIKU_BUILD_PROFILE = [ Match "@(.*)" : $(JAM_TARGETS[1]) ] ; diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules index 37e4a18443..867dda1e35 100644 --- a/build/jam/RepositoryRules +++ b/build/jam/RepositoryRules @@ -705,65 +705,6 @@ EOF } -rule UploadPackages target : packages -{ - local packageListFile = HaikuPorts-packages ; - Depends $(target) : $(packageListFile) ; - - HAIKU_REMOTE_REPOSITORY_PACKAGES on $(target) = $(packages) ; - UploadPackages1 $(target) : $(packageListFile) ; -} - - -actions UploadPackages1 -{ - remote=git.haiku-os.org - remoteUser=$(HAIKU_REMOTE_USER) - if [ -n "$remoteUser" ]; then - remote="$remoteUser@$remote" - fi - - if [ -n "$(HAIKU_REMOTE_REPOSITORY_PACKAGES:E=:J)" ]; then - for package in $(HAIKU_REMOTE_REPOSITORY_PACKAGES) ; do - file=`basename $package` - if ! grep -q $file $(2); then - echo "Error: $file is not being referenced in $(2)" - exit 1 - fi - done - ssh $remote mkdir -p 'hpkg-upload' - scp $(HAIKU_REMOTE_REPOSITORY_PACKAGES) $remote:hpkg-upload/ - fi -} - - -rule BuildRemoteHaikuPortsRepository target : packages -{ - UploadPackages $(target) : $(packages) ; - - local packageListFile = HaikuPorts-packages ; - BuildRemoteHaikuPortsRepository1 $(target) : $(packageListFile) ; -} - - -actions BuildRemoteHaikuPortsRepository1 -{ - remote=git.haiku-os.org - remoteUser=$(HAIKU_REMOTE_USER) - if [ -n "$remoteUser" ]; then - remote="$remoteUser@$remote" - fi - - repoArch=$(TARGET_PACKAGING_ARCH) - scp $(2) $remote:hpkg-upload/$repoArch - - cd $(HAIKU_TOP) - branch=`git branch | cut -c3-` - - ssh $remote "build_repository_for_testing.sh $branch $repoArch" -} - - rule HaikuRepository repository : repoInfoTemplate : packages { # HaikuRepository : :