Граф коммитов

1579 Коммитов

Автор SHA1 Сообщение Дата
Chris Manchester cf3bc2e02d Bug 1215238 - Mention the included filepath in pre-processed js sources with #includes. r=glandium
--HG--
extra : commitid : FJpPaYeSyUI
2015-11-06 15:58:30 -08:00
Mike Hommey 762aba02cd Bug 1221453 - Use ObjDirPaths for GENERATED_INCLUDES and merge with LOCAL_INCLUDES. r=gps 2015-11-06 09:59:21 +09:00
Mike Hommey e855ef1662 Bug 1221453 - Use SourcePaths for LOCAL_INCLUDES. r=gps 2015-11-06 09:59:21 +09:00
Mike Hommey d2d8de9a5d Bug 1219147 - Use addEntriesToListFile in mozbuild.jar.JarMaker.updateManifest. r=mshal
Also make addEntriesToListFile emit files with CR instead of CRLF on Windows.
2015-11-04 11:21:49 +09:00
A-deLuna 57f72c864a Bug 1220480 - Reference proper variable in Arch Linux bootstrapper; r=gps
DONTBUILD (NPOTB)

--HG--
extra : commitid : FF82L5ToIR1
extra : amend_source : 113a8d10ba1fdf385e2a1dac1aaae262f23b3568
2015-11-03 11:00:02 -08:00
Chris Manchester deb47f849b Bug 1218999 - Update mtimes when building a GENERATED_FILES target, even when contents don't change. r=glandium
When a make target is generated with FileAvoidWrite, this can cause targets to
get rebuilt perpetually when a prerequisite is updated, because FileAvoidWrite
will leave the target's mtime older than the prerequisite's when the target's
contents are unchanged. To avoid this issue, GENERATED_FILES is modified to
unconditionally update its target's mtime.

--HG--
extra : commitid : 4k5e5rKtPZ2
2015-11-03 10:23:04 -08:00
Chris Manchester 8ffd9ff2ed Bug 1218999 - Back out changeset 5f32b2bcfa43 (bug 1188468) in favor of a more efficient solution. r=glandium
Bug 118468 landed an option for FileAvoidWrite to always write to an output
file, whether or not the contents would be changed. This was to address a
problem caused by not updating mtimes when building GENERATED_FILES, but
undoes the purpose of FileAvoidWrite and isn't really necessary.
This is addressed in a subsequent commit by unconditionally updating
mtimes when processing GENERATED_FILES.

--HG--
extra : commitid : AfOhgUstokq
2015-11-03 10:23:04 -08:00
Mike Hommey 5237200410 Bug 1217276 - Fix the handling of relativesrcdir for localized chrome data in FasterMake backend. r=mshal 2015-10-31 07:32:47 +09:00
Mike Hommey 0ac007b2f5 Bug 1216901 - Make the FasterMake backend reticulate splines when moz.build or jar.mn files are modified. r=mshal 2015-10-31 07:32:43 +09:00
Mike Hommey 8d0eb7a870 Bug 1216901 - Always update backend output list files mtime from the base backend class. r=mshal
Instead of having individual backends do it on their own.
2015-10-31 07:32:42 +09:00
Wes Kocher 36c2970b75 Backed out changeset e22433400ec2 (bug 1216901) to hopefully fix winpgo bustage
--HG--
extra : commitid : JAZy6YeISB7
extra : amend_source : ff101ba617320bae1f76f7232a4c648a451dd4ce
2015-10-30 10:11:46 -07:00
Wes Kocher 1f1147fd63 Backed out changeset b855984ff056 (bug 1216901)
--HG--
extra : commitid : DRn4qQLqwWu
2015-10-30 10:11:45 -07:00
Wes Kocher 9ec1a1aa32 Backed out changeset 9475e3ef6a44 (bug 1217276)
--HG--
extra : commitid : Aaj33hafwl
2015-10-30 10:11:43 -07:00
Geoff Brown a42b25a374 Bug 1219803 - Support 'mach run' for Android; r=jmaher 2015-10-30 10:57:35 -06:00
Makoto Kato e5902f9e56 Bug 1219228 - Generate correct source path of cpu-features.c. r=glandium 2015-10-30 12:23:42 +09:00
Mike Hommey 545ea0eff1 Bug 1217276 - Fix the handling of relativesrcdir for localized chrome data in FasterMake backend. r=mshal 2015-10-30 08:19:04 +09:00
Mike Hommey 03e573e93c Bug 1216901 - Make the FasterMake backend reticulate splines when moz.build or jar.mn files are modified. r=mshal 2015-10-30 08:19:04 +09:00
Mike Hommey d2683de574 Bug 1216901 - Always update backend output list files mtime from the base backend class. r=mshal
Instead of having individual backends do it on their own.
2015-10-30 08:19:04 +09:00
Carsten "Tomcat" Book 535f267585 Merge mozilla-central to mozilla-inbound 2015-10-29 12:15:05 +01:00
Richard Newman 447bf8b18a Bug 1219512 - Bump Android version code computation check. r=nalexander
--HG--
extra : commitid : DlEqjWeeRLj
2015-10-28 18:38:55 -07:00
Carsten "Tomcat" Book 3ec5c00413 merge mozilla-inbound to mozilla-central a=merge 2015-10-28 10:43:33 +01:00
Nick Alexander 3323ad2cde Bug 1207708 - Part 2: Build against play-services-{basement,base,gcm} if MOZ_ANDROID_GCM. r=sebastian
Since MOZ_NATIVE_DEVICES builds against play-services-{basement,base,cast},
some ad-hoc de-duplication is necessary.

