Commit Graph

43 Commits

Author SHA1 Message Date
Mark Banner
1287adee97 Bug 1105490 - Remove old ToS generation code from Loop Standalone. r-dmose,r=ted NPOTB DONTBUILD 2015-03-30 21:45:53 +01:00
Nick Alexander
4f3f4284e1 Bug 1098239 - Rewrite mobile/android Gradle integration. r=me
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
2014-12-22 19:49:04 -08:00
Rémy HUBSCHER
fb4ec1d1e7 Bug 1044411 - Generate Loop ToS static content, r=abr,dmose; rs=ted for .hgignore changes
Bug 1044411 - Generate Loop ToS static content, priv-policy bits removed
2014-08-26 12:58:00 -05:00
Ting-Yu Lin
1ef04f1195 Bug 1065252 - Ignore Emacs .dir-locals.el. r=ted
Ignore Emacs's directory variable files .dir-locals.el in all directory.
It allows me to write ((c-mode . ((mode . c++)))) to view all .h files
in C++ mode especially for those .h files generated by IDL without
proper Emacs modeline.

DONTBUILD because NPOTB
2014-09-09 23:40:00 +02:00
James Graham
1d0db0076b Bug 945222 - Initial import of web-platform-tests testsuite 4/4 : Integration with build system, mach and mozharness, r=ahal,gps
--HG--
extra : rebase_source : 0d704f5a3edcbcef56d15b76ef26aae1b7232c4d
2014-09-04 12:52:43 +01:00
Adam Roach [:abr]
90f271116e Bug 1031025 - Add generated/downloaded Loop unit test files r=jorendorff 2014-06-27 15:25:03 -05:00
Till Schneidereit
7f3faf0795 Bug 997250 - Change .hgignore to ignore directories matching ^js/src/.*-obj. r=jorendorff DONTBUILD
--HG--
extra : rebase_source : 6ffcc91bfa1007dd2ca6541e7c311224247d265d
2014-04-23 22:41:51 +02:00
Anthony Jones
a5ed041766 Bug 908503: Change to stagefright demuxer; r=cpearce
Bug 908503: Build config changes for libstagefright demuxer; r=glandium
Bug 908503: Remove Chrome demuxer; r=cpearce
Bug 908503: Add conversion to Annex B; r=cpearce
2014-05-22 14:42:39 +12:00
Ting-Yu Lin
a2b1027d61 Bug 1007486 - Ignore tag files generated by GNU Global. r=ted 2014-05-07 20:32:00 -04:00
Botond Ballo
c792e93d9e Bug 894094 - Add .idea folder (created by JetBrains IDEs) to .hgignore. r=BenWa 2013-07-16 10:32:55 -04:00
Panos Astithas
bd818d0778 Bug 861197 - chrome.manifest files created by the devtools loader should be ignored; r=dcamp; DONTBUILD because NPOTB 2013-04-30 10:22:25 +03:00
Dave Townsend
cf9be7d864 Bug 793928: Ship the Add-on SDK APIs as part of the platform. r=gps 2013-02-01 11:20:17 -08:00
Gregory Szorc
60111d5545 Bug 751795 - Part 1: mach, the new frontend to mozilla-central; r=jhammel 2012-09-26 09:43:54 -07:00
Gregory Szorc
e29c61ae2c Bug 783727 - Part 5: Add psutil to virtualenv; r=ted
It is optional so if your machine does not support building Python C
extensions things should still work.
2012-09-19 11:20:19 -07:00
Gregory Szorc
a1df2b5a3c Bug 758823 - Don't create egg-info directories when populating virtualenv; r=ted
This patch basically bypasses setup.py for pure Python packages. Instead
of producing .egg-info directories in the source tree, it merely
installs .pth files pointing back to the source directory. As a result,
this is less junk in the source tree.

The .hgignore and .gitignore entries for egg-info directories have been
removed because there should no longer be egg-info directories any more.
People should clean up these orphaned directories manually. This can be
accomplished by running:

  $ hg status -u | grep .egg-info | xargs rm -rf
  $ git ls-files -o '*.egg-info*' | xargs rm -rf
2012-09-04 10:45:45 -07:00
Kartikaya Gupta
6e84653730 Bug 760094 - Ignore egg-info directories in source tree. r=ted 2012-05-31 12:24:17 -04:00
Ehsan Akhgari
060fa03e26 Bug 756516 - Ignore .clang_complete files; r=BenWa
DONTBUILD
2012-05-18 13:55:58 -04:00
Doug Turner
057dca73e4 Bug 746470 - Add mozconfig* to the hg ignore file. r=khuey 2012-05-02 09:43:45 -07:00
Till Schneidereit
48e4ab10bb Bug 726573: Change .hgignore and .gitignore to ignore Eclipse IDE project files in subdirectories, too. r=khuey 2012-02-13 14:36:16 -08:00
Jonathan Watt
c1d56f6044 Bug 718442 - Have .hgignore and .gitignore ignore the project files Eclipse IDE. r=khuey.
--HG--
extra : rebase_source : d02b562c1764de4e8b2acf92f74f5e1ca1782b25
2012-01-16 21:31:44 +00:00
Kyle Huey
20035c791b Bug 715113: Update Snappy to r56. r=bent 2012-01-05 11:26:14 -05:00
Richard Newman
1e1a244b21 Bug 686354 - hgignore addition for Vim swap files. r=ted 2011-09-12 17:25:24 -07:00
Justin Lebar
267bcc364f Bug 589306 - mozconfig* files shouldn't be hgignored. r=ted, a=npotb 2010-08-27 14:19:45 -07:00
Ehsan Akhgari
ed5211d578 Bug 560357 - .hgignore should ignore ctags, r=ted 2010-04-29 10:33:37 +02:00
Marco Bonardo
ea885d5450 Bug 537271 - Add .pyo files to .hgignore, r=ted 2010-01-08 13:57:46 +01:00
Jim Blandy
68e4caa81d No bug: Ignore idutils index files wherever they appear; ignore SpiderMonkey test logs. r=jorendorff 2009-10-16 11:48:16 -07:00
Ben Newman
5d8ed1e95f [HTML5] Remove unneeded parser/html/java/translator directory (bug 518224). r=hsivonen
--HG--
extra : rebase_source : 2d3d248bb554f66206568e55690fe1b0cd198515
2009-09-25 12:57:09 -07:00
Ben Newman
c1211114fd Bug 504447 - Make overzealous \.class$ pattern in .hgignore more precise. r=dbaron sr=jst 2009-07-17 13:50:20 -07:00
Ben Newman
425a713997 Bug 499141 - [HTML5] Check in the Java to C++ translator. r+sr=jst 2009-07-14 17:39:30 -07:00
Gavin Sharp
b2fa90862a Bug 488864 - have hgignore ignore all (.)mozconfig* files; r=ted.mielczarek 2009-04-22 02:42:14 +02:00
Serge Gautherie
5c7c4c4ca0 Bug 451273 - Add ".DS_Store" to .hgignore; (Bv1) "Root" the file; r=ted.mielczarek 2009-03-24 00:58:39 +01:00
Jim Blandy
3ba206cdb7 Bug 97954: Allow SpiderMonkey to be built on its own, or as part of Mozilla.
Give SpiderMonkey its own configure script and top-level Makefile.
Adjust js/src/Makefile as appropriate for life as a stand-alone
makefile, instead of a 'make export; make libs'-style Mozilla tier
makefile.  Have the configure script accept '--with-nspr-cflags' and
'--with-nspr-libs' options for using an in-tree NSPR.  Also accept
'--with-system-nspr', '--with-nspr-prefix', and
'--with-nspr-exec-prefix' flags for using an installed NSPR.  Default
to --disable-jemalloc, assuming we don't have that part of the tree
available; have the top-level configure script pass --enable-jemalloc
as needed.

Since we no longer have an export phase to copy header files into
dist/include/js before we build the library, we need to be able to
find nanojit.h in the nanojit directory; fix references in
jsbuiltins.h and jstracer.cpp.

Give SpiderMonkey it its own copies of many of the files from ./config
and ./build.  These are all exact copies, except as follows:

. js/src/config/Makefile.in: js/src only has a subset of
  js/src/config, and thus a subset of the makefile targets.

. js/src/config/autoconf.mk.in: js/src/configure.in has its own make
  variables to set, not set by the top-level configure script, so it
  needs a custom automake.mk template.

. js/src/config/make-system-wrappers.pl: a copy from nsprpub/config,
  so that we can build without having an NSPR source tree handy.

Invoke js/src/configure from ./configure, passing the values computed
for NSPR_CFLAGS and NSPR_LIBS by the top-level configure script.

Treat js/src as a static directory of the js tier, and create a new
config/js (just a Makefile) to be the js tier's non-static directory.
Let js/src/configure generate SpiderMonkey's makefiles, not
./configure.

Generate a 'js-config' script, which clients can call to find the
CFLAGS and LIBS values necessary to compile and link against an
installed SpiderMonkey library.  Don't include the js-config script in
Macintosh packages.

Teach client.mk how to rebuild js/src/configure.

Tell Mercurial to ignore files generated by autoconf in js/src.

Further work:

. Right now, callers must define JS_THREADSAFE when #including jsapi.h.
  This is fixed in a subsequent patch.

. js/src/configure is a trimmed copy of ./configure.  It could be
  trimmed more.

--HG--
rename : build/autoconf/acoutput-fast.pl => js/src/build/autoconf/acoutput-fast.pl
rename : build/autoconf/altoptions.m4 => js/src/build/autoconf/altoptions.m4
rename : build/autoconf/config.guess => js/src/build/autoconf/config.guess
rename : build/autoconf/config.sub => js/src/build/autoconf/config.sub
rename : build/autoconf/glib.m4 => js/src/build/autoconf/glib.m4
rename : build/autoconf/install-sh => js/src/build/autoconf/install-sh
rename : build/autoconf/make-makefile => js/src/build/autoconf/make-makefile
rename : build/autoconf/match-dir.sh => js/src/build/autoconf/match-dir.sh
rename : build/autoconf/nspr.m4 => js/src/build/autoconf/nspr.m4
rename : build/autoconf/pkg.m4 => js/src/build/autoconf/pkg.m4
rename : build/autoconf/update-makefile.sh => js/src/build/autoconf/update-makefile.sh
rename : build/cygwin-wrapper => js/src/build/cygwin-wrapper
rename : build/hcc => js/src/build/hcc
rename : build/hcpp => js/src/build/hcpp
rename : build/unix/mddepend.pl => js/src/build/unix/mddepend.pl
rename : build/unix/uniq.pl => js/src/build/unix/uniq.pl
rename : config/Makefile.in => js/src/config/Makefile.in
rename : config/Moz/Milestone.pm => js/src/config/Moz/Milestone.pm
rename : config/autoconf.mk.in => js/src/config/autoconf.mk.in
rename : config/config.mk => js/src/config/config.mk
rename : config/elf-dynstr-gc.c => js/src/config/elf-dynstr-gc.c
rename : config/fastcwd.pl => js/src/config/fastcwd.pl
rename : config/gcc_hidden.h => js/src/config/gcc_hidden.h
rename : config/insure.mk => js/src/config/insure.mk
rename : nsprpub/config/make-system-wrappers.pl => js/src/config/make-system-wrappers.pl
rename : config/milestone.pl => js/src/config/milestone.pl
rename : config/milestone.txt => js/src/config/milestone.txt
rename : config/mkdepend/Makefile.in => js/src/config/mkdepend/Makefile.in
rename : config/mkdepend/cppsetup.c => js/src/config/mkdepend/cppsetup.c
rename : config/mkdepend/def.h => js/src/config/mkdepend/def.h
rename : config/mkdepend/ifparser.c => js/src/config/mkdepend/ifparser.c
rename : config/mkdepend/ifparser.h => js/src/config/mkdepend/ifparser.h
rename : config/mkdepend/imakemdep.h => js/src/config/mkdepend/imakemdep.h
rename : config/mkdepend/include.c => js/src/config/mkdepend/include.c
rename : config/mkdepend/main.c => js/src/config/mkdepend/main.c
rename : config/mkdepend/mkdepend.man => js/src/config/mkdepend/mkdepend.man
rename : config/mkdepend/parse.c => js/src/config/mkdepend/parse.c
rename : config/mkdepend/pr.c => js/src/config/mkdepend/pr.c
rename : config/nfspwd.pl => js/src/config/nfspwd.pl
rename : config/nsinstall.c => js/src/config/nsinstall.c
rename : config/nsinstall.py => js/src/config/nsinstall.py
rename : config/pathsub.c => js/src/config/pathsub.c
rename : config/pathsub.h => js/src/config/pathsub.h
rename : config/preprocessor.pl => js/src/config/preprocessor.pl
rename : config/revdepth-nt.pl => js/src/config/revdepth-nt.pl
rename : config/revdepth.pl => js/src/config/revdepth.pl
rename : config/rules.mk => js/src/config/rules.mk
rename : config/system-headers => js/src/config/system-headers
rename : config/version.mk => js/src/config/version.mk
rename : config/version_win.pl => js/src/config/version_win.pl
rename : configure.in => js/src/configure.in
2008-10-29 08:29:22 -07:00
Gavin Sharp
2a9195ee3c Backed out changeset 7fdbccdc1e94 2008-08-26 19:40:21 -04:00
Gavin Sharp
1061e15478 Bug 452135: add nsBadCertHandler to packages-static, patch by Manish Singh <manish@flock.com>, r=me 2008-08-26 19:39:16 -04:00
Jesse Ruderman
0421ab015d Add ".DS_Store" to .hgignore (bug 451273). r=luser 2008-08-23 21:21:00 -07:00
Edward Lee
58054d14f8 Bug 448622 - Ignore obj/objdir without hyphen for hgignore. r=ted 2008-07-31 22:44:18 -07:00
Jim Blandy
1c098bc7f5 Bug 439651 - ignore ID file (idutils) and TAGS (etags), r=bsmedberg 2008-07-09 13:03:31 -04:00
Benjamin Smedberg
377feefdea Bug 417635 - import NSPR and NSS into hg, r=ted 2008-06-06 08:34:40 -04:00
Jeff Walden
c5ccdaf884 Add mozconfig, a lesser-known but ls-able alternative to .mozconfig, to the list of ignored files in .hgignore. r=dbaron 2008-05-15 20:39:35 -04:00
Daniel Holbert
7a53f58553 Bug 433798: add .nss.checkout empty marker-file to .hgignore. r=ted.mielczarek 2008-05-14 22:54:06 -07:00
jorendorff@mozilla.com
8ca8beedad Bug 389826 - .hgignore improvements again (r=bsmedberg) 2007-09-25 20:49:12 -04:00
jason
f9d261140b Bug 387910 - mozilla-central .hgignore file is incomplete (r=luser) 2007-07-12 14:09:30 -04:00
hg@mozilla.com
05e5d33a57 Free the (distributed) Lizard! Automatic merge from CVS: Module mozilla: tag HG_REPO_INITIAL_IMPORT at 22 Mar 2007 10:30 PDT, 2007-03-22 10:30:00 -07:00