i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Remove now-defunct jam commands.

Browse Source
This commit is contained in:
Augustin Cavalier
2017-11-25 21:15:10 +01:00
parent 5f8613a22c
commit 08965a6568
2 changed files with 0 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/CommandLineArguments
-28
View File
@@ -74,13 +74,6 @@ rule ProcessCommandLineArguments
Echo " mount - Mount the Haiku image in the" Echo " mount - Mount the Haiku image in the"
" bfs_shell." ; " bfs_shell." ;
Echo ; Echo ;
Echo "Package upload to (git.haiku-os.org/hpkg-upload):" ;
Echo " jam upload-packages <packages ...> " ;
Echo ;
Echo "Remote repository creation (for testing a set of"
" packages):" ;
Echo " jam build-remote-test-repository <packages ...> " ;
Echo ;
Echo "For more details on how to customize Haiku builds read" ; Echo "For more details on how to customize Haiku builds read" ;
Echo "build/jam/UserBuildConfig.ReadMe." ; Echo "build/jam/UserBuildConfig.ReadMe." ;
Exit ; 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. # A target starting with "@" is a build profile.
case @* : { case @* : {
HAIKU_BUILD_PROFILE = [ Match "@(.*)" : $(JAM_TARGETS[1]) ] ; HAIKU_BUILD_PROFILE = [ Match "@(.*)" : $(JAM_TARGETS[1]) ] ;
build/jam/RepositoryRules
-59
View File
@@ -705,65 +705,6 @@ EOF
} }
rule UploadPackages target : packages
{
local packageListFile = <repository-package-list>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 = <repository-package-list>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 rule HaikuRepository repository : repoInfoTemplate : packages
{ {
# HaikuRepository <repository> : <repoInfoTemplate> : <packages> # HaikuRepository <repository> : <repoInfoTemplate> : <packages>