mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-13 23:17:57 +00:00
4f3f4284e1
This is a big patch, but it's essentially NPOTB. The part that is POTB is ... removing Gradle integration from the build. I've implemented |mach gradle-install| as a substitute for the build system stuff; it's just so much easier to iterate on a mach command than a moz.build and Makefile.in. I'm landing this with self-review because this lessens the impact of the Gradle integration on the build system and because I am the only person who understands either the old or the new system. You'll need to run |mach gradle-install| at top level to configure the new Gradle integration. But |mach gradle ...| does the right thing configuration steps too. This patch rewrites most of the Gradle integration. The major changes are: * all .gradle files move into mobile/android/gradle; * all the Gradle projects live in the object directory; * mozconfig exposed to all build.gradle files; * simplification of Android configuration between build.gradle files; * support for user-specified version of build tools; * first steps towards supporting builds from the source directory; * bumps Gradle to 2.2.1; * bumps the Android-Gradle plugin to 0.14.4. This is seemingly a step backwards given that we'd prefer to ship the .idea directory in the source directory. But in fact we get closer to that; it's possible to run ./gradlew in the source directory and get a reasonable build. We'll progress with this in time. The win right now is that the projects are nested, which makes importing work better on Linux machines. Unfortunately IntelliJ 13 and 14 now have conflicting Android-Gradle plugin version requirements, so we now only support IntelliJ 14.0.2 and above. --HG-- rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/base/AndroidManifest.xml rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/branding/AndroidManifest.xml rename : mobile/android/gradle/omnijar/gradle_AndroidManifest.xml => mobile/android/gradle/omnijar/AndroidManifest.xml rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/preprocessed_code/AndroidManifest.xml rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/preprocessed_resources/AndroidManifest.xml rename : mobile/android/thirdparty/gradle_AndroidManifest.xml => mobile/android/gradle/thirdparty/AndroidManifest.xml
73 lines
1.3 KiB
Plaintext
73 lines
1.3 KiB
Plaintext
# .gitignore - List of filenames git should ignore
|
|
|
|
# Filenames that should be ignored wherever they appear
|
|
*~
|
|
*.pyc
|
|
*.pyo
|
|
TAGS
|
|
tags
|
|
ID
|
|
.DS_Store*
|
|
|
|
# Vim swap files.
|
|
.*.sw[a-z]
|
|
|
|
# Emacs directory variable files.
|
|
**/.dir-locals.el
|
|
|
|
# User files that may appear at the root
|
|
/.mozconfig*
|
|
/mozconfig
|
|
/configure
|
|
/config.cache
|
|
/config.log
|
|
/.clang_complete
|
|
/mach.ini
|
|
|
|
# Empty marker file that's generated when we check out NSS
|
|
security/manager/.nss.checkout
|
|
|
|
# Build directories
|
|
/obj*/
|
|
|
|
# Build directories for js shell
|
|
*/_DBG.OBJ/
|
|
*/_OPT.OBJ/
|
|
|
|
# SpiderMonkey configury
|
|
js/src/configure
|
|
js/src/autom4te.cache
|
|
# SpiderMonkey test result logs
|
|
js/src/tests/results-*.html
|
|
js/src/tests/results-*.txt
|
|
|
|
# Java HTML5 parser classes
|
|
parser/html/java/htmlparser/
|
|
parser/html/java/javaparser/
|
|
|
|
# Ignore the files and directory that Eclipse IDE creates
|
|
.project
|
|
.cproject
|
|
.settings/
|
|
|
|
# Python virtualenv artifacts.
|
|
python/psutil/*.so
|
|
python/psutil/*.pyd
|
|
python/psutil/build/
|
|
|
|
# Ignore chrome.manifest files from the devtools loader
|
|
browser/devtools/chrome.manifest
|
|
toolkit/devtools/chrome.manifest
|
|
|
|
# Tag files generated by GNU Global
|
|
GTAGS
|
|
GRTAGS
|
|
GSYMS
|
|
GPATH
|
|
|
|
# Git clone directory for updating web-platform-tests
|
|
testing/web-platform/sync/
|
|
|
|
# Android Gradle artifacts.
|
|
mobile/android/gradle/.gradle
|