Deleted
Added
ruby (1489:4a3ec07f4b19) | ruby (1532:4b4d0c3ce94b) |
---|---|
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 | |
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"])'` --- 77 unchanged lines hidden (view full) --- 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 | 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"])'` 61 NXT_RUBY_SITEARCHDIR=`$NXT_RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG["sitearchhdrdir"])'` --- 77 unchanged lines hidden (view full) --- 139if grep ^$NXT_RUBY_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then 140 $echo 141 $echo $0: error: duplicate \"$NXT_RUBY_MODULE\" module configured. 142 $echo 143 exit 1; 144fi 145 146 |
148cat << END > $NXT_RUBY_MOUNTS_HEADER | 147NXT_RUBY_MOUNTS_HEADER=nxt_${NXT_RUBY_MODULE}_mounts.h 148NXT_RUBY_MOUNTS_PATH=$NXT_BUILD_DIR/$NXT_RUBY_MOUNTS_HEADER |
149 | 149 |
150cat << END > $NXT_RUBY_MOUNTS_PATH 151 |
|
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 | 152static const nxt_fs_mount_t nxt_ruby_mounts[] = { 153 {(u_char *) "$NXT_RUBY_RUBYHDRDIR", (u_char *) "$NXT_RUBY_RUBYHDRDIR", 154 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 155 {(u_char *) "$NXT_RUBY_ARCHHDRDIR", (u_char *) "$NXT_RUBY_ARCHHDRDIR", 156 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 157 {(u_char *) "$NXT_RUBY_SITEDIR", (u_char *) "$NXT_RUBY_SITEDIR", 158 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 159 {(u_char *) "$NXT_RUBY_LIBDIR", (u_char *) "$NXT_RUBY_LIBDIR", 160 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 161 {(u_char *) "$NXT_RUBY_GEMDIR", (u_char *) "$NXT_RUBY_GEMDIR", 162 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 163 {(u_char *) "$NXT_RUBY_TOPDIR", (u_char *) "$NXT_RUBY_TOPDIR", 164 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 165 {(u_char *) "$NXT_RUBY_PREFIXDIR", (u_char *) "$NXT_RUBY_PREFIXDIR", 166 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 167 168END 169 170for 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 | 171 $echo "{(u_char *) \"$path\", (u_char *) \"$path\"," >> $NXT_RUBY_MOUNTS_PATH 172 $echo "(u_char *) \"bind\", NXT_MS_BIND | NXT_MS_REC, NULL}," >> $NXT_RUBY_MOUNTS_PATH |
171done 172 | 173done 174 |
173$echo "};" >> $NXT_RUBY_MOUNTS_HEADER | 175$echo "};" >> $NXT_RUBY_MOUNTS_PATH |
174 175 176$echo " + Ruby module: ${NXT_RUBY_MODULE}.unit.so" 177 178. auto/cc/deps 179 180$echo >> $NXT_MAKEFILE 181 --- 13 unchanged lines hidden (view full) --- 195 nxt_dep_flags=`nxt_gen_dep_flags` 196 nxt_dep_post=`nxt_gen_dep_post` 197 nxt_objs="$nxt_objs $NXT_BUILD_DIR/$nxt_obj" 198 199 cat << END >> $NXT_MAKEFILE 200 201$NXT_BUILD_DIR/$nxt_obj: $nxt_src $NXT_VERSION_H 202 mkdir -p $NXT_BUILD_DIR/src/ruby | 176 177 178$echo " + Ruby module: ${NXT_RUBY_MODULE}.unit.so" 179 180. auto/cc/deps 181 182$echo >> $NXT_MAKEFILE 183 --- 13 unchanged lines hidden (view full) --- 197 nxt_dep_flags=`nxt_gen_dep_flags` 198 nxt_dep_post=`nxt_gen_dep_post` 199 nxt_objs="$nxt_objs $NXT_BUILD_DIR/$nxt_obj" 200 201 cat << END >> $NXT_MAKEFILE 202 203$NXT_BUILD_DIR/$nxt_obj: $nxt_src $NXT_VERSION_H 204 mkdir -p $NXT_BUILD_DIR/src/ruby |
203 \$(CC) -c \$(CFLAGS) \$(NXT_INCS) $NXT_RUBY_INCPATH \\ | 205 \$(CC) -c \$(CFLAGS) -DNXT_RUBY_MOUNTS_H=\"$NXT_RUBY_MOUNTS_HEADER\" \\ 206 \$(NXT_INCS) $NXT_RUBY_INCPATH \\ |
204 $nxt_dep_flags \\ 205 -o $NXT_BUILD_DIR/$nxt_obj $nxt_src 206 $nxt_dep_post 207 208-include $NXT_BUILD_DIR/$nxt_dep 209 210END 211 --- 32 unchanged lines hidden --- | 207 $nxt_dep_flags \\ 208 -o $NXT_BUILD_DIR/$nxt_obj $nxt_src 209 $nxt_dep_post 210 211-include $NXT_BUILD_DIR/$nxt_dep 212 213END 214 --- 32 unchanged lines hidden --- |