|
b33b4777
|
2014-09-04T10:48:28
|
|
Declare commit_id a gyp 'hard_dependency'.
Hard dependencies are marked for static library targets, unlike
normal soft dependencies which the static libraries ignore. This
change ensures we run the commit_id script before compiling any
static libraries that depend on it.
Change-Id: Ic29652012883273810c2863132d6f49bd6ada4b8
Reviewed-on: https://chromium-review.googlesource.com/216461
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
|
|
|
04994ec4
|
2014-08-28T11:31:36
|
|
Use libANGLE to reduce duplicated ANGLE source compiles.
libGLESv2_static and libGLESv2 can re-use the same object files.
BUG=angle:733
Change-Id: I894f4b5b6fbc1fc47812609d9e996691daf9f318
Reviewed-on: https://chromium-review.googlesource.com/214188
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
|
|
8747afee
|
2014-07-01T13:32:11
|
|
Fix d3dcompiler_46.dll case to be consistent, unblocks swarming.
src/copy_compiler_dll.bat defines the case of the file
copied to the build output directory. It is then referenced
by build systems. The case must be consistent with the uses,
in isolate files, and the .gypi file defining output.
BUG=390210
Change-Id: I90c305a0c3663d46d2448e0adfa3103d0ce457d1
Reviewed-on: https://chromium-review.googlesource.com/206305
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
|
|
|
9c4b24a5
|
2014-06-12T13:41:17
|
|
Use commit_id.py on Windows, and handle missing git.
This allows us to delete the Windows batch file.
Changes the commit_id script to take the working directory so that it
can be called from a different working directory than the angle
repository is in.
Renames the generated commit header to angle_commit.h. This is being
written to the shared generated code directory for the entire build,
and "commit.h" is insufficiently unique.
BUG=angle:669
Change-Id: I35e80411a7e8ba1e02ce3f6a4fc54ed4dbc918f3
Reviewed-on: https://chromium-review.googlesource.com/202048
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
|
|
13b0d70a
|
2014-05-28T17:24:45
|
|
Add include of common_defines.gypi for the angle_path variable.
BUG=skia:2272
Change-Id: I29540e009c41a1638e1a0399950621abbbbf2904
Reviewed-on: https://chromium-review.googlesource.com/201839
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
|
|
|
a18299c9
|
2014-04-30T14:51:53
|
|
Reference .git/index as a dependency of commit_id.
Any time the git index changes, we will re-run the commit id hook.
This will ensure we never are left with stale commit ids from
other git commits.
BUG=angle:626
Change-Id: I03c37225fb902b6c1801e8f993d767122e8bfeb6
Reviewed-on: https://chromium-review.googlesource.com/197723
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
|
|
|
8cc03bf7
|
2014-04-11T13:33:57
|
|
Revert "Remove the second translator target, only using static."
This reverts commit d51df461e52ac9421201234fff488104f788a7c3.
Conflicts:
projects/build/all.sln
projects/samples/samples.sln
src/compiler.gypi
Change-Id: I6e1d77531df61de28e4402ed1916f6ecdebb68fd
Reviewed-on: https://chromium-review.googlesource.com/192890
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
|
|
|
d095bdaa
|
2014-04-07T14:21:14
|
|
Add a common include in the project definitions.
Any projects that may be included by gyp files outside our project (chrome
or skia) may not have the same defines or ignored compiler warnings. To
make sure that we can always compile, each project now includes a common
file with all required definitions and gyp variables.
BUG=angleproject:583
Change-Id: I702bee975d0554c51bfa03981920dfb295ffbafa
Reviewed-on: https://chromium-review.googlesource.com/189458
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
|
|
|
f3e6a9e0
|
2014-04-07T14:18:35
|
|
Remove the angle_relative_path gyp variable.
Add a separate step to copy the scripts to the intermediate directory and
run them from there.
BUG=angleproject:583
Change-Id: I307a2810ac03c00248cba1f227f128a1517c6574
Reviewed-on: https://chromium-review.googlesource.com/193432
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
|
|
|
f0b40601
|
2014-03-24T14:49:11
|
|
Clean up gyp build scripts.
We can use angle_path instead of angle_build_scripts_path to locate
enumerate_files.py. Also pass angle_path to the post-build script
hook, as this information is necessary to locate the root angle
folder.
BUG=angle:592
Change-Id: I06b3f0201751d90b7c1efdefe8db07d114bd87dd
Reviewed-on: https://chromium-review.googlesource.com/191082
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
|
|
|
72b16b25
|
2014-03-06T14:58:10
|
|
Fix incorrect path usage in generate_projects.
We should use the cross-platform os.path.join() to support
platforms other than Windows.
BUG=angle:577
Change-Id: I9d96fc1b13731a57ffcd97469632f0acedb8e5c7
Reviewed-on: https://chromium-review.googlesource.com/188879
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>
Conflicts:
generate_projects
Change-Id: I76cacb8ee3acf477c0e99cd73cf91622efc3c9b4
Reviewed-on: https://chromium-review.googlesource.com/189131
Tested-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
|
|
|
d51df461
|
2014-02-26T14:18:17
|
|
Remove the second translator target, only using static.
Because libGLESv2 needs a static translator to link against
internal types like Attribute and Varying, as well as using
some other internal methods, we can for now disable the
component build for the translator. In the future we can
support a proper component build with exports across library
boundaries.
BUG=angle:568
Change-Id: Ie3efc0a29342d02491e91952c3c2398568f83576
Reviewed-on: https://chromium-review.googlesource.com/187699
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
|
|
|
42f529e9
|
2014-02-24T12:45:32
|
|
Fix commit header generation on non-Windows platforms.
Previously we relied on a batch file, which for obvious reasons
isn't cross-platform.
BUG=angle:529
Change-Id: Ia1e3944f8ed2096773e68c39d48ae2dd7370897b
Reviewed-on: https://chromium-review.googlesource.com/186974
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/186985
Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
|
|
|
774b39ff
|
2014-02-19T16:27:35
|
|
Fix commit id versioning when building with Chrome.
The GYP syntax would cause problems with the ninja build.
BUG=angle:529
Change-Id: I84a30afc9bd8900535e44f5d5f9d8f766a4686e8
Reviewed-on: https://chromium-review.googlesource.com/186610
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/186984
Reviewed-by: Nicolas Capens <nicolascapens@chromium.org>
|
|
|
0aa84f63
|
2014-02-13T13:17:23
|
|
Merge 'Tie program binary version to commit hash.'
Port changes from master branch with commit hash embedding
to the development branch.
BUG=angle:529
Change-Id: I307bf44103913aaaeb875a2e3ade1fab77838c48
Reviewed-on: https://chromium-review.googlesource.com/186390
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
|
|
|
1106aeb2
|
2014-02-06T11:06:50
|
|
Move the enumerate_files script to the build directory.
BUG=angle:552
Change-Id: I9f357c68c258c7731cf0d5c2ceed3a2875b21228
Reviewed-on: https://chromium-review.googlesource.com/185142
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
|
|
|
3cd50f7e
|
2014-01-10T13:04:48
|
|
Fix remaining discrepencies between master and es3proto project files.
Change-Id: I335c9346ac268beab25184e2b18ccfdd0b15c7b1
Reviewed-on: https://chromium-review.googlesource.com/182150
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
|
|
|
89a13e9e
|
2013-12-03T10:56:58
|
|
Fix the compiler copy script in the public projects.
This patch silences the copy message, fixes the public projects,
and makes the copy step a separate target, so it won't run on
every incremental build.
Change-Id: Ie6df39737ad466b6431865b3ca19f66d16437ba9
Reviewed-on: https://chromium-review.googlesource.com/178432
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
|
|
|
319cb329
|
2013-12-03T10:56:57
|
|
Fix the backwards slashes in the commit header generation.
These backwards slashes happen with some versions of gyp.
Change-Id: I6c61e212aa34999fb82d74d9f1605d674f34fce0
Reviewed-on: https://chromium-review.googlesource.com/178522
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Commit-Queue: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
|
|
|
06090a96
|
2013-12-03T10:56:56
|
|
Add a relative source path variable to our gyp build process.
This path lets us locate the src folder with respect to the
generated output folder, for the pregenerated projects.
Change-Id: I5cf36f35f68638572bc1a8aec1f570edf76a1c74
Reviewed-on: https://chromium-review.googlesource.com/178521
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Commit-Queue: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
|
|
|
049108df
|
2013-11-19T10:41:49
|
|
Include the current commit as part of the build process.
BUG=angle:529
Change-Id: I6d1d227b495e9bae6e017c88642679210c6d2355
Reviewed-on: https://chromium-review.googlesource.com/177233
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Commit-Queue: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>
|
|
|
a895c6f0
|
2013-11-26T10:49:41
|
|
Fix errors in the gyp projects when we build with ninja.
Ninja does not like having targets named 'all', and the
post-build step had some ninja-incompatible variables.
BUG=angle:529
Change-Id: Ia2bf701c997ec072b18bcbd62f7d05a2e40a1578
Reviewed-on: https://chromium-review.googlesource.com/178072
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Commit-Queue: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>
|
|
|
91db708c
|
2013-11-13T20:17:02
|
|
Add a step to the gyp projects which can run a python script after
a build of ANGLE is complete.
We can use this hook to do things like copy DLLs to user-configured
output folders.
Signed-off-by: Shannon Woods
Signed-off-by: Geoff Lang
ANGLEBUG=503
Change-Id: Iecf86b8c211b2a9933894c631c32107c8fda096a
|
|
39d5166d
|
2013-08-29T16:08:23
|
|
Moved the gyp libGLESv2 and libEGL projects into their own gyp files. Renamed build_angle.gpy* to angle.gyp* but kept build_angle.gyp for chrome compatability.
|