--HG--
extra : commitid : 2jNIgZpLUq2
extra : source : 0957d3435ac22765d7868cb3c7db1e0787836bc3
2015-10-27 17:41:49 -07:00
Nathan Froyd f1742e072f Bug 1218042 - part 2 - make the CompileDB backend follow the backend protocol; r=mshal
Calling CommonBackend.consume_object ensures that we process WebIDL and
IPDL files (and many other things) correctly.  Calling
CommonBackend.consume_finished ensures that the CompileDB backend gets
to see the unified bindings and protocol files that we generate, and add
those files to the compilation database.
2015-10-26 11:53:59 -04:00
Nathan Froyd ca9570920f Bug 1218042 - part 1 - pass an objdir into _build_db_line; r=mshal
The only thing we need the obj for here is getting the objdir.  Future
patches will just have an objdir when calling this function, and not a
proper mozbuild object.  In light of these facts, let's change the
function to accept an objdir only, which will make those future patches
easier.
2015-10-26 11:50:27 -04:00
Michael Ratcliffe fc66d30a75 Bug 1212047 - Improve ESLint logging in case of error r=glandium
Fix *all* return codes

--HG--
extra : transplant_source : %DEp0%92%E4%9E%8E1%17%B0%D4%AE%2C%C0%C0%04%7DBd%AE
2015-10-23 17:18:45 +01:00
Carsten "Tomcat" Book 758c43af6b merge mozilla-inbound to mozilla-central a=merge 2015-10-26 10:57:35 +01:00
Nick Alexander bf604f1900 Bug 1192064 - Add 'android-x86' job to |mach artifact|. r=jonalmeida
--HG--
extra : commitid : 9WM7rT9goKZ
extra : rebase_source : 84c411a8ec4cd299b9b7e3ea009e05117728c57b
extra : histedit_source : c2356540e15927e362c6f1e0fba8ddd9b047cc31
2015-10-23 12:55:16 -07:00
Nathan Froyd fb2c405492 Bug 1215526 - part 3 - make preprocessor.preprocessor report all included files; r=glandium
For GENERATED_FILES scripts that want to report dependencies, this
change makes it easy to use |preprocess|, rather than having to
construct and use |Preprocessor| manually.
2015-10-21 10:38:18 -04:00
Nathan Froyd 3a6f416c97 Bug 1215526 - part 2 - write dependencies to file_generate.py's depfile; r=glandium 2015-10-21 10:36:08 -04:00
Nathan Froyd 8bd1afc6a9 Bug 1215526 - part 1 - pass dependencies file to file_generate.py; r=glandium
In addition to their inputs declared in moz.build files, generated files
may also depend on other files, such as #includes in preprocessed files.
Let's provide a place for file_generate.py to write out those extra
dependencies.
2015-10-21 09:23:09 -04:00
Michael Ratcliffe 59b814892b Bug 1211223 - Error running eslint setup on Windows r=mh+mozilla, r=pbro
--HG--
extra : commitid : VCSW7YjYq1
extra : rebase_source : 619bf85751c2f9281c897d958893c62360d4fd37
2015-10-23 14:36:24 +01:00
Nick Alexander 098c3bcfb6 Bug 1114718 - Make |mach bootstrap| support 'mobile/android' builds on Arch Linux. r=mcomella
--HG--
extra : commitid : BvjdL3Hn144
extra : rebase_source : a2f1819f436f1cf64a7068840c4f69cb6c81d8c7
2015-10-19 16:36:00 -07:00
Andrew Halberstadt 10926f2956 Bug 1216575 - [mozbuild] Remove if statement that sets bindir to resource dir on osx, r=spohl
--HG--
extra : commitid : 2DSDHg7t06u
extra : rebase_source : 7eefe57e0f7e6156fc04a0bd8b7c641df54876a0
2015-10-21 10:04:21 -04:00
Mike Hommey 223417d648 Bug 1212773 - Extend jar maker syntax for jar file location. r=gps
Indicating a jar currently looks like the following in a jar manifest:
  path/to/name.jar:

