summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Picked latest patchesbundlerSHIBATA Hiroshi2018-10-162-12/+6
|
* Port from latest branchSHIBATA Hiroshi2018-10-162-12/+11
|
* Rollback to 1-16-stable branch.SHIBATA Hiroshi2018-10-11115-3405/+1006
|
* Applied Ruby core workaround for version file.SHIBATA Hiroshi2018-10-091-1/+5
|
* Update Bundler master branchSHIBATA Hiroshi2018-10-09144-1091/+4182
|
* Merge workaround changes for Ruby 2.6 from upstream.SHIBATA Hiroshi2018-10-097-84/+86
|
* skip system version of bundler exampleSHIBATA Hiroshi2018-10-091-2/+2
|
* Modify localhost variable when defining URI::File. It will be provided from ↵SHIBATA Hiroshi2018-10-0914-24/+42
| | | | Ruby 2.6.
* Update bundler-1.16.2SHIBATA Hiroshi2018-10-09709-434/+857
|
* Revert "Postponing the Bundler merge."SHIBATA Hiroshi2018-10-091100-19/+71581
| | | | This reverts commit 7825e8363d4b2ccad8e2d3f5eeba9e26f6656911.
* * expand tabs.svn2018-10-091-6/+6
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Revert "ext/objspace/objspace_dump.c: print addresses consistently"naruse2018-10-092-63/+7
| | | | | | | | | | | This reverts commit r64970. Visual C++ 12.0 doesn't have PRIxPTR. Anyway we have our own vfprintf implementation BSD_vfprintf(). If you want to have portable vfprintf, replace it with BSD_vfprintf like vsnprintf or just use BSD_vfprintf. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64972 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * expand tabs.svn2018-10-081-6/+6
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* ext/objspace/objspace_dump.c: print addresses consistentlytenderlove2018-10-082-7/+63
| | | | | | | | | | | | | The format addresses are printed in are different if you use `ObjectSpace.dump_all(output: :stdout)` vs. `ObjectSpace.dump_all(output: :string)` (or `ObjectSpace.dump`) due to differences in the underlying `vfprintf` implementation. Use %"PRIxPTR" instead to be consistent across both. Co-authored-by: Ashe Connor <ashe@kivikakk.ee> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Revert "NEWS: Fix indent [ci skip]"kazu2018-10-081-2/+2
| | | | | | | | This reverts commit a43d71159fdf208f5ad29fe8f4169e193056caaa. already fixed at r64958 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2018-10-09svn2018-10-081-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* NEWS: Fix indent [ci skip]kazu2018-10-081-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64967 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * remove trailing space. [ci skip]svn2018-10-081-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64966 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* include/ruby/ruby.h: comment about mswin RUBY_EXTERN [ci skip]k0kubun2018-10-081-1/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64965 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* include/ruby/ruby.h: import external symbolsk0kubun2018-10-082-16/+6
| | | | | | | | | properly on MinGW MJIT. test_jit.rb: all MJIT tests are now passing on MinGW. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64964 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test_win32ole_event.rb: sleep longerk0kubun2018-10-081-0/+1
| | | | | | | | to increase the possibility of TestWIN32OLE_EVENT_SWbemSink#test_on_event success. It seems to randomly fail https://ci.appveyor.com/project/ruby/ruby/builds/19337514/job/0wp2oe9dkr9gt1bi git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* appveyor.yml: execute test_syntax separatelyk0kubun2018-10-081-2/+2
| | | | | | | | | | because NoMemoryError tends to be caused by TestSyntax#assert_syntax_files. https://ci.appveyor.com/project/ruby/ruby/build/1.0.8525 https://ci.appveyor.com/project/ruby/ruby/build/1.0.8795 https://ci.appveyor.com/project/ruby/ruby/builds/19334828/job/s1960qssxnk1lpoi git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64962 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Add test for marshalnobu2018-10-081-0/+6
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64961 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Removed redundant suffix `_with_timezone`nobu2018-10-081-4/+4
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* revert r64957 [ci skip]k0kubun2018-10-081-14/+14
| | | | | | | | | | | | | r64956 didn't work either... This means that svn.ruby-lang.org/ruby is not executing the latest git hook on git.ruby-lang.org/ruby-commit-hook. Tentatively I backported the changes of auto-style.rb in git.ruby-lang.org/ruby-commit-hook to git.ruby-lang.org/scripts. I hope this commit won't be rolled back by svn bot... git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Timezone at Time#+ and Time#-nobu2018-10-084-1/+29
| | | | | | * time.c (time_add): support for Timezone. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * expand tabs.svn2018-10-081-14/+14
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* revert r64955k0kubun2018-10-081-14/+14
| | | | | | | | | | | r64954 didn't work... In this commit, I'm experimenting https://git.ruby-lang.org/ruby-commit-hook.git/commit/svn-utils/bin/auto-style.rb?id=2a1a17da1c163e8fc4321759d95057441ddf2c0a We can distinguish possible 2 issues by this commit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * expand tabs.svn2018-10-081-14/+14
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* partially revert r64953k0kubun2018-10-081-14/+14
| | | | | | | | | | | | | | "expand tabs" is not intended to be applied to strftime.c, because its c-file-style is "linux", not "ruby". It's explicitly excluded to expand tabs https://git.ruby-lang.org/ruby-commit-hook.git/tree/svn-utils/bin/auto-style.rb#n195 but it didn't work. I fixed the issue in https://git.ruby-lang.org/ruby-commit-hook.git/commit/svn-utils/bin/auto-style.rb?id=844e0d42de11ad4c549bfbdd752a21df2823c18c so let me try to revert the strftime.c change to keep the tabs. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * expand tabs.svn2018-10-082-15/+15
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Timezone support by Time [Feature #14850]nobu2018-10-087-31/+511
| | | | | | | | | * strftime.c (rb_strftime): support timezone object by `%z`. * time.c (time_init_1, time_new_timew, time_getlocaltime): accept timezone object as `off`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test_jit.rb: skip to test tempdir emptinessk0kubun2018-10-081-2/+14
| | | | | | | | | | on AppVeyor mswin. It's somehow failing and not reproductive on my environment. We're suspecting maybe somebody is still holding module handle, even while FreeLibrary is finished successfully. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* revert r64947 and r64949k0kubun2018-10-081-3/+0
| | | | | | | | | | | | Both didn't work well on mswin. Reverting. https://ci.appveyor.com/project/ruby/ruby/builds/19322867/job/28fgwiq8j7hdmeu6 https://ci.appveyor.com/project/ruby/ruby/builds/19323721/job/1s73mrgu8n8wpa5f We need to revisit this to have MJIT header in a correct place, but having both in the place didn't make JIT on install directory functional either anyway... git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* win32/Makefile.sub: create header install dir firstk0kubun2018-10-071-0/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* appveyor.yml: completely separate win32ole testsk0kubun2018-10-072-15/+2
| | | | | | | | | | because r64938 was not enough and another win32ole test file (`test_win32ole_type.rb`) crashed worker. https://ci.appveyor.com/project/ruby/ruby/builds/19321161/job/ue1qrphi5j1xxgu6 Let's run whole win32ole test suite separately. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64948 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* win32/Makefile.sub: install precompiled header to prefixk0kubun2018-10-071-0/+2
| | | | | | | | | | | | | | | | This is needed to run JIT from the installed ruby binary. Even after this, we're hitting another error though. start compilation: a@-e:1 -> C:\Users\k0kubun\AppData\Local\Temp/_ruby_mjit_p9712u0.c Starting process: cl cl -nologo -LD -DMJIT_HEADER -MD -Zi -W2 -wd4100 -wd4127 -wd4210 -wd4214 -wd4255 -wd4574 -wd4668 -wd4710 -wd4711 -wd4820 -wd4996 -we4028 -we4142 -O2sy- -Zm600 -DRUBY_EXPORT -I. -I.ext/include/x64-mswin64_140 -I../ruby/include -I../ruby -I../ruby/enc/unicode/10.0.0 -DRUBY_DEVEL=1 -DCANONICALIZATION_FOR_MATHN -D_WIN32_WINNT=0x0600 -FeC:\Users\k0kubun\AppData\Local\Temp/_ruby_mjit_p9712u0.so -FoC:\Users\k0kubun\AppData\Local\Temp/_ruby_mjit_p9712u0.obj -YuC:/usr/include/ruby-2.6.0/x64-mswin64_140/rb_mjit_header-2.6.0.pch C:/usr/include/ruby-2.6.0/x64-mswin64_140/rb_mjit_header-2.6.0.obj -TcC:\Users\k0kubun\AppData\Local\Temp/_ruby_mjit_p9712u0.c -link -LIBPATH:C:/usr/lib x64-vcruntime140-ruby260.lib -incremental:no -debug -opt:ref -opt:icf -dll _ruby_mjit_p9712u0.c C:\Users\k0kubun\AppData\Local\Temp/_ruby_mjit_p9712u0.c(1): error C2859: C:\usr\bin\vc140.pdb is not the pdb file that was used when this precompiled header was created, recreate the precompiled header. compile_c_to_so: compile error: 2 Failed to generate so: C:\Users\k0kubun\AppData\Local\Temp/_ruby_mjit_p9712u0.so git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2018-10-08svn2018-10-071-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* mjit_worker.c: clean up all unnecessary files on mswink0kubun2018-10-072-11/+10
| | | | | | | test_jit.rb: passed all MJIT tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* mjit_worker.c: don't suppress cl.exe logsk0kubun2018-10-071-10/+14
| | | | | | | on --jit-verbose=2+. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* appveyor.yml: give up running TestThreadQueue#test_queue_with_trapk0kubun2018-10-073-14/+5
| | | | | | | | for mswin. We tried to increase timeout and execute separately but both didn't work. Let me skip this until somebody starts to work on fixing this behavior, since this makes AppVeyor almost impossible to be used as CI. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* include/ruby/intern.h: don't modify MJIT_FUNC_EXPORTEDk0kubun2018-10-072-4/+6
| | | | | | | | | | | | | | | | on most of platforms except mswin. Changing it to static was needed for mswin because it doesn't use transform_mjit_header, but for platforms that use it, it causes link error like: /usr/bin/ld: /tmp/_ruby_mjit_p21652u0.o: relocation R_X86_64_PC32 against undefined symbol `rb_vm_search_method_slowpath' can not be used when making a shared object; recompile with -fPIC /usr/bin/ld: final link failed: Bad value collect2: error: ld returned 1 exit status include/ruby/defines.h: MJIT_FUNC_EXPORTED moved to intern.h git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* vm_core.h: fix inconsistent prototype declarationsk0kubun2018-10-074-18/+18
| | | | | | | | | | | | | | | like "error: static declaration of 'xxx' follows non-static declaration". r64940 is successfully built on mswin but not built on almost all other environments. internal.h: ditto include/ruby/intern.h: MJIT_STATIC is moved to this file since this file also needs to use this. mjit.h: MJIT_STATIC is moved from this. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* mjit.h: introduce MJIT_STATIC for full mswin JIT supportk0kubun2018-10-074-44/+21
| | | | | | | | | | | | | | | | | This change resolves most of major remaining MJIT bugs on mswin. Since Visual Studio doesn't support generating pre-processed code preserving macros, we can't use transform_mjit_header approach for mswin. So we need to transform MJIT header using macro like this. vm.c: use MJIT_STATIC for non-static functions that exist on MJIT header and cause conflict on link. vm_insnhelper.c: ditto test_jit.rb: remove many skips for mswin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* mjit_worker.c: print warning if FreeLibrary failsk0kubun2018-10-071-3/+4
| | | | | | | because somehow AppVeyor fails to remove so file by Permission Deined. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* appveyor.yml: separately execute unstable testsk0kubun2018-10-073-1/+28
| | | | | | | | | | | | | | without -j option. Those 2 tests are too unstable on AppVeyor. test/excludes/TestThreadQueue.rb: The most unstable test ever. That even fails on my machine too. This may be possibly because recent SIGCHLD-related changes. https://ci.appveyor.com/project/ruby/ruby/build/9795/job/l9t4w9ks7arsldb1 test/excludes/TestWin32OLE.rb: I saw that win32ole crashes test-all several times. https://ci.appveyor.com/project/ruby/ruby/build/9811/job/ra5uxf2cg6v7ohag git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* revert r64935k0kubun2018-10-071-2/+1
| | | | | | that didn't work at all. So the so file should be open at the time. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Added missing declarations in readline.h bundled with macOS 10.14nobu2018-10-071-0/+10
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* appveyor.yml: use ./tmp as TMPDIR for test-allk0kubun2018-10-071-1/+2
| | | | | | | | | | | | | | | on VS. On AppVeyor, we seem to fail to remove so file due to permission error. C:/projects/ruby/test/ruby/test_jit.rb:419: warning: MJIT warning: failed to remove "C:\Users\appveyor\AppData\Local\Temp\1/_ruby_mjit_p3580u0.so": Permission denied https://ci.appveyor.com/project/ruby/ruby/builds/19317520/job/sh8s6tw6ayxvtl33 But this is not reproductive on my local mswin environment at all. To identify the cause, let me try changing the TMPDIR. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* mjit_worker.c: clean up .obj file on mswink0kubun2018-10-071-9/+22
| | | | | | | | | prior to this commit, .obj file is generated on current directory and nobody deletes that. This changes it to make sure it's generated to temporary directory and removes that. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e