wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
235,396 Commits 1 Branch 166 Tags 1.2 GiB
880f49ba52
Commit Graph

2184 Commits

Author SHA1 Message Date
Wes Kocher
fd1b7c1e19 Backed out changeset db93b3cbdc17 (bug 1094037) on a CLOSED TREE 2014-11-05 17:22:50 -08:00
Mike Hommey
636eec2f2a Bug 1094037 - Move EXTRA_COMPONENTS and EXTRA_PP_COMPONENTS to the misc tier. r=gps 2014-11-06 09:29:11 +09:00
Mike Hommey
18ccc42254 Bug 1094033 part 2 - Add a "misc" parallel tier where to move parts of the libs tier that can be moved. r=gps 2014-11-06 09:29:11 +09:00
Mike Hommey
6353f52bb4 Bug 1094033 part 1 - Consolidate how to add new tiers. r=gps 2014-11-06 09:29:11 +09:00
Jan Beich
c47ea57634 Bug 1041795 - Disable system libs when generating DTrace probes. f=sfink f=ginn.chen 2014-11-04 02:01:00 +01:00
Mike Hommey
dab2d15345 Bug 1091384 - Remove EXPAND_LIBNAME and affiliated. r=mshal 2014-11-04 13:50:07 +09:00
Mike Hommey
0bb4264fe7 Bug 1091383 - Move delayload logic entirely in moz.build frontend code. r=gps 2014-11-04 13:48:25 +09:00
David Major
e51e441f1b Bug 1084162 - Part 3: PGO most files by default on Windows. r=glandium 2014-11-04 14:28:57 +13:00
Ehsan Akhgari
c16169bb27 Bug 1083572 - Apply some make black magic to make the fix actually work 2014-10-31 18:09:06 -04:00
Brian Smith
4d3694c0d4 Reland Bug 1063281, Part 9: Switch Gecko from NSS to CheckCertHostname, r=keeler 
--HG--
extra : rebase_source : 3a5e3bc2e113035e9c88b571bac68f3dbe2c8f04
 2014-10-28 15:28:38 -07:00
Mike Hommey
fbfe20777d Add missing recurse.mk change from bug 1077148 part 1 after a bad merge. r=gps 
--HG--
extra : amend_source : a6c285a79d2ca0b76a6896ae4478564de009c8b6
 2014-10-30 13:51:01 +09:00
Mike Hommey
d667f4bb59 Bug 1077148 part 4 - Add and use new moz.build templates for Gecko programs and libraries. r=gps 
There are, sadly, many combinations of linkage in use throughout the tree.
The main differentiator, though, is between program/libraries related to
Gecko or not. Kind of. Some need mozglue, some don't. Some need dependent
linkage, some standalone.

Anyways, these new templates remove the need to manually define the
right dependencies against xpcomglue, nspr, mozalloc and mozglue
in most cases.

Places that build programs and were resetting MOZ_GLUE_PROGRAM_LDFLAGS
or that build libraries and were resetting MOZ_GLUE_LDFLAGS can now
just not use those Gecko-specific templates.
 2014-10-30 13:06:12 +09:00
Mike Hommey
aa81b10659 Bug 1077148 part 2 - Remove hack to avoid sqlite being linked against mozglue on mac. r=gps 
This hack has actually not been actively used since sqlite, nss and nspr are
all folded together, because no shared library is actually linked in
db/sqlite3/src.
 2014-10-30 13:05:56 +09:00
Mike Hommey
2a17803c46 Bug 1077148 part 1 - Define mozcrt in moz.build. r=gps 
--HG--
rename : mozglue/build/Makefile.in => mozglue/crt/Makefile.in
rename : mozglue/build/fixcrt.py => mozglue/crt/fixcrt.py
 2014-10-30 13:05:50 +09:00
Nicholas Nethercote
3909906dce Bug 1089446 - Remove config/make-atom-strings.pl, which is ancient and unused. r=bz. 
--HG--
extra : rebase_source : 21d3b24b8768f0d2732a2f9b396cc43cb21b66e8
 2014-10-28 15:04:03 -07:00
