Deleted
Added
ruby (1217:ed8c4e263152) | ruby (1489:4a3ec07f4b19) |
---|---|
1 2# Copyright (C) Alexander Borisov 3# Copyright (C) NGINX, Inc. 4 5 6shift 7 8for nxt_option; do --- 37 unchanged lines hidden (view full) --- 46 47. $NXT_AUTOCONF_DATA 48 49$echo "configuring Ruby module" 50$echo "configuring Ruby module ..." >> $NXT_AUTOCONF_ERR 51 52NXT_RUBY=${NXT_RUBY=ruby} 53NXT_RUBY_MODULE=${NXT_RUBY_MODULE=${NXT_RUBY}} | 1 2# Copyright (C) Alexander Borisov 3# Copyright (C) NGINX, Inc. 4 5 6shift 7 8for nxt_option; do --- 37 unchanged lines hidden (view full) --- 46 47. $NXT_AUTOCONF_DATA 48 49$echo "configuring Ruby module" 50$echo "configuring Ruby module ..." >> $NXT_AUTOCONF_ERR 51 52NXT_RUBY=${NXT_RUBY=ruby} 53NXT_RUBY_MODULE=${NXT_RUBY_MODULE=${NXT_RUBY}} |
54NXT_RUBY_MOUNTS_HEADER=$NXT_BUILD_DIR/nxt_ruby_mounts.h |
|
54 55nxt_found=no 56 57if /bin/sh -c "$NXT_RUBY -v" >> $NXT_AUTOCONF_ERR 2>&1; then 58 59 NXT_RUBY_RUBYHDRDIR=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["rubyhdrdir"])'` 60 NXT_RUBY_ARCHHDRDIR=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["rubyarchhdrdir"])'` | 55 56nxt_found=no 57 58if /bin/sh -c "$NXT_RUBY -v" >> $NXT_AUTOCONF_ERR 2>&1; then 59 60 NXT_RUBY_RUBYHDRDIR=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["rubyhdrdir"])'` 61 NXT_RUBY_ARCHHDRDIR=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["rubyarchhdrdir"])'` |
62 NXT_RUBY_SITEARCHDIR=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["sitearchhdrdir"])'` 63 NXT_RUBY_SITEDIR=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["sitedir"])'` 64 NXT_RUBY_LIBDIR=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["rubylibdir"])'` 65 NXT_RUBY_TOPDIR=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["topdir"])'` 66 NXT_RUBY_PREFIXDIR=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["rubylibprefix"])'` 67 NXT_RUBY_GEMDIR=`gem environment gemdir` 68 NXT_RUBY_GEMPATH=`gem environment gempath` 69 |
|
61 NXT_RUBY_INCPATH="-I$NXT_RUBY_ARCHHDRDIR -I$NXT_RUBY_RUBYHDRDIR" 62 63 NXT_RUBY_LIBNAME=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["RUBY_SO_NAME"])'` 64 NXT_RUBY_LIBSCONF=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["LIBS"])'` 65 NXT_RUBY_LIBS="-l$NXT_RUBY_LIBNAME $NXT_RUBY_LIBSCONF" 66 67 nxt_feature="Ruby library" 68 nxt_feature_name="" --- 61 unchanged lines hidden (view full) --- 130 131if grep ^$NXT_RUBY_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then 132 $echo 133 $echo $0: error: duplicate \"$NXT_RUBY_MODULE\" module configured. 134 $echo 135 exit 1; 136fi 137 | 70 NXT_RUBY_INCPATH="-I$NXT_RUBY_ARCHHDRDIR -I$NXT_RUBY_RUBYHDRDIR" 71 72 NXT_RUBY_LIBNAME=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["RUBY_SO_NAME"])'` 73 NXT_RUBY_LIBSCONF=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["LIBS"])'` 74 NXT_RUBY_LIBS="-l$NXT_RUBY_LIBNAME $NXT_RUBY_LIBSCONF" 75 76 nxt_feature="Ruby library" 77 nxt_feature_name="" --- 61 unchanged lines hidden (view full) --- 139 140if grep ^$NXT_RUBY_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then 141 $echo 142 $echo $0: error: duplicate \"$NXT_RUBY_MODULE\" module configured. 143 $echo 144 exit 1; 145fi 146 |
147 148cat << END > $NXT_RUBY_MOUNTS_HEADER 149 150static const nxt_fs_mount_t nxt_ruby_mounts[] = { 151 {(u_char *) "$NXT_RUBY_RUBYHDRDIR", (u_char *) "$NXT_RUBY_RUBYHDRDIR", 152 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 153 {(u_char *) "$NXT_RUBY_ARCHHDRDIR", (u_char *) "$NXT_RUBY_ARCHHDRDIR", 154 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 155 {(u_char *) "$NXT_RUBY_SITEDIR", (u_char *) "$NXT_RUBY_SITEDIR", 156 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 157 {(u_char *) "$NXT_RUBY_LIBDIR", (u_char *) "$NXT_RUBY_LIBDIR", 158 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 159 {(u_char *) "$NXT_RUBY_GEMDIR", (u_char *) "$NXT_RUBY_GEMDIR", 160 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 161 {(u_char *) "$NXT_RUBY_TOPDIR", (u_char *) "$NXT_RUBY_TOPDIR", 162 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 163 {(u_char *) "$NXT_RUBY_PREFIXDIR", (u_char *) "$NXT_RUBY_PREFIXDIR", 164 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 165 166END 167 168for path in `echo $NXT_RUBY_GEMPATH | tr ':' '\n'`; do 169 $echo "{(u_char *) \"$path\", (u_char *) \"$path\"," >> $NXT_RUBY_MOUNTS_HEADER 170 $echo "(u_char *) \"bind\", NXT_MS_BIND | NXT_MS_REC, NULL}," >> $NXT_RUBY_MOUNTS_HEADER 171done 172 173$echo "};" >> $NXT_RUBY_MOUNTS_HEADER 174 175 |
|
138$echo " + Ruby module: ${NXT_RUBY_MODULE}.unit.so" 139 140. auto/cc/deps 141 142$echo >> $NXT_MAKEFILE 143 144NXT_RUBY_MODULE_SRCS=" \ 145 src/ruby/nxt_ruby.c \ --- 60 unchanged lines hidden --- | 176$echo " + Ruby module: ${NXT_RUBY_MODULE}.unit.so" 177 178. auto/cc/deps 179 180$echo >> $NXT_MAKEFILE 181 182NXT_RUBY_MODULE_SRCS=" \ 183 src/ruby/nxt_ruby.c \ --- 60 unchanged lines hidden --- |