The `path/to` doesn't contain the implicit "chrome/" directory. This, in
turn, doesn't allow much flexibility to use the jar maker for what is not
necessarily under chrome/.

To use the jar maker to fill some chrome manifest for the default theme
extension, we currently use a hackish path to get to the right location,
and rely on the chrome.manifest file in the parent directory never to be
picked by the package manifest, which is a quite horrible way to do this,
but worked well enough for that specific use case.

With the need to handle system addons at the build system level, it
becomes necessary to come up with something less hackish.

What this change introduces is an additional syntax for the jar manifest,
in the following form:
  [base/path] sub/path/to/name.jar:

Using this syntax, there is no implicit 'chrome' path. The `base/path` is
relative to the current DIST_SUBDIR, and the `sub/path` is relative to that
`base/path`. The distinction can be useful for build system backends.

The assumption that the "root" chrome.manifest is in the parent directory
of the implicit "chrome" directory dies, and the `base/path` is where the
root chrome.manifest is placed.
2015-10-20 07:36:51 +09:00
Mike Hommey a8bec728dc Bug 1212773 - Pass a base directory to jar maker, instead of a chrome directory. r=gps 2015-10-20 07:36:47 +09:00
Andrew Halberstadt 43780d35db Bug 1216171 - Fix MozbuildObject.bindir to import the correct mozinfo, r=jmaher
--HG--
extra : commitid : 4qZC33BCtve
extra : rebase_source : 95a60597f910bc57d6fdf22e08fa0f8c1f675b58
2015-10-19 11:15:15 -04:00
Nathan Froyd 01583602a9 Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout.  The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.

CLOSED TREE makes big refactorings like this a piece of cake.

 # The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
    xargs perl -p -i -e '
 s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
 s/nsRefPtr ?</RefPtr</g;   # handle declarations and variables
'

 # Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h

 # Handle nsRefPtr.h itself, a couple places that define constructors
 # from nsRefPtr, and code generators specially.  We do this here, rather
 # than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
 # things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
     mfbt/nsRefPtr.h \
     xpcom/glue/nsCOMPtr.h \
     xpcom/base/OwningNonNull.h \
     ipc/ipdl/ipdl/lower.py \
     ipc/ipdl/ipdl/builtin.py \
     dom/bindings/Codegen.py \
     python/lldbutils/lldbutils/utils.py

 # In our indiscriminate substitution above, we renamed
 # nsRefPtrGetterAddRefs, the class behind getter_AddRefs.  Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
    xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'

if [ -d .git ]; then
    git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
    hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi

--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
2015-10-18 01:24:48 -04:00
Tooru Fujisawa 5352886b99 Bug 1208160 - Show information when Xcode requires accepting license agreement; r=gps
--HG--
extra : commitid : BWWqCvms3dQ
extra : amend_source : 0554ce0ec72683864a07ebbbd1c11bbde0b6c233
2015-10-16 11:17:48 -07:00
Mike Hommey 9af046b5b4 Bug 1211765 - Remove remnants from --with-libxul-sdk. r=bsmedberg
The configure option has explicitly thrown an error for more than a year now,
and it happens that the remaining way to still forcefully use it has been
broken for more than 8 months.
2015-10-14 08:02:34 +09:00
Nick Alexander 23d5c4a8b2 Bug 1213418 - Part 2: Use Fennec APKs in |mach artifact|; use mozversion to extract build IDs. r=me
DONTBUILD NPOTB

This downloads to a temporary file named uniquely but consistently
based on the URL, and then extracts a build ID using mozversion to use
as a human readable and sortable prefix.  This approach can be re-used
by |mach artifact| based Desktop builds.