Mike Hommey
fd3d0dab49 Bug 1090114 - Avoid race condition when building logalloc replay on mac. r=mshal 2014-10-29 13:29:45 +09:00
Mike Hommey
9a194754c1 Bug 1090111 - Remove now unnecessary dependency for sqlite in recurse.mk. r=mshal 
Since bug 1047267, there is a USE_LIBS += ['sqlite'] for the case it was
covering.
 2014-10-29 13:29:44 +09:00
Mike Hommey
bc89ac2f89 Bug 1090107 - Define stlport dependencies in moz.build. r=mshal 2014-10-29 13:29:42 +09:00
Nathan Froyd
04180e9ba8 Bug 1089855 - remove config/module2dir.pl; r=glandium 2014-10-27 17:27:59 -04:00
Brian Smith
5b092d4b63 Back out cset 9b72d139e817 (Bug 1063281, Part 9) due to compatibility regressions on a CLOSED TREE, a=ryanvm 
--HG--
extra : rebase_source : cd9b43c3f66df3c5de337f2013fe61fae798b3ba
 2014-10-28 12:30:53 -07:00
Ehsan Akhgari
5ab6e267d4 Bug 1089613 - Never treat warnings as errors in clang-cl; r=gps 
clang-cl warns about many more things than MSVC does, and supporting
warnings as errors there requires some work.
 2014-10-28 09:43:45 -04:00
Brian Smith
8b0a955b69 Bug 1063281, Part 9: Switch Gecko from NSS to CheckCertHostname, r=keeler 
--HG--
extra : rebase_source : 340eb682ba1f9dbd51652438433e7d0196494e1f
 2014-09-21 17:43:29 -07:00
Ehsan Akhgari
9ef1a5f323 Bug 1083572 - Enable passing external LDFLAGS to the NSS build system for Windows ASAN builds; r=glandium 2014-10-22 08:28:56 -04:00
Mike Hommey
cd02357a28 Followup to bug 609976 - MOZ_SHARED_ICU case for windows doesn't vary with JS_SHARED_LIBRARY. r=me 
--HG--
extra : amend_source : ebf2f7328a1bbb6982ee919a61bdb106a1b7d302
 2014-10-18 13:09:25 +09:00
Tooru Fujisawa
dbd0aadeb5 Bug 1080910 - Add USE_ICU variable separated from ENABLE_INTL_API. r=glandium 2014-10-10 02:55:00 -04:00
Richard Barnes
f6115a2519 Bug 1034854 - Add support for ECDSA to WebCrypto API r=ttaubert,dkeeler r=bz 2014-10-13 23:19:00 +02:00
David Keeler
8507d8fde6 bug 1042889 - test certificate overrides for untrusted x509v1 certificates used as CAs r=mmc 2014-10-15 10:42:13 -07:00
Wes Kocher
f5aa6677ce Merge m-c to inbound a=merge 2014-10-13 19:02:56 -07:00
ffxbld
be274d1f29 Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-10-13 13:39:31 -04:00
Mike Hommey
143fd413ed Bug 1080904 - Allow to pass an extra input file for folded-lib symbols through configure. r=mshal 2014-10-14 07:18:57 +09:00
Mike Hommey
b08088c7c1 Bug 1077366 - Remove most symbol wrapping from Android builds. r=nfroyd 
Since essentially everything is linked to libmozglue and libmozglue takes
precedence in symbol resolution in our dynamic linker, there is no need
to wrap most symbols. PR_GetEnv/PR_SetEnv still needs wrapping because
there's no other way to actually wrap the calls from NSPR itself and NSS,
as well as the symbols wrapped because our dynamic linker can't find them
in system libraries on some devices because they're weak.
 2014-10-14 07:17:13 +09:00
Mike Hommey
173edb382b Bug 857628 - Add a --enable-pie configure option to build target programs as position independent executables when supported by gcc/clang. r=mshal 2014-09-26 07:33:56 +09:00
David Cooper
dcdc31fa72 Bug 1018259 - Thunderbird should stop using SHA-1 when signing email messages, m-c Windows build adjustments. r=dkeeler 2014-09-06 03:35:00 +02:00
Jonathan Kew
ba0811f47a Bug 1066160 pt 2 - Include Brotli in the gecko build. r=gps 2014-10-04 10:02:24 +01:00
Mike Hommey
bfcdc7ef75 Bug 1077228 - Include the right autoconf.mk in GLOBAL_DEPS. r=mshal 
Ever since bug 969164, the js build system, when building gecko (not when
building standalone) uses a autoconf-js.mk file for its config.

One of the suboptimal ways we have to retrigger builds when the build
configuration changes (changes to e.g. configure.in can do that) is to
make most things depend on autoconf.mk. Which unfortunately doesn't
account for the fact the js/src subdirectory uses a different file.

In practice, this means that some classes of changes to the js build
system, not accompanied with toplevel build system changes may no
trigger the corresponding rebuilds in the js subtree on incremental
builds.
 2014-10-04 10:34:35 +09:00
Mike Hommey
b4265f0fa8 Bug 1077151 - Always use expandlibs descriptors when they exist. r=mshal 
Currently, when there is both an expandlibs descriptor and an actual static
library, expandlibs picks the static library. This has the side effect that
if there are object files in the static library that aren't directly used,
they're dropped when linking, even when they export symbols that would be
exported in the final linked binary.

In most cases in the code base, files are not dropped that way. The most
notable counter-example is xpcomglue, where actually not dropping files
leads to link failure because of missing symbols those files reference
(yes, that would tend to say the glue is broken in some way).

On the opposite side, there is mozglue, which does have both a descriptor
and a static library (the latter being necessary for the SDK), and that
linking as a static library drops files that shouldn't be dropped (like
jemalloc). We're currently relying on -Wl,--whole-archive for those files
not to be dropped, but that won't really be possible without much hassle
in a world where mozglue dependencies live in moz.build land.

Switching expandlibs to use descriptors when they exist, even when there
is a static library (so, the opposite of the current behavior) allows to
drop -Wl,--whole-archive and prepare for a better future. However, as
mentioned, xpcomglue does still require to be linked through the static
library, so we need to make it a static library only.

To achieve that, we make NO_EXPAND_LIBS now actually mean no expandlibs
and use that to build the various different xpcomglues.
 2014-10-04 10:33:00 +09:00
Ed Morley
2078de0125 Backed out changeset e2fee324047d (bug 857628) for causing bug 1076892 2014-10-03 14:19:45 +01:00
Mike Hommey
0412683b7d Bug 1062221 - Replace add_tier_dir with DIRS. r=gps 2014-10-02 09:14:07 +09:00
Robert Strong
b20be455fe Mac v2 signing - Bug 1059467 - Move precomplete file from the root of the Mac bundle to Contents/Resources. r=bbondy, r=nthomas 
--HG--
rename : tools/update-packaging/test/from-mac/precomplete => tools/update-packaging/test/from-mac/Contents/Resources/precomplete
rename : tools/update-packaging/test/to-mac/precomplete => tools/update-packaging/test/to-mac/Contents/Resources/precomplete
 2014-09-29 11:51:55 -07:00
Stephen Pohl
e27f45a6cc Mac v2 signing - Bug 1047584 - Modify the .app file structure to allow for OSX v2 signing. r=bsmedberg 2014-09-29 11:50:56 -07:00
Mike Hommey
209fae0983 Bug 857628 - Build target programs as position independent executable when supported by gcc/clang. r=mshal 2014-09-26 07:33:56 +09:00
Gian-Carlo Pascutto
2d486eeb3a Bug 1059573 - Add an option to use hardware AEC for WebRTC. r=jesup,ted 2014-09-24 19:11:58 +02:00
L. David Baron
120b324eb7 Bug 1064636 followup: Add new function to config/external/nss/nss.def r=khuey a=bustage CLOSED TREE 2014-09-23 14:16:56 -07:00
Jacek Caban
fc9cce0e16 Bug 1060401 - NSS and NSPR libs can't be found in mingw builds. r=glandium 2014-09-23 11:51:36 +02:00
Terrence Cole
e1752155cd Bug 1068123 - Make the MOZ_GCTIMER logs more verbose and readable; r=jonco 2014-09-19 08:39:54 -07:00
Carsten "Tomcat" Book
477171c3f3 merge mozilla-inbound to mozilla-central a=merge 2014-09-22 12:58:26 +02:00
Nick Alexander
5fc39be7e5 Bug 1065773 - Part 1: Extract Android release signing bits into config/android-common.mk. r=mshal 2014-09-19 13:52:54 -07:00
Nicholas Nethercote
8ec14a3695 Bug 1067699 (part 1) - Export double-conversion.h normally from MFBT. r=froydnj. 
--HG--
extra : rebase_source : 14c3d827f4d8015d8326612e82782c52dcf7335d
 2014-09-16 23:33:05 -07:00
Timothy Arceri
af0ef6479f b=1068964 Cleanup GTK print includes r=karlt 
--HG--
extra : transplant_source : %18%ED%1B%24%9C%AB%FDA%F8%BE%A3%85%92h%F1%B0%FF%92D%8D
 2014-09-18 15:59:01 +10:00
Mike Hommey
4770b2992c Bug 1059255 - Make stdc++compat errors fatal. r=mshal 2014-09-11 12:20:41 +09:00
Mike Hommey
034163d15c Bug 1059255 - Stop building stdc++compat as a real library. r=mshal 
Incidentally, this makes the build fail because stdc++compat.o then appears
twice on the libxul linkage command line. This, in turn, is because
widget/xremoteclient creates both a program and an intermediate library for
libxul. The Program() template adds stdc++compat to the directory data,
which ends up being added to libxul as well. The same kind of issue arises
when linking the gtest-enabled libxul.

While eventually we'll be able to avoid those problems, it's not the case
yet, so work around the issue by making expand-libs skip .desc files that
appear multiple times.
 2014-09-11 12:19:28 +09:00
Ehsan Akhgari
50d872cf79 Backed out changeset 9a796d86bae8 (bug 1063728) until people agree what they want to do here 2014-09-08 20:38:21 -04:00
Jan de Mooij
8e4bdb0d83 Bug 1063924 - Optimize check_spidermonkey_style.py and remove some cruft. r=njn 2014-09-08 11:12:04 +02:00
Ehsan Akhgari
35f5434d09 Bug 1063728 - Run check_spidermonkey_style.py before starting to build; r=jandem 2014-09-05 18:00:24 -04:00
Joshua Cranmer
2dd3425d77 Bug 1059769 - Add LIBRARY_DEFINES to moz.build, r=glandium. 2014-09-04 23:38:54 -05:00
Brian Smith
d85324d2af Bug 1061021, Part 15: Stop using PLArenaPool in CreateEncodedOCSPResponse, r=keeler 
--HG--
extra : rebase_source : 00c3f77cd1e7e0d81b0acac84631b81e4cac59bd
 2014-09-01 19:23:01 -07:00
Mike Hommey
d0c653396e Bug 1062219 - Don't build build/clang-plugin as an external directory. r=jcranmer 2014-09-04 17:44:01 +09:00
Mike Hommey
a653121671 Bug 1059113 - Use templates for shared libraries and frameworks. r=gps 
Also force to use the existing template for XPCOM components.
 2014-09-04 09:04:45 +09:00
Mike Hommey
fc99c53ae5 Bug 1041941 - Use templates for programs, simple programs, libraries and C++ unit tests. r=gps 2014-09-03 14:10:54 +09:00
Joshua Cranmer
44f49766fc Bug 1060198, part 2: Move other IS_GYP_DIR rules to gyp_reader.py, r=glandium. 
--HG--
extra : rebase_source : 5ad6eae63688f5582568f470b7266b0f7ebc8b6c
 2014-09-02 23:45:26 -05:00
Joshua Cranmer
bc2ee5d301 Bug 1060198, part 1: Remove IS_GYP_DIR's replacement of INCLUDES, r=glandium. 
--HG--
extra : rebase_source : 4f322f0b9d57f108815f2aa4b689d2dc01b4e4e7
 2014-09-02 23:46:29 -05:00
ffxbld
02d1667716 Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-09-02 12:54:33 -04:00
Christian Holler
73b680f1ca Bug 1056233 - Fix uninitialized value in nsinstall.c. r=froydnj 
--HG--
extra : rebase_source : 8d59e5ea240afb5ec07673bb7eb9085aed793a95
 2014-09-01 14:30:11 +02:00
Chris Kitching
4dbfee00cc Bug 1056128: Enable JDK source level 1.7 for Android Java code. r=nalexander 2014-08-29 03:44:27 -07:00
David Major
6bb6f521fb Bug 1001332 - Set subsystem version to 5.01 to make VS2013 builds run on XP. r=glandium 
--HG--
extra : rebase_source : 30b0f750d6a094e16cc9815db697f6bd39ae5a97
 2014-08-27 21:20:10 +12:00
Jacek Caban
4487a85843 Bug 1055627 - Pass MOZ_GLUE_PROGRAM_LDFLAGS after STATIC_LIBS to linker. r=glandium 2014-08-26 13:50:27 +02:00
Jacek Caban
da08dea87f Bug 1055591 - Don't add lib prefix in config/external/ffi/moz.build for mingw. r=glandium 2014-08-26 13:50:14 +02:00
Mike Hommey
0661d4b535 Bug 1055204 - Build C/C++ code when recursing from non-toplevel builds. r=gps 2014-08-26 09:33:58 +09:00
Garrett Robinson
9b2820621f Bug 1029155 - Store peer certificate chain from failed connections on TransportSecurityInfo r=keeler 2014-08-15 11:27:22 -07:00
Mike Shal
f49f579626 Bug 1047621 - Have link.py import and call expandlibs_exec.py; r=gps 2014-08-13 14:24:15 -04:00
Mike Shal
d146198436 Bug 1047621 - Move link.py to config for importing expandlibs_exec; r=gps 2014-08-13 14:23:11 -04:00
Steffen Michalke
99221d9853 Bug 1052508 - Fix --with-system-nss build bustage. r=glandium 2014-08-12 08:40:00 -04:00
Mike Hommey
fc65f7c284 Bug 1050560 - Preserve the ICU libraries order in config/external/icu/moz.build. r=mshal 2014-08-09 07:54:57 +09:00
Mike Hommey
0f4c5d9244 Bug 1047267 - Move remaining OS_LIBS and EXTRA_LIBS to moz.build. r=gps 
* * *
Bug 1047267 - To fold with "Move remaining OS_LIBS and EXTRA_LIBS to moz.build"
 2014-08-07 14:21:03 +09:00
Mike Hommey
19e8ecfce2 Bug 1047267 - Allow to reference libraries from third-party build systems in USE_LIBS. r=gps 2014-08-07 14:20:38 +09:00
Mike Hommey
fc7ea2109c Bug 1050029 - Improve Makefile checks for deprecated or moz.build variables. r=mshal 2014-08-07 13:48:08 +09:00
Mike Hommey
1d5475041b Bug 1049281 - Remove static dirs handling, now that there aren't any. r=gps 
Also do some overdue cleanup from the removal of parallel and tools dirs
 2014-08-07 02:58:53 +09:00
Mike Hommey
790fddf2bc Bug 1049281 - Move third-party build system "drivers" to config/external, and stop using static dirs. r=gps 
--HG--
rename : intl/icu/Makefile.in => config/external/icu/Makefile.in
rename : config/nspr/Makefile.in => config/external/nspr/Makefile.in
rename : config/nspr/moz.build => config/external/nspr/moz.build
rename : security/build/Makefile.in => config/external/nss/Makefile.in
rename : security/build/moz.build => config/external/nss/moz.build
rename : security/build/nspr-dummy.def => config/external/nss/nspr-dummy.def
rename : security/build/nss.def => config/external/nss/nss.def
rename : security/build/nss.mk => config/external/nss/nss.mk
 2014-08-07 02:58:52 +09:00
Mike Hommey
855f2512fe Bug 1048993 - Use nsinstall from $(topobjdir)/config instead of $(DIST)/bin to avoid races when make wants to reinstall it for some reason. r=mshal 2014-08-07 02:58:50 +09:00
Ian Neal
7d7f496206 Bug 1047924 - When building with ac_add_options --enable-extensions extensions are put expanded into the wrong location in dist/bin r=glandium 2014-08-06 17:58:31 +01:00
Nathan Froyd
7d196c1018 Bug 1042226 - move DEFINES += -DAB_CD=$(AB_CD) pattern into config.mk; r=mshal 2014-08-01 12:53:05 -04:00
Mike Hommey
c9d509aafc Bug 1045783 - Move HOST_EXTRA_LIBS to moz.build as HOST_OS_LIBS. r=mshal 2014-08-06 07:26:05 +09:00
Nathan Froyd
67b8c4c136 Bug 1047173 - move MOZ_GTK*_CFLAGS hacking from config.mk to configure.in; r=glandium 
This move ensures that other makefile variables that reference
MOZ_GTK*_CFLAGS, e.g. TK_CFLAGS, will always have a consistent view of
MOZ_GTK*_CFLAGS.
 2014-08-01 12:11:01 -04:00
Nathan Froyd
f4b3ba5577 Bug 1044162 - part 2 - remove JS_MODULES_PATH from the build system; r=mshal 2014-07-25 14:37:22 -04:00
Karl Tomlinson
39582dd9ce b=1033122 be consistent about speex_resampler symbol visibility r=khuey 
When "speex/speex_resampler.h" was included, another exported header (in
dist/include) would find the speex/speex_resampler.h in dist/include before
dist/system_wrappers.  Visibility of undefined symbols depended on the order
of includes.

This patch changes includes to <speex/speex_resampler.h> so that
WRAP_SYSTEM_INCLUDES works as expected but removes the wrapper when not using
GKMEDIAS_SHARED_LIBRARY.

--HG--
extra : rebase_source : 93ca1dbdd6b489647624326e78539f44c60d0b34
 2014-07-02 14:21:34 +12:00
Mike Hommey
7920de32b6 Bug 1044458 - Work around l10n jobs cherry-picking parts of the build system on a CLOSED TREE. r=mshal,a=ryanvm 2014-07-29 09:01:58 +09:00
Mike Hommey
3424efc9f3 Bug 1043869 - Derive build dependencies for programs and libraries from make backend data instead of getting them from expandlibs. r=mshal 2014-07-29 08:59:56 +09:00
Mike Hommey
90e6ca0914 Bug 1043865 - Remove the remainder of compilation bits from the libs tier. r=gps 2014-07-29 08:59:27 +09:00
Mike Hommey
cc5c6d1ecc Bug 1043862 - Make the binaries target use the compile tier. r=gps 2014-07-29 08:58:28 +09:00
Mike Hommey
20d181268e Bug 1043820 - Remove PARALLEL_DIRS. r=gps 2014-07-29 08:57:59 +09:00
Mike Hommey
1e79fe55c2 Bug 1043802 - Remove TOOLS_DIRS and TEST_TOOLS_DIRS. r=gps 2014-07-29 08:55:55 +09:00
Mike Hommey
dd255699fc Bug 1043954 - Export nspr headers in a different directory during the target rule. r=gps 2014-07-29 08:53:48 +09:00
Ms2ger
f5a6e98287 Bug 1044657 - Move PYTHON_UNIT_TESTS to moz.build; r=mshal 
As a first step, this moves PYTHON_UNIT_TESTS to moz.build as a passthru
variable. In the future, we could hook it up to |mach test|.

The __init__.py files may not need to be in the list, but I don't want to
change the list here.
 2014-07-28 17:51:12 +02:00
Nathan Froyd
6409b4d985 Bug 1044047 - add EXTRA_JS_MODULES to _MOZBUILD_EXTERNAL_VARIABLES; r=mshal 2014-07-25 11:10:50 -04:00
Mike Hommey
83f70b5606 No bug - Don't chmod before deleting target in nsinstall.py on non Windows to avoid touching CLOBBER on a CLOSED TREE 2014-07-25 09:01:23 +09:00
Mike Hommey
dbad84b131 Bug 1043344 - Move libraries and programs build to the compile tier. r=gps 2014-07-25 07:14:40 +09:00
Mike Hommey
6dca708e22 Bug 1043286 - Use INSTALL_TARGETS to stage C++ unit tests. r=mshal 2014-07-25 07:09:44 +09:00
Jan Beich
9f1e29ec6f Bug 1041381 - Ignore missing depfiles for dtrace. r=glandium 2014-07-23 22:40:00 +02:00
Mike Hommey
7ca2de4659 Followup for bug 1041936 to unbreak spidermonkey fail-on-warnings builds. r=me 2014-07-23 14:01:55 +09:00
Mike Hommey
01fba997a3 Bug 1041936 - Allow static library definitions to depend on shared libraries. r=gps 2014-07-23 13:33:06 +09:00