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

Changed CopySetHaikuRevision1 actions not to fail, when either of the

Browse Source 
tools doesn't exist. Fixes #2860.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28226 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-10-18 09:23:42 +00:00
parent a6a18aeb66
commit 2dd847b6ff
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FileRules
+15 -10
View File
@@ -56,7 +56,7 @@ rule RelSymLink
rule AbsSymLink rule AbsSymLink
{ {
# AbsSymLink <link> : <link target> : <link dir> # AbsSymLink <link> : <link target> : <link dir>
# : <makeDefaultDependencies> ; # : <makeDefaultDependencies> ;
# Creates an absolute symbolic link from <link> to <link target>. # Creates an absolute symbolic link from <link> to <link target>.
# <link> and <link target> must be usual targets. If <link dir> is # <link> and <link target> must be usual targets. If <link dir> is
@@ -127,12 +127,12 @@ rule HaikuInstall
Chmod $(target) ; Chmod $(target) ;
} }
if $(OWNER) && $(CHOWN) { if $(OWNER) && $(CHOWN) {
Chown $(target) ; Chown $(target) ;
OWNER on $(target) = $(OWNER) ; OWNER on $(target) = $(OWNER) ;
} }
if $(GROUP) && $(CHGRP) { if $(GROUP) && $(CHGRP) {
Chgrp $(target) ; Chgrp $(target) ;
GROUP on $(target) = $(GROUP) ; GROUP on $(target) = $(GROUP) ;
} }
@@ -173,7 +173,7 @@ rule HaikuInstallRelSymLink
HaikuInstall $(1) : $(2) : $(3) : $(4) : InstallRelSymLinkAdapter ; HaikuInstall $(1) : $(2) : $(3) : $(4) : InstallRelSymLinkAdapter ;
} }
rule UnarchiveObjects rule UnarchiveObjects
{ {
# UnarchiveObjects <target objects> : <static object> # UnarchiveObjects <target objects> : <static object>
@@ -251,13 +251,18 @@ rule CopySetHaikuRevision target : source
actions CopySetHaikuRevision1 actions CopySetHaikuRevision1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
revision=`(LC_ALL=C LANG=C svn info $(HAIKU_TOP) 2> /dev/null || revision=`LC_ALL=C LANG=C svn info $(HAIKU_TOP) 2> /dev/null |
(cd $(HAIKU_TOP) && LC_ALL=C LANG=C git svn info) 2> /dev/null ||
(git log --max-count=1 --grep="git-svn-id:" 2> /dev/null |
grep git-svn-id: | cut -d '@' -f 2 |
awk '{printf "Revision: " $1}') 2> /dev/null ||
echo Revision: 0) |
grep Revision | awk '{printf $2}'` grep Revision | awk '{printf $2}'`
if [ "$revision" = 0 -o "$revision" = "" ]; then
revision=`(cd $(HAIKU_TOP) && LC_ALL=C LANG=C git svn info)
2> /dev/null ||
(git log --max-count=1 --grep="git-svn-id:" 2> /dev/null |
grep git-svn-id: | cut -d '@' -f 2 |
awk '{printf $1}') 2> /dev/null`
fi
if [ "$revision" = "" ]; then
revision=0
fi
$(2[1]) --data $(2[3]) $(1) && $(2[1]) --data $(2[3]) $(1) &&
$(2[2]) $(1) ${revision} $(2[2]) $(1) ${revision}
} }