--HG--
extra : commitid : LxorDuq5D0t
extra : rebase_source : 2f280746f486b79dfe45ad928e4b618e0e12f1a0
2015-10-09 18:32:52 -07:00
Nick Alexander b47fb2c75a Bug 1213418 - Part 1: Use mozregression to download in |mach artifact|. r=me
DONTBUILD NPOTB

--HG--
extra : commitid : LU7F5VjVj4m
extra : rebase_source : 5c9e36c01c7aa757d41a9994877b6f7d7568f4e3
2015-10-09 17:47:17 -07:00
Nick Alexander 02b12c9443 No bug - Message which upstream pushhead is used in |mach artifact|. r=me
DONTBUILD NPOTB

--HG--
extra : commitid : D93W2OFUaWF
extra : rebase_source : 5c6a0b8a097d358175dd3158499129a4a4bb935a
2015-10-09 17:23:46 -07:00
Mike Hommey 32fa3fafa4 Bustage fix for bug 1210687 on a CLOSED TREE. r=me
Looks like I went too fancy removing a part of the jarline regexp before landing.
2015-10-08 17:28:36 +09:00
Mike Hommey f6bf50d04e Bug 1210687 - Use install manifests for jar.mn files in FasterMake backend. r=gps 2015-10-08 17:11:23 +09:00
Mike Hommey 0c8457d33f Bug 1210687 - Remove PushbackIter now it's not used anymore. r=gps 2015-10-08 17:11:23 +09:00
Mike Hommey e127dc20b1 Bug 1210687 - Separate out jar.mn parsing in a separate class. r=gps 2015-10-08 17:11:23 +09:00
Mike Hommey ccf3953f83 Bug 1211957 - Add the repackage step at the end of a faster build on Mac. r=gps
That is necessary until bug 934070 is fixed
2015-10-08 17:11:23 +09:00
Wes Kocher 75ff20f5af Backed out changeset 91d4539e00ce (bug 1207245)
--HG--
rename : mfbt/RefPtr.h => mfbt/nsRefPtr.h
2015-10-07 10:19:19 -07:00
Wes Kocher 9d0985e9fd Merge fx-team to central, a=merge 2015-10-07 09:58:09 -07:00
Nathan Froyd 89a69c829a Bug 1207245 - part 6 - rename nsRefPtr<T> to RefPtr<T>; r=ehsan; a=Tomcat
The bulk of this commit was generated with a script, executed at the top
level of a typical source code checkout.  The only non-machine-generated
part was modifying MFBT's moz.build to reflect the new naming.

 # The main substitution.
find . -name '*.cpp' -o -name '*.cc' -o -name '*.h' -o -name '*.mm' -o -name '*.idl'| \
    xargs perl -p -i -e '
 s/nsRefPtr\.h/RefPtr\.h/g; # handle includes
 s/nsRefPtr ?</RefPtr</g;   # handle declarations and variables
'

 # Handle a special friend declaration in gfx/layers/AtomicRefCountedWithFinalize.h.
perl -p -i -e 's/::nsRefPtr;/::RefPtr;/' gfx/layers/AtomicRefCountedWithFinalize.h

 # Handle nsRefPtr.h itself, a couple places that define constructors
 # from nsRefPtr, and code generators specially.  We do this here, rather
 # than indiscriminantly s/nsRefPtr/RefPtr/, because that would rename
 # things like nsRefPtrHashtable.
perl -p -i -e 's/nsRefPtr/RefPtr/g' \
     mfbt/nsRefPtr.h \
     xpcom/glue/nsCOMPtr.h \
     xpcom/base/OwningNonNull.h \
     ipc/ipdl/ipdl/lower.py \
     ipc/ipdl/ipdl/builtin.py \
     dom/bindings/Codegen.py \
     python/lldbutils/lldbutils/utils.py

 # In our indiscriminate substitution above, we renamed
 # nsRefPtrGetterAddRefs, the class behind getter_AddRefs.  Fix that up.
find . -name '*.cpp' -o -name '*.h' -o -name '*.idl' | \
    xargs perl -p -i -e 's/nsRefPtrGetterAddRefs/RefPtrGetterAddRefs/g'

if [ -d .git ]; then
    git mv mfbt/nsRefPtr.h mfbt/RefPtr.h
else
    hg mv mfbt/nsRefPtr.h mfbt/RefPtr.h
fi

--HG--
rename : mfbt/nsRefPtr.h => mfbt/RefPtr.h
2015-10-07 16:50:25 -04:00