Skip to content

Commit

Permalink
Move scripts back to hack/, leave docs in project/
Browse files Browse the repository at this point in the history
This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead.

Signed-off-by: Andrew "Tianon" Page <[email protected]>
  • Loading branch information
tianon committed Mar 13, 2015
1 parent a97fbe7 commit 949a21b
Show file tree
Hide file tree
Showing 38 changed files with 13 additions and 79 deletions.
2 changes: 1 addition & 1 deletion .mailmap
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generate AUTHORS: project/generate-authors.sh
# Generate AUTHORS: hack/generate-authors.sh

# Tip for finding duplicates (besides scanning the output of AUTHORS for name
# duplicates that aren't also email duplicates): scan the output of:
Expand Down
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file lists all individuals having contributed content to the repository.
# For how it is generated, see `project/generate-authors.sh`.
# For how it is generated, see `hack/generate-authors.sh`.

Aanand Prasad <[email protected]>
Aaron Feng <[email protected]>
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions docs/sources/project/set-up-dev-env.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,9 @@ build and run a `docker` binary in your container.

4. From the `/go/src/github.com/docker/docker` directory make a `docker` binary with the `make.sh` script.

root@5f8630b873fe:/go/src/github.com/docker/docker# project/make.sh binary
root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh binary

You only call `project/make.sh` to build a binary _inside_ a Docker
You only call `hack/make.sh` to build a binary _inside_ a Docker
development container as you are now. On your host, you'll use `make`
commands (more about this later).

Expand Down
10 changes: 5 additions & 5 deletions docs/sources/project/test-and-docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Run the entire test suite on your current repository:
### Run test targets inside the development container

If you are working inside a Docker development container, you use the
`project/make.sh` script to run tests. The `project/make.sh` script doesn't
`hack/make.sh` script to run tests. The `hack/make.sh` script doesn't
have a single target that runs all the tests. Instead, you provide a single
commmand line with multiple targets that does the same thing.

Expand All @@ -148,17 +148,17 @@ Try this now.

$ docker run --privileged --rm -ti -v `pwd`:/go/src/github.com/docker/docker dry-run-test /bin/bash

3. Run the tests using the `project/make.sh` script.
3. Run the tests using the `hack/make.sh` script.

root@5f8630b873fe:/go/src/github.com/docker/docker# project/make.sh dynbinary binary cross test-unit test-integration test-integration-cli test-docker-py
root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-unit test-integration test-integration-cli test-docker-py

The tests run just as they did within your local host.


Of course, you can also run a subset of these targets too. For example, to run
just the unit tests:

root@5f8630b873fe:/go/src/github.com/docker/docker# project/make.sh dynbinary binary cross test-unit
root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-unit

Most test targets require that you build these precursor targets first:
`dynbinary binary cross`
Expand All @@ -174,7 +174,7 @@ your local host you can run the `TestBuild` test with this command:

To run the same test inside your Docker development container, you do this:

root@5f8630b873fe:/go/src/github.com/docker/docker# TESTFLAGS='-run ^TestBuild$' project/make.sh
root@5f8630b873fe:/go/src/github.com/docker/docker# TESTFLAGS='-run ^TestBuild$' hack/make.sh

## If test under Boot2Docker fail do to space errors

Expand Down
1 change: 0 additions & 1 deletion hack

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion project/generate-authors.sh → hack/generate-authors.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")/.."
{
cat <<-'EOH'
# This file lists all individuals having contributed content to the repository.
# For how it is generated, see `project/generate-authors.sh`.
# For how it is generated, see `hack/generate-authors.sh`.
EOH
echo
git log --format='%aN <%aE>' | LC_ALL=C.UTF-8 sort -uf
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions project/make/README.md → hack/make/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ Each script is named after the bundle it creates.
They should not be called directly - instead, pass it as argument to make.sh, for example:

```
./project/make.sh test
./project/make.sh binary ubuntu
./hack/make.sh test
./hack/make.sh binary ubuntu
# Or to run all bundles:
./project/make.sh
./hack/make.sh
```

To add a bundle:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 0 additions & 3 deletions project/allmaintainers.sh

This file was deleted.

62 changes: 0 additions & 62 deletions project/getmaintainer.sh

This file was deleted.

0 comments on commit 949a21b

Please sign in to comment.