AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
22,848 Commits 1 Branch 0 Tags 544 MiB
ca9eeab0ea
Commit Graph

32 Commits

Author SHA1 Message Date
borenet
1195260e22 Make Win runtime DLLs writeable before overwriting 
This should fix the VS2015 bot which is failing because we can't
overwrite read-only DLL files.

BUG=skia:4553
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1813233002

Review URL: https://codereview.chromium.org/1813233002
 2016-03-18 08:33:38 -07:00
mtklein
27e88d0dab gyp_skia: use path python, be quiet 
/usr/bin/python might not be python 2.x

I'm getting annoyed by scripts printing messages when there's no problem.

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1716493003

Review URL: https://codereview.chromium.org/1716493003
 2016-02-19 11:43:57 -08:00
borenet
f15132fdcf Support SKIA_OUT on Mac and ChromeOS 
BUG=skia:3774

Review URL: https://codereview.chromium.org/1122593003
 2015-05-04 08:04:28 -07:00
humper
4572ae9221 allow caller to override the default output directory for gyp 
BUG=skia:
R=jcgregorio@google.com

Author: humper@google.com

Review URL: https://codereview.chromium.org/614753002
 2014-09-29 11:42:25 -07:00
borenet
ad2ab61b4e Fix Windows bots 
BUG=skia:
R=mtklein@google.com, rmistry@google.com

Author: borenet@google.com

Review URL: https://codereview.chromium.org/339733002
 2014-06-16 13:41:25 -07:00
Eric Boren
9118413608 Enable compiling with automatically-downloaded VS toolchain on Windows bots 
Requires that the bots have CHROME_HEADLESS=1 and CHROME_PATH set.

BUG=skia:2216
R=epoger@google.com

Review URL: https://codereview.chromium.org/332833002
 2014-06-16 10:02:42 -04:00
mtklein
2e44b51b9a Effectively unlimited linking. 
Ninja will still cap concurrency with it's default value (from -j), so we just
need a big number equal or greater than the number of cores in any machine.

BUG=skia:
R=borenet@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/319153002
 2014-06-06 08:27:07 -07:00
bsalomon
a5c2824bd3 Change default generators on windows to include msvs-ninja rather than msvs 
BUG=skia:2439
R=epoger@google.com
TBR=epoger@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/317903002
 2014-06-05 07:10:22 -07:00
jvanverth
4962140c9e On Windows, fail if there are missing files specified in the project. 
BUG=skia:2638
R=robertphillips@google.com, borenet@google.com, rmistry@google.com, epoger@google.com

Author: jvanverth@google.com

Review URL: https://codereview.chromium.org/319503003
 2014-06-04 15:57:57 -07:00
bungeman@google.com
bbce730df9 Add a dry-run option to gyp_skia. 
There are times when I want to do some low-level fiddling with the gyp
command. It's nice to start with whatever the 'default' is, and it's also
nice to peek behind the curtain to see what's going on. To this end,
a '--dry-run' in the argument list will spit out the command to run,
rather than running the command.

R=epoger@google.com

Review URL: https://codereview.chromium.org/278893002

git-svn-id: http://skia.googlecode.com/svn/trunk@14674 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-09 15:04:18 +00:00
tfarina@chromium.org
2b0126b3e8 Fix some references to Makefiles in gyp_skia. 
BUG=None
TEST=None, no functional changes. Just updating documentation.
R=epoger@google.com

Review URL: https://codereview.chromium.org/263083006

git-svn-id: http://skia.googlecode.com/svn/trunk@14642 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-08 15:13:52 +00:00
commit-bot@chromium.org
bf6f6ae2e2 allow gyp_skia to be run from any directory. 
R=epoger@google.com

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/240383003

git-svn-id: http://skia.googlecode.com/svn/trunk@14239 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-17 16:11:58 +00:00
epoger@google.com
58d69d8460 change default build (in "make" wrapper) to ninja on all platforms 
force-landed from https://codereview.chromium.org/206463007/ ;
the CommitQueue couldn't handle the diff properly for some reason



git-svn-id: http://skia.googlecode.com/svn/trunk@14003 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-01 07:02:41 +00:00
commit-bot@chromium.org
7225506621 gyp_skia: make default GYP_GENERATORS for each platform explicit 
BUG=skia:2317
R=bungeman@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/199873003

git-svn-id: http://skia.googlecode.com/svn/trunk@13883 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-20 19:59:09 +00:00
djsollen@google.com
3702b2587c Fix ninja build on Android 
R=mtklein@google.com

Review URL: https://codereview.chromium.org/25535002

git-svn-id: http://skia.googlecode.com/svn/trunk@11555 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-01 15:31:54 +00:00
borenet@google.com
072ee7d45c Allow use of SKIA_OUT on Windows 
This works as expected, except that %SKIA_OUT% must be on the same drive

R=djsollen@google.com

Review URL: https://codereview.chromium.org/18467010

git-svn-id: http://skia.googlecode.com/svn/trunk@9972 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-07-10 19:07:56 +00:00
bsalomon@google.com
c77256b83b Make make.bat and gyp_skia work with VS 2012. 
Review URL: https://codereview.chromium.org/14963005/


git-svn-id: http://skia.googlecode.com/svn/trunk@9045 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-05-07 19:31:20 +00:00
djsollen@google.com
ab5e91184b Update gyp to allow alternative out directories 
If the enviroment variable SKIA_OUT is set the output of both
gyp and make will be redirected to that directory.

Review URL: https://codereview.appspot.com/6782095

git-svn-id: http://skia.googlecode.com/svn/trunk@6578 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-11-28 14:11:41 +00:00
epoger@google.com
9c875d34ff add a "most" target, and make it the default 
split out of https://codereview.appspot.com/6651064/ ('gyp: generate "everything" and "most" targets instead of "all"')
tests: "make most" now works, "make" now calls "make most"
Review URL: https://codereview.appspot.com/6740045

git-svn-id: http://skia.googlecode.com/svn/trunk@5999 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-10-18 16:10:56 +00:00
digit@google.com
48af8a0a6a gyp_skia: Fix module search path. 
gyp_skia should prepend the local gyp source path to the python
module search path, instead of appending it. Otherwise, if a 'gyp'
module is locally installed on the machine, it will be read instead
of the current version in the Skia tree.

This breaks the Android build when the installed 'gyp' module doesn't
support the "make-android" generator.
Review URL: https://codereview.appspot.com/6344096

git-svn-id: http://skia.googlecode.com/svn/trunk@4832 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-07-30 16:48:13 +00:00
epoger@google.com
aa3b6a965e Make all gyp targets automatically include common.gypi 
Do this, rather than including common.gypi explicitly in all our gyp files, so that gyp files we use but do not maintain (e.g., third_party/externals/libjpeg/libjpeg.gyp) will include common.gypi too.
Review URL: https://codereview.appspot.com/5820068

git-svn-id: http://skia.googlecode.com/svn/trunk@3411 2bbb7eff-a529-9590-31e7-b0007b416f81
 2012-03-16 13:52:49 +00:00
epoger@google.com
06546d81f2 gyp DEPS roll, and remove no-longer-needed msvs_abspath_output flag 
git-svn-id: http://skia.googlecode.com/svn/trunk@2115 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-15 19:53:17 +00:00
epoger@google.com
2e7de5a1a7 revert r2110, which broke Mac builds 
git-svn-id: http://skia.googlecode.com/svn/trunk@2111 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-15 17:12:59 +00:00
epoger@google.com
3f0254da54 Update gyp so that we no longer need msvs_abspath_output generator flag. 
Review URL: http://codereview.appspot.com/4905044

git-svn-id: http://skia.googlecode.com/svn/trunk@2110 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-08-15 17:04:51 +00:00
epoger@google.com
fd03db0fe9 Manually update copyright notices in files that defied the automated process 
used in http://codereview.appspot.com/4816058/ ('Automatic update of all copyright notices to reflect new license terms.')

Note that the following files have been left alone, because they name
copyright holders outside of Google.  Please let me know if we need to update
these files:

experimental/CiCarbonSampleMain.c
src/opts/memset16_neon.S
src/opts/memset32_neon.S
src/opts/opts_check_arm.cpp
src/ports/SkDebug_brew.cpp
src/ports/SkMemory_brew.cpp
src/ports/SkOSFile_brew.cpp
Review URL: http://codereview.appspot.com/4806054

git-svn-id: http://skia.googlecode.com/svn/trunk@1981 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-28 14:24:55 +00:00
epoger@google.com
7fd589cfef Fix http://b/issue?id=5030894 ('Not working on windows: python gyp_skia') 
git-svn-id: http://skia.googlecode.com/svn/trunk@1864 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-14 18:55:12 +00:00
epoger@google.com
2d75cc0c16 make gyp_skia runnable from any directory 
http://codereview.appspot.com/4720042



git-svn-id: http://skia.googlecode.com/svn/trunk@1863 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-14 17:31:33 +00:00
epoger@google.com
0fb2125814 enable "make XXX" command-line builds on Windows 
http://codereview.appspot.com/4717044/



git-svn-id: http://skia.googlecode.com/svn/trunk@1853 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-13 21:30:14 +00:00
epoger@google.com
5351b373b3 combine target_defaults.gypi into common.gypi 
http://codereview.appspot.com/4654080



git-svn-id: http://skia.googlecode.com/svn/trunk@1780 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-07-01 17:16:26 +00:00
epoger@google.com
0ae27e0911 Use automatically imported third_party/externals/gyp instead of 
manually imported third_party/gyp



git-svn-id: http://skia.googlecode.com/svn/trunk@1576 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-14 16:01:04 +00:00
epoger@google.com
e7ccdb3bef revert to manually imported gyp source (from SVN externals) 
git-svn-id: http://skia.googlecode.com/svn/trunk@1541 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-08 15:34:21 +00:00
epoger@google.com
1e8e056afc Some final cleanups leading up to The Official Switch to Gyp 
see http://codereview.appspot.com/4580043

1. Create a single public skia.gyp file that all outside projects (Chrome,
Android, etc.) should depend on from now on.  I haven't yet created targets
suitable for those projects to use, but this is where we should add them.
2. Make gyp generate its Makefiles within out/ directory, rather than polluting
directories under source control.
3. Modify trunk/Makefile to automatically run gyp_skia and then call the
generated Makefile, to ease developer transition.



git-svn-id: http://skia.googlecode.com/svn/trunk@1526 2bbb7eff-a529-9590-31e7-b0007b416f81
 2011-06-07 14:48:41 +00:00