Skip to content

Commit

Permalink
General cleanup.
Browse files Browse the repository at this point in the history
Includes updating a few front-facing docs, removing old maven related tooling (leaving a few bits in pending their conversion to more bazel-friendliness), remove older bazel infra prior to bazelisk, etc.
  • Loading branch information
cgruber committed Jun 16, 2020
1 parent d5a149a commit 3fe20ac
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 106 deletions.
30 changes: 0 additions & 30 deletions .travis.yml

This file was deleted.

2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ note that a Google, Inc. copyright line must appear in every copyright notice.
All files are released with the Apache 2.0 license and any new files may only
be accepted under the terms of that license.



Before your code can be accepted into the project you must sign the
[Individual Contributor License Agreement (CLA)][1].

Expand Down
9 changes: 9 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Contributors

These authors have supplied code or other contributions to this repository.

- Google, Inc.
- various employees
- Christian Gruber

> Note: If your contribution is not accounted for here, please submit a pull request with an update.
27 changes: 12 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
*Make Open Easy*

[![LICENSE](https://img.shields.io/badge/license-Apache-blue.svg)](https://github.com/google/MOE/blob/master/LICENSE)
[![Travis CI](https://img.shields.io/travis/google/MOE.svg)](https://travis-ci.org/google/MOE)
[![GitHub Issues](https://img.shields.io/github/issues/google/MOE.svg)](https://github.com/google/MOE/issues)
[![GitHub Pull Requests](https://img.shields.io/github/issues-pr/google/MOE.svg)](https://github.com/google/MOE/pulls)
[![CI](https://github.com/cgruber/MOE/workflows/CI/badge.svg)](https://github.com/cgruber/MOE/actions?query=workflow%3ACI)
[![GitHub Issues](https://img.shields.io/github/issues/cgruber/MOE.svg)](https://github.com/cgruber/MOE/issues)
[![GitHub Pull Requests](https://img.shields.io/github/issues-pr/cgruber/MOE.svg)](https://github.com/cgruber/MOE/pulls)

> Note: This is a personal fork by [cgruber](http://github.com/cgruber)
## Introduction

Expand Down Expand Up @@ -37,13 +39,12 @@ documentation update, which is forthcoming.

### Building MOE

1. Install Apache Maven 3.1 if you don't already have it
1. Install [Bazelisk](http://github.com/bazelbuild/bazelisk)
2. Checkout the Java-MOE source `git clone [email protected]:google/MOE.git`
3. In the top-level directory that contains the build.xml file, run:
- `mvn install`
- `util/make-binary.sh`
4. The moe client binary should be created at `client/target/moe`

3. In the top level directory that contains the WORKSPACE file, run:
- `bazel build //client:moe`
4. The moe client binary should be created at `bazel-bin/client/moe`
5. (optionally) install the client somewhere in your `$PATH`

### Running MOE

Expand All @@ -52,16 +53,12 @@ Once you have the `moe` binary, you should be able to simply run:

## Contributing

Contributing to MOE is subject to the guidelines in the CONTRIBUTING.md file,
which, in brief, requires that contributors sign the [Individual Contributor
License Agreement (CLA)][CLA].

[CLA]: https://cla.developers.google.com/

Contributing to MOE is subject to the guidelines in the CONTRIBUTING.md file

## License

```
Copyright 2011 The Moe Authors. All Rights Reserved.
Copyright 2011 Google, Inc. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
16 changes: 16 additions & 0 deletions client/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library", "kt_jvm_binary")

java_binary(
name = "client-bin",
main_class = "com.google.devtools.moe.client.Moe",
runtime_deps = ["//client/src/main/java/com/google/devtools/moe/client"],
)

genrule(
name = "moe",
outs = ["moe"],
srcs = [
"//util:java-exec-prefix",
":client-bin_deploy.jar"
],
cmd_bash = "cat $(location //util:java-exec-prefix) $(location :client-bin_deploy.jar) > $@",
)
1 change: 0 additions & 1 deletion tools/bazel_0.22.0-linux-x86_64.deb.sha256

This file was deleted.

1 change: 1 addition & 0 deletions util/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exports_files(["java-exec-prefix"])
25 changes: 0 additions & 25 deletions util/generate-latest-docs.sh

This file was deleted.

29 changes: 6 additions & 23 deletions util/java-exec-prefix
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.

JAR_FILE=`which "$0" 2>/dev/null`

if [[ -n "$JAVA_HOME" ]]; then
JAVA_CMD="$JAVA_HOME/bin/java"
if [[ ! -f $JAVA_CMD ]]; then
echo "Cannot find java binary at $JAVA_CMD"
exit 1
fi
else
if [[ ! `which java` ]]; then
echo "Cannot find java binary on the executable PATH"
exit 1
fi
JAVA_CMD=`which java`
fi

if [[ ! -x $JAVA_CMD ]]; then
echo "Java command is not executable: $JAVA_CMD"
exit 1
fi

"$JAVA_CMD" $JVM_ARGS -jar $0 "$@"
exit 1
MYSELF=$(which "$0" 2>/dev/null)
[ $? -gt 0 ] && [ -f "$0" ] && MYSELF="./$0"
JAVA_CMD=java
[ -n "$JAVA_HOME" ] && JAVA_CMD="$JAVA_HOME/bin/java"
exec "$JAVA_CMD" $JAVA_ARGS -jar "$MYSELF" "$@"
exit 1
12 changes: 0 additions & 12 deletions util/make-binary.sh

This file was deleted.

0 comments on commit 3fe20ac

Please sign in to comment.