Skip to content
This repository has been archived by the owner on Nov 1, 2017. It is now read-only.

Install internal headers that @tmm1 needs to build his shady gems #2

Merged
merged 1 commit into from
Feb 12, 2013

Conversation

scottjg
Copy link
Contributor

@scottjg scottjg commented Feb 12, 2013

cc @wfarr who wanted this for his ruby-build shenanigans

cc @tmm1 who knows everything

@@ -499,6 +499,8 @@ def prepare(mesg, basedir, subdirs=nil)
end
noinst = nil if noinst.empty?
install_recursive(File.join(srcdir, "include"), rubyhdrdir, :no_install => noinst, :glob => "*.h", :mode => $data_mode)
install_recursive(srcdir, rubyhdrdir, :no_install => noinst, :glob => "*.h", :mode => $data_mode)
install_recursive(srcdir, rubyhdrdir, :no_install => noinst, :glob => "*.inc", :mode => $data_mode)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome. You can probably combine the globs into one line *.{h,inc}, and we'll want to use install instead of install_recursive.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i switched it to a one-liner, but we need install_recursive since install doesn't allow globs. i think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm that doesn't work either since the globbing didn't support {}. changed it back.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This good to land?

Will Farrington
System Operations Engineer
GitHub, Inc.

On Feb 11, 2013, at 11:08 PM, "Scott J. Goldman" notifications@github.com wrote:

In tool/rbinstall.rb:

@@ -499,6 +499,8 @@ def prepare(mesg, basedir, subdirs=nil)
end
noinst = nil if noinst.empty?
install_recursive(File.join(srcdir, "include"), rubyhdrdir, :no_install => noinst, :glob => "*.h", :mode => $data_mode)

  • install_recursive(srcdir, rubyhdrdir, :no_install => noinst, :glob => "*.h", :mode => $data_mode)
  • install_recursive(srcdir, rubyhdrdir, :no_install => noinst, :glob => "*.inc", :mode => $data_mode)
    hmm that doesn't work either since the globbing didn't support {}. changed it back.


Reply to this email directly or view it on GitHub.

@wfarr
Copy link
Contributor

wfarr commented Feb 12, 2013

Okay, I tested this:

/tmp/ruby-thecodeshop-install-internal-headers » ls /tmp/rubby/include/ruby-1.9.1/
addr2line.h         cygwin              ext                 known_errors.inc    opt_sc.inc          regparse.h          test                vm.inc
atomic.h            debug.h             gc.h                lib                 optinsn.inc         revision.h          thread_pthread.h    vm_core.h
autom4te.cache      defs                id.h                man                 optunifs.inc        ruby                thread_win32.h      vm_exec.h
bcc32               dln.h               include             method.h            parse.h             ruby.h              timev.h             vm_insnhelper.h
benchmark           doc                 insns.inc           misc                pool_alloc.h        sample              tool                vm_opts.h
bin                 enc                 insns_info.inc      missing             pool_alloc.inc.h    spec                transcode_data.h    vmtc.inc
bootstraptest       encdb.h             internal.h          node.h              regenc.h            symbian             transdb.h           win32
constant.h          eval_intern.h       iseq.h              node_name.inc       regint.h            template            version.h           x86_64-darwin12.2.1

Gonna merge.

wfarr added a commit that referenced this pull request Feb 12, 2013
Install internal headers that @tmm1 needs to build his shady gems
@wfarr wfarr merged commit 4a28539 into github Feb 12, 2013
@wfarr wfarr deleted the install-internal-headers branch February 12, 2013 19:29
@tmm1 tmm1 restored the install-internal-headers branch February 20, 2013 04:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants