Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile: filename docs.* -> oci-runtime-spec.* #478

Merged
merged 1 commit into from
Jun 2, 2016

Conversation

vbatts
Copy link
Member

@vbatts vbatts commented Jun 1, 2016

When this repo was only 'specs', then the generic name was not so bad.
But now there is also the oci-image-spec, so this lines up it's unique
name as well.

This also variablizes the output filename so it will be easier for
release specific names.

Signed-off-by: Vincent Batts vbatts@hashbangbash.com

When this repo was only 'specs', then the generic name was not so bad.
But now there is also the oci-image-spec, so this lines up it's unique
name as well.

This also variablizes the output filename so it will be easier for
release specific names.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
DOCKER ?= $(shell command -v docker 2>/dev/null)
PANDOC ?= $(shell command -v pandoc 2>/dev/null)
EPOCH_TEST_COMMIT := 78e6667ae2d67aad100b28ee9580b41b7a24e667
OUTPUT_DIRNAME ?= output/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is pretty similar to PANDOC_DST. It's probably better to combine them into a single variable.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fair

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, no. They're similar, but not the same.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On Wed, Jun 01, 2016 at 11:58:45AM -0700, Vincent Batts wrote:

@@ -1,14 +1,17 @@

-SHELL ?= $(shell command -v bash 2>/dev/null)
-DOCKER ?= $(shell command -v docker 2>/dev/null)
-PANDOC ?= $(shell command -v pandoc 2>/dev/null)
+EPOCH_TEST_COMMIT := 78e6667
+OUTPUT_DIRNAME ?= output/

Well, no. They're similar, but not the same.

Right. I think they should be unified into a single variable, but
that unification will take a bit of thinking to figure out.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so, not in this PR ;-)

On Wed, Jun 1, 2016 at 3:01 PM, W. Trevor King notifications@github.com
wrote:

In Makefile
#478 (comment)
:

@@ -1,14 +1,17 @@

-SHELL ?= $(shell command -v bash 2>/dev/null)
-DOCKER ?= $(shell command -v docker 2>/dev/null)
-PANDOC ?= $(shell command -v pandoc 2>/dev/null)
+EPOCH_TEST_COMMIT := 78e6667
+OUTPUT_DIRNAME ?= output/

On Wed, Jun 01, 2016 at 11:58:45AM -0700, Vincent Batts wrote: > @@ -1,14
+1,17 @@ > > -SHELL ?= $(shell command -v bash 2>/dev/null) > -DOCKER ?=
$(shell command -v docker 2&gt;/dev/null) &gt; -PANDOC ?= $(shell command -v
pandoc 2>/dev/null) > +EPOCH_TEST_COMMIT := 78e6667
78e6667

+OUTPUT_DIRNAME ?= output/ Well, no. They're similar, but not the same.
Right. I think they should be unified into a single variable, but that
unification will take a bit of thinking to figure out.


You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
https://github.com/opencontainers/runtime-spec/pull/478/files/f656de6a567f016eed7f838d491b27097ad60dd9#r65422302,
or mute the thread
https://github.com/notifications/unsubscribe/AAEF6ZPvLh0a8XSGyQUmchtY0C_P0iq1ks5qHdcQgaJpZM4Iryg0
.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On Wed, Jun 01, 2016 at 12:09:19PM -0700, Vincent Batts wrote:

@@ -1,14 +1,17 @@

-SHELL ?= $(shell command -v bash 2>/dev/null)
-DOCKER ?= $(shell command -v docker 2>/dev/null)
-PANDOC ?= $(shell command -v pandoc 2>/dev/null)
+EPOCH_TEST_COMMIT := 78e6667
+OUTPUT_DIRNAME ?= output/

so, not in this PR ;-)

This PR is landing the new variable. Whether two overlapping
variables is confusing enough to be worth blocking a merge is up to
the maintainers ;). Still unifying them shouldn't be that hard.
Maybe just:

CONTAINER_OUTPUT_DIRNAME = $(OUTPUT_DIRNAME)

here,

CONTAINER_OUTPUT_DIRNAME = /$(OUTPUT_DIRNAME)

inside the ifneq DOCKER block, and PANDOC_DST →
CONTAINER_OUTPUT_DIRNAME in the rules?

@crosbymichael
Copy link
Member

crosbymichael commented Jun 1, 2016

LGTM

Approved with PullApprove

1 similar comment
@hqhq
Copy link
Contributor

hqhq commented Jun 2, 2016

LGTM

Approved with PullApprove

@hqhq hqhq merged commit a5ab330 into opencontainers:master Jun 2, 2016
@vbatts vbatts deleted the docs_output branch June 6, 2016 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants