You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2015/08/04 23:44:08 UTC
[02/11] aurora-packaging git commit: Use the correct
(aurora-specific) python build targets in RPM and deb scripts.
Use the correct (aurora-specific) python build targets in RPM and deb scripts.
Reviewed at https://reviews.apache.org/r/36945/
Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/203e6271
Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/203e6271
Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/203e6271
Branch: refs/heads/master
Commit: 203e6271408a801a7c7a3a005b600e8b78597f43
Parents: 3a5139d
Author: Bill Farner <wf...@apache.org>
Authored: Thu Jul 30 10:53:11 2015 -0700
Committer: Bill Farner <wf...@twitter.com>
Committed: Tue Aug 4 14:07:42 2015 -0700
----------------------------------------------------------------------
build-support/packaging/debian/rules | 2 +-
build-support/packaging/rpm/aurora.spec | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/203e6271/build-support/packaging/debian/rules
----------------------------------------------------------------------
diff --git a/build-support/packaging/debian/rules b/build-support/packaging/debian/rules
index 23828c0..17e00c0 100755
--- a/build-support/packaging/debian/rules
+++ b/build-support/packaging/debian/rules
@@ -34,7 +34,7 @@ __pants_build:
$(pants) binary src/main/python/apache/aurora/admin:kaurora_admin
$(pants) binary src/main/python/apache/aurora/client/cli:kaurora
$(pants) binary src/main/python/apache/aurora/executor/bin:thermos_executor
- $(pants) binary src/main/python/apache/thermos/cli/bin:thermos
+ $(pants) binary src/main/python/apache/aurora/tools:thermos
$(pants) binary src/main/python/apache/thermos/bin:thermos_runner
$(pants) binary src/main/python/apache/aurora/tools:thermos_observer
build-support/embed_runner_in_executor.py
http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/203e6271/build-support/packaging/rpm/aurora.spec
----------------------------------------------------------------------
diff --git a/build-support/packaging/rpm/aurora.spec b/build-support/packaging/rpm/aurora.spec
index 0c4c106..7cf8de6 100644
--- a/build-support/packaging/rpm/aurora.spec
+++ b/build-support/packaging/rpm/aurora.spec
@@ -182,10 +182,9 @@ popd
# Builds Aurora Thermos and GC executor PEX binaries.
./pants binary src/main/python/apache/aurora/executor/bin:thermos_executor
-./pants binary src/main/python/apache/thermos/cli/bin:thermos
-./pants binary src/main/python/apache/thermos/bin:thermos_ckpt
+./pants binary src/main/python/apache/aurora/tools:thermos
./pants binary src/main/python/apache/thermos/bin:thermos_runner
-./pants binary src/main/python/apache/thermos/observer/bin:thermos_observer
+./pants binary src/main/python/apache/aurora/tools:thermos_observer
# Packages the Thermos runner within the Thermos executor.
python <<EOF