Kouhei Sutou
null+****@clear*****
Tue Oct 6 22:08:48 JST 2015
Kouhei Sutou 2015-10-06 22:08:48 +0900 (Tue, 06 Oct 2015) New Revision: 08f9b363a9d639da27a5522f013be6eb9f401856 https://github.com/ranguba/rroonga/commit/08f9b363a9d639da27a5522f013be6eb9f401856 Message: Remove unused files Removed files: build/windows/README.md build/windows/Vagrantfile build/windows/build-functions.sh build/windows/cross-build-rroonga.sh build/windows/user-build.sh Deleted: build/windows/README.md (+0 -19) 100644 =================================================================== --- build/windows/README.md 2015-10-06 22:04:54 +0900 (aaaebca) +++ /dev/null @@ -1,19 +0,0 @@ -Vagrant box for Cross compiling Rroonga -=== - -Vagrant box for cross compiling Rroonga. - -```bash -$ cd build/windows -$ vagrant up -``` - -or simply execute in Rroonga root directory: - -```bash -$ rake build:windows -``` - -Then, cross compiling for a long time.... - -Cross compiled gems are copied under \<rroonga\_base\_dir\>/pkg when it executes via `rake build:windows`. Deleted: build/windows/Vagrantfile (+0 -35) 100644 =================================================================== --- build/windows/Vagrantfile 2015-10-06 22:04:54 +0900 (8324303) +++ /dev/null @@ -1,35 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! -VAGRANTFILE_API_VERSION = "2" - -def available_n_cpus - proc_file = "/proc/cpuinfo" - if File.exist?(proc_file) - File.readlines(proc_file).grep(/\Aprocessor\b/).size - elsif /darwin/ =~ RUBY_PLATFORM - `sysctl -n hw.ncpu`.to_i - elsif /mswin|msys|mingw|cygwin|bccwin|wince|emc/ =~ RUBY_PLATFORM - `echo %NUMBER_OF_PROCESSORS%`.to_i - else - 1 - end -end - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = "ubuntu-14.04-x86_64" - config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box" - - config.vm.synced_folder("../../", "/rroonga") - - config.vm.provider("virtualbox") do |vb| - vb.gui = false - used_n_cpus = available_n_cpus - used_n_cpus /= 2 if used_n_cpus >= 2 - vb.cpus = used_n_cpus - vb.memory = 2048 - end - - config.vm.provision :shell, path: "cross-build-rroonga.sh", privileged: false -end Deleted: build/windows/build-functions.sh (+0 -42) 100755 =================================================================== --- build/windows/build-functions.sh 2015-10-06 22:04:54 +0900 (1a6345f) +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -function old_ruby_install_with_bundler() { - ruby_version=$1 - rbenv install $ruby_version - rbenv global $ruby_version - gem update --system - gem install bundler -} - -function ruby_install_with_bundler() { - ruby_version=$1 - rbenv install $ruby_version - rbenv global $ruby_version - gem install bundler -} - -function bundle_install() { - ruby_version=$1 - rbenv local $ruby_version - bundle install --path vendor/bundle -j $CPU_NUMS -} - -function install_rake_compiler_cross_ruby() { - ruby_version=$1 - rbenv local $ruby_version - bundle exec rake-compiler cross-ruby HOST=i686-w64-mingw32 VERSION=$ruby_version - bundle exec rake-compiler cross-ruby HOST=x86_64-w64-mingw32 VERSION=$ruby_version -} - -function cross_compile() { - bundle exec rake clean:groonga - rbenv local $RUBY19 - bundle exec rake RUBY_CC_VERSION=$CROSS_TERGET MAKE_N_JOBS=$CPU_NUMS MAKE="make $MAKE_OPTIONS" cross clean native gem - bundle exec rake clean:groonga - bundle exec rake RUBY_CC_VERSION=$CROSS_TERGET MAKE_N_JOBS=$CPU_NUMS MAKE="make $MAKE_OPTIONS" RROONGA_USE_GROONGA_X64=true cross clean native gem -} - -function cp_pkg_gems() { - mkdir -p $PKG_GEMS - cp pkg/*.gem $PKG_GEMS -} Deleted: build/windows/cross-build-rroonga.sh (+0 -8) 100755 =================================================================== --- build/windows/cross-build-rroonga.sh 2015-10-06 22:04:54 +0900 (5486ba8) +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -export DEBIAN_FRONTEND=noninteractive -sudo apt-get update -sudo apt-get -y install libssl-dev libreadline-dev -sudo apt-get -y install git build-essential ruby mingw-w64 - -/vagrant/user-build.sh Deleted: build/windows/user-build.sh (+0 -58) 100755 =================================================================== --- build/windows/user-build.sh 2015-10-06 22:04:54 +0900 (1dc17f4) +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -x - -readonly RUBY19="1.9.3-p551" -readonly RUBY20="2.0.0-p645" -readonly RUBY21="2.1.6" -readonly RUBY22="2.2.2" -readonly CROSS_TERGET="1.9.3:2.0.0:2.1.6:2.2.2" -readonly PKG_GEMS="/vagrant/pkg" -readonly CPU_NUMS=$(grep processor /proc/cpuinfo | wc -l) -readonly MAKE_OPTIONS="debugflags=" - -if [ ! -d ~/.rbenv ]; then - git clone https://github.com/sstephenson/rbenv.git ~/.rbenv - echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc - echo 'eval "$(rbenv init -)"' >> ~/.bashrc -fi - -if [ ! -d ~/.rbenv/plugins/ruby-build ]; then - git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build -fi - -# setting PATH -export PATH="$HOME/.rbenv/shims:$HOME/.rbenv/bin:$PATH" -bash -l -c 'source ~/.bashrc' -. /vagrant/build-functions.sh - -# Ruby 1.9.3 -old_ruby_install_with_bundler $RUBY19 -# Ruby 2.0.0 -ruby_install_with_bundler $RUBY20 -# Ruby 2.1.x -ruby_install_with_bundler $RUBY21 -# Ruby 2.2.x -ruby_install_with_bundler $RUBY22 - -if [ ! -d ~/rroonga ]; then - git clone file:///rroonga/.git ~/rroonga -fi - -cd ~/rroonga - -# bundle install -bundle_install $RUBY19 -bundle_install $RUBY20 -bundle_install $RUBY21 -bundle_install $RUBY22 - -# install cross ruby with rake-compiler -install_rake_compiler_cross_ruby $RUBY19 -install_rake_compiler_cross_ruby $RUBY20 -install_rake_compiler_cross_ruby $RUBY21 -install_rake_compiler_cross_ruby $RUBY22 - -# cross-compile -cross_compile - -# copy pkg/*.gem to /vagrant/pkg -cp_pkg_gems -------------- next part -------------- HTML����������������������������... Download