Skip to content

GitLab

Switch branch/tag
  1. 29 Oct, 2015 1 commit
  3. 28 Oct, 2015 2 commits
    • Colin Cross's avatar
      Merge "Remove use of .INTERMEDIATE" · dda5e96b
      Colin Cross authored
      dda5e96b
    • Colin Cross's avatar
      Remove use of .INTERMEDIATE · 42470e91
      Colin Cross authored 
      make 3.81 has a bug where combining an up-to-date .INTERMEDIATE rule
with -j causes an infinite loop (http://savannah.gnu.org/bugs/?15919).
.INTERMEDIATE was only necessary to support multiple outputs while only
running a command once, remove .INTERMEDIATE by replacing
$(KATI_OUTPUTS) dependencies with $(KATI_BUILD_NINJA).  We can assume
that $(KATI_NINJA_SH) will be updated at the same time as
$(KATI_BUILD_NINJA), and not explicitly depend on it.

Also remove generateonly and fastincremental, which are no longer
necessary and were overcomplicating ninja.mk.  kati now always runs due
to FORCE, and ninja is run by a phony rule that depends on
$(KATI_BUILD_NINJA).

Bug: 25344116
Change-Id: I99d2713b1532ea11d83da9a11b1be26cfe13a5d2
      42470e91
  5. 27 Oct, 2015 9 commits
  7. 26 Oct, 2015 3 commits
  9. 24 Oct, 2015 3 commits
    • Colin Cross's avatar
      Merge "Add dummy description for GET-INSTALL-PATH" · 9d192f1c
      Colin Cross authored
      9d192f1c
    • Colin Cross's avatar
      Add dummy description for GET-INSTALL-PATH · ec1b5619
      Colin Cross authored 
      kati takes the first @echo command in a rule and turns it in to a ninja
description that gets pretty-printed.  The GET-INSTALL-PATH is only
@echo commands and is parsed by development/testrunner/runtest.py, so
it fails to parse the pretty-printed first test.

Add a dummy @echo to GET-INSTALL-PATH for kati to use as the
description, so the rest of the @echo commands are left unmodified.

Change-Id: I192fde48b26726a2f6760448f819243bd2f21312
      ec1b5619
    • Colin Cross's avatar
      Error out early on nonstandard JDK directory layouts · 112753ca
      Colin Cross authored 
      On Darwin, javac may be located in a nonstandard directory layout such as:
/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/javac
The sed command to replace bin/javac with lib/tools.jar would fail to
match, resulting in the HOST_JDK_TOOLS_JAR being set to the javac path.
Since javac exists, the checks for missing tools.jar would all pass, and
javac would be added to the classpath instead of tools.jar, and causing
hard to debug errors about missing com.sun.javadoc when building doclava.

Change the sed command to replace /javac$, which should always be found,
with /../lib/tools.jar.

Change-Id: I5072f04636a5c14b3aeaa3a5cc3b366feae89c37
      112753ca
  11. 23 Oct, 2015 9 commits
  13. 22 Oct, 2015 9 commits
  15. 21 Oct, 2015 4 commits