[haiku-commits] haiku: hrev47462 - in build/jam: . images/definitions
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 3 Jul 2014 18:12:44 +0200 (CEST)
hrev47462 adds 2 changesets to branch 'master'
old head: b04949711d8c74533fb3ef57bfdb738686c70a9e
new head: 6f32bafa70f2b5ef12a14d4c772be17d85e1c74b
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=6f32baf+%5Eb049497
----------------------------------------------------------------------------
5de87ca: Copy haikuports/FormatVersions onto the bootstrap image.
* Without it, haikuporter will believe there's a version mismatch
between itself and the haikuports tree.
6f32baf: Use a specific packager for continuous integration builds.
[ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 11 insertions(+), 1 deletion(-)
build/jam/RepositoryRules | 7 ++++++-
build/jam/images/definitions/bootstrap | 5 +++++
############################################################################
Commit: 5de87ca904bb614263dd312bebfa8179a6f5969d
URL: http://cgit.haiku-os.org/haiku/commit/?id=5de87ca
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Thu Jul 3 15:45:53 2014 UTC
Copy haikuports/FormatVersions onto the bootstrap image.
* Without it, haikuporter will believe there's a version mismatch
between itself and the haikuports tree.
----------------------------------------------------------------------------
diff --git a/build/jam/images/definitions/bootstrap
b/build/jam/images/definitions/bootstrap
index 2392abc..78986c7 100644
--- a/build/jam/images/definitions/bootstrap
+++ b/build/jam/images/definitions/bootstrap
@@ -9,3 +9,8 @@ CopyDirectoryToHaikuImage home haikuports
: input-source-packages : -x *_source-*.hpkg : isTarget ;
AddFilesToHaikuImage home haikuports
: [ BuildHaikuPortsRepositoryConfig /boot/home/haikuports ] ;
+
+# copy the haikuports format versions file
+local formatVersionsFile = <haikuports>FormatVersions ;
+SEARCH on $(formatVersionsFile) = $(HAIKU_PORTS) ;
+AddFilesToHaikuImage home haikuports : $(formatVersionsFile) ;
############################################################################
Revision: hrev47462
Commit: 6f32bafa70f2b5ef12a14d4c772be17d85e1c74b
URL: http://cgit.haiku-os.org/haiku/commit/?id=6f32baf
Author: Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date: Thu Jul 3 15:48:35 2014 UTC
Use a specific packager for continuous integration builds.
----------------------------------------------------------------------------
diff --git a/build/jam/RepositoryRules b/build/jam/RepositoryRules
index 0ddec61..98cdc01 100644
--- a/build/jam/RepositoryRules
+++ b/build/jam/RepositoryRules
@@ -672,7 +672,12 @@ rule BuildHaikuPortsRepositoryConfig treePath
actions BuildHaikuPortsRepositoryConfig1
{
- echo '#PACKAGER="Joe Hacker <user@xxxxxxxx>"' > $(1)
+ # use a specific packager for continuous integration builds (buildbot)
+ if [ "$(HAIKU_CONTINUOUS_INTEGRATION_BUILD)" = "1" ]; then
+ echo 'PACKAGER="Haiku buildmaster <buildmaster@xxxxxxxxxxxx>"'
> $(1)
+ else
+ echo '#PACKAGER="Joe Hacker <user@xxxxxxxx>"' > $(1)
+ fi
cat >> $(1) << EOF
TREE_PATH="$(HAIKU_REPOSITORY_TREE_PATH)"
TARGET_ARCHITECTURE="$(HAIKU_PACKAGING_ARCH)"
Other related posts:
- » [haiku-commits] haiku: hrev47462 - in build/jam: . images/definitions - zooey
