Skip to content

Commit

Permalink
Merge pull request facebook#29 in ANDROID/buck from cwoodward/merge-u…
Browse files Browse the repository at this point in the history 
…pstream to master

* commit 'e5941b394187f6db3e8fc1ccf2bb5e4e9e390fe0': (346 commits)
  cxx: make ranlib a `ToolProvider` (take 2)
  cxx: use `ArchiverProvider` for archiver (take 2)
  BuckConfig: resolve relative paths when parsing `ToolProvider`s
  Added fine grained stats to measure post distributed build steps
  Adding app modularity consistency checks
  Remove unused imports
  haskell: fix deps for `haskell_ghci` rule
  Removed duplicate BUCK_CONFIG_OVERRIDE_FILE_NAME
  Weakly cache the manifest RuleKeyAndInputs
  Distributed build slaves now use environment from CommandRunnerParams
  Run macOS integration tests on all platforms
  Show a warning when the wifi is blacklisted
  Make integration test work for all c compilers
  Move out macro definition to a separate file
  Revert "Support empty header_path_prefix"
  Allow the base executor to be retrieved from CommandThreadManager
  Capture stderr for failed targets in build report
  Add addEnclosedElement to ArtificialElement interface
  Revert "cxx: use `ArchiverProvider` for archiver"
  Revert "cxx: make ranlib a `ToolProvider`"
  ...
  • Loading branch information
Christopher Woodward committed Aug 29, 2017
2 parents 2ac069b + e5941b3 commit a13190d
Show file tree
Hide file tree
Showing 1,491 changed files with 38,290 additions and 22,871 deletions.
3 changes: 3 additions & 0 deletions .buckconfig
View file
Expand Up @@ -38,6 +38,7 @@
.git, \
.buckd, \
build, \
build-ij, \
bin, \
**/*.swp, \
**/*#, \
Expand Down Expand Up @@ -65,3 +66,5 @@
[test]
; Maximum timeout of 1 minute per test.
timeout = 90000
[resources]
resource_aware_scheduling_enabled = true
14 changes: 7 additions & 7 deletions .classpath
View file
Expand Up @@ -5,10 +5,10 @@
<classpathentry kind="src" path="src-gen"/>
<classpathentry excluding="**/BUCK|**/testdata/**|com/facebook/buck/event/listener/noos/" kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="third-party/java/android/common-24.2.3.jar"/>
<classpathentry kind="lib" path="third-party/java/android/layoutlib-api-24.2.3.jar"/>
<classpathentry kind="lib" path="third-party/java/android/sdk-common-24.2.3.jar"/>
<classpathentry kind="lib" path="third-party/java/android/sdklib.jar"/>
<classpathentry kind="lib" path="third-party/java/android/common-25.3.0.jar"/>
<classpathentry kind="lib" path="third-party/java/android/layoutlib-api-25.3.0.jar"/>
<classpathentry kind="lib" path="third-party/java/android/sdk-common-25.3.0.jar"/>
<classpathentry kind="lib" path="third-party/java/android/sdklib-25.3.0.jar"/>
<classpathentry kind="lib" path="third-party/java/aether/aether-api-1.0.2.v20150114.jar" sourcepath="third-party/java/aether/aether-api-1.0.2.v20150114-sources.jar"/>
<classpathentry kind="lib" path="third-party/java/aether/aether-connector-basic-1.0.2.v20150114.jar" sourcepath="third-party/java/aether/aether-connector-basic-1.0.2.v20150114-sources.jar"/>
<classpathentry kind="lib" path="third-party/java/aether/aether-impl-1.0.0.v20140518.jar" sourcepath="third-party/java/aether/aether-impl-1.0.0.v20140518-sources.jar"/>
Expand Down Expand Up @@ -46,8 +46,8 @@
<classpathentry kind="lib" path="third-party/java/jacoco/org.jacoco.core-0.7.7.201606060606.jar"/>
<classpathentry kind="lib" path="third-party/java/jacoco/org.jacoco.report-0.7.7.201606060606.jar"/>
<classpathentry kind="lib" path="third-party/java/jetty/jetty-all-9.2.10.v20150310.jar"/>
<classpathentry kind="lib" path="third-party/java/jna/jna-4.2.0.jar" sourcepath="third-party/java/jna/jna-4.2.0-sources.jar"/>
<classpathentry kind="lib" path="third-party/java/jna/jna-platform-4.2.0.jar" sourcepath="third-party/java/jna/jna-platform-4.2.0-sources.jar"/>
<classpathentry kind="lib" path="third-party/java/jna/jna-4.4.0.jar" sourcepath="third-party/java/jna/jna-4.4.0-sources.jar"/>
<classpathentry kind="lib" path="third-party/java/jna/jna-platform-4.4.0.jar" sourcepath="third-party/java/jna/jna-platform-4.4.0-sources.jar"/>
<classpathentry kind="lib" path="third-party/java/jsr/javax.inject-1.jar"/>
<classpathentry kind="lib" path="third-party/java/jsr/jsr305.jar"/>
<classpathentry kind="lib" path="third-party/java/junit/junit-4.12.jar" sourcepath="third-party/java/junit/junit-4.12-sources.jar"/>
Expand Down Expand Up @@ -75,7 +75,7 @@
<classpathentry kind="lib" path="third-party/java/plexus/plexus-interpolation-1.21.jar"/>
<classpathentry kind="lib" path="third-party/java/plexus/plexus-utils-3.0.20.jar"/>
<classpathentry kind="lib" path="third-party/java/jimfs/jimfs-1.1.jar"/>
<classpathentry kind="lib" path="third-party/java/thrift/libthrift-0.9.3.jar"/>
<classpathentry kind="lib" path="third-party/java/thrift/libthrift-0.10.0.jar"/>
<classpathentry kind="lib" path="third-party/java/eclipse/org.eclipse.core.contenttype_3.5.100.v20160418-1621.jar"/>
<classpathentry kind="lib" path="third-party/java/eclipse/org.eclipse.core.jobs_3.8.0.v20160319-0610.jar"/>
<classpathentry kind="lib" path="third-party/java/eclipse/org.eclipse.core.resources_3.11.0.v20160422-0304.jar"/>
Expand Down
16 changes: 8 additions & 8 deletions .idea/libraries/android_tools_25_2_0.xml → .idea/libraries/android_tools_25_3_0.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/libraries/bazel.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions .idea/libraries/buck_lib.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion .idea/libraries/immutables_annotations.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/libraries/jmh.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/libraries/jna_4_2_0.xml → .idea/libraries/jna_4_4_0.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/libraries/jna_platform_4_2_0.xml → .idea/libraries/jna_platform_4_4_0.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/libraries/sqlite.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .inferconfig
View file
Expand Up @@ -9,5 +9,6 @@
"src/com/facebook/buck/testrunner",
"src-gen"
],
"skip-duplicated-types": false
"skip-duplicated-types": false,
"keep-going": false
}
6 changes: 6 additions & 0 deletions .travis.yml
View file
Expand Up @@ -20,6 +20,8 @@ addons:
sources:
# For newer gcc than precise supports out of the box.
- ubuntu-toolchain-r-test
# For newer ghc than precise supports out of the box.
- hvr-ghc
packages:
# Travis is on 64bit and there will be a cryptic aapt error w/o these libs.
# For native code tests, we need some additional libraries if we are in a 64-bit environment.
Expand All @@ -33,6 +35,8 @@ addons:
- g++-4.7
# Getting compile errors on javac 1.8.0_31-b13
- oracle-java8-installer
# Haskell tests require GHC (and at least version 7.6).
- ghc-8.0.2

before_install:
- rm -rf ${HOME}/travis-cxx
Expand All @@ -53,6 +57,8 @@ before_install:
- echo -e "[go]\n root = ${GOROOT}" >> .buckconfig.local
# Set up the Groovy environment
- export GROOVY_HOME=/usr/share/groovy/
# Haskell setup:
- export PATH=/opt/ghc/8.0.2/bin:$PATH

# https://docs.travis-ci.com/user/caching#Things-not-to-cache
# https://docs.travis-ci.com/user/caching#Explicitly-disabling-caching
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.md
View file
Expand Up @@ -71,6 +71,7 @@ To add a pre commit hook:

- Build `google-java-format` jar following instructions from [github page](https://github.com/google/google-java-format).
- Copy `config/git-hooks/pre-commit.template` to `.git/hooks/pre-commit`
- Make the script executable: `chmod +x .git/hooks/pre-commit`
- Replace `<<PATH_TO_JAR>>` in `.git/hooks/pre-commit` with the location of google-java-format jar.

### Warnings
Expand Down
10 changes: 6 additions & 4 deletions buck.iml
View file
Expand Up @@ -9,7 +9,6 @@
<sourceFolder url="file://$MODULE_DIR$/build-ij/immutables" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build-ij/immutables-test" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src-gen" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/com/facebook/buck/json/buck_parser" type="java-resource" relativeOutputPath="buck_parser" />
<excludeFolder url="file://$MODULE_DIR$/.buckd" />
<excludeFolder url="file://$MODULE_DIR$/buck-out" />
<excludeFolder url="file://$MODULE_DIR$/build" />
Expand All @@ -27,6 +26,7 @@
<excludeFolder url="file://$MODULE_DIR$/test/com/facebook/buck/crosscell/testdata" />
<excludeFolder url="file://$MODULE_DIR$/test/com/facebook/buck/cxx/elf/testdata" />
<excludeFolder url="file://$MODULE_DIR$/test/com/facebook/buck/cxx/testdata" />
<excludeFolder url="file://$MODULE_DIR$/test/com/facebook/buck/cxx/toolchain/testdata" />
<excludeFolder url="file://$MODULE_DIR$/test/com/facebook/buck/d/testdata" />
<excludeFolder url="file://$MODULE_DIR$/test/com/facebook/buck/distributed/testdata" />
<excludeFolder url="file://$MODULE_DIR$/test/com/facebook/buck/dotnet/testdata" />
Expand Down Expand Up @@ -83,18 +83,20 @@
<orderEntry type="library" name="jacoco" level="project" />
<orderEntry type="library" name="immutables-annotations" level="project" />
<orderEntry type="library" name="maven-lib" level="project" />
<orderEntry type="library" name="android-tools-25.2.0" level="project" />
<orderEntry type="library" name="oracle-jdk-stubs" level="project" />
<orderEntry type="library" name="junit" level="project" />
<orderEntry type="library" name="testng" level="project" />
<orderEntry type="library" name="eden" level="project" />
<orderEntry type="library" name="java-thrift-dependencies" level="project" />
<orderEntry type="library" name="xz-java-1.5" level="project" />
<orderEntry type="library" name="jna-4.2.0" level="project" />
<orderEntry type="library" name="jna-platform-4.2.0" level="project" />
<orderEntry type="library" name="jna-4.4.0" level="project" />
<orderEntry type="library" name="jna-platform-4.4.0" level="project" />
<orderEntry type="library" name="diffutils-1.3.0" level="project" />
<orderEntry type="library" name="jdom" level="project" />
<orderEntry type="library" name="okhttp-3.6.0" level="project" />
<orderEntry type="library" name="sqlite" level="project" />
<orderEntry type="library" name="android-tools-25.3.0" level="project" />
<orderEntry type="library" name="jmh" level="project" />
<orderEntry type="library" name="bazel" level="project" />
</component>
</module>

0 comments on commit a13190d

Please sign in to comment.