Deleted
Added
java (1341:f11eb1b5b339) | java (1489:4a3ec07f4b19) |
---|---|
1 2# Copyright (C) NGINX, Inc. 3 4 5shift 6 7NXT_JAVA_HOME=${JAVA_HOME-} 8NXT_JAR_REPO=https://repo1.maven.org/maven2/ --- 158 unchanged lines hidden (view full) --- 167 if [ -z "$NXT_JAVA_LIB_PATH" ]; then 168 $echo " not found" 169 $echo 170 $echo $0: error: library path not found. 171 $echo 172 exit 1 173 fi 174 | 1 2# Copyright (C) NGINX, Inc. 3 4 5shift 6 7NXT_JAVA_HOME=${JAVA_HOME-} 8NXT_JAR_REPO=https://repo1.maven.org/maven2/ --- 158 unchanged lines hidden (view full) --- 167 if [ -z "$NXT_JAVA_LIB_PATH" ]; then 168 $echo " not found" 169 $echo 170 $echo $0: error: library path not found. 171 $echo 172 exit 1 173 fi 174 |
175 NXT_JAVA_LIB_PATH="${NXT_JAVA_LIB_PATH}/server" | 175 NXT_JAVA_LIB_SERVER_PATH="${NXT_JAVA_LIB_PATH}/server" |
176 177 $echo " $NXT_JAVA_LIB_PATH" 178 $echo "got library path $NXT_JAVA_LIB_PATH" >> $NXT_AUTOCONF_ERR 179fi 180 | 176 177 $echo " $NXT_JAVA_LIB_PATH" 178 $echo "got library path $NXT_JAVA_LIB_PATH" >> $NXT_AUTOCONF_ERR 179fi 180 |
181NXT_JAVA_LDFLAGS="-L${NXT_JAVA_LIB_PATH} -Wl,-rpath ${NXT_JAVA_LIB_PATH} -ljvm" | 181NXT_JAVA_LDFLAGS="-L${NXT_JAVA_LIB_SERVER_PATH} -Wl,-rpath ${NXT_JAVA_LIB_SERVER_PATH} -ljvm" |
182 183 184nxt_found=no 185 186nxt_feature="JNI" 187nxt_feature_name="" 188nxt_feature_run=no 189nxt_feature_incs="${NXT_JAVA_INCLUDE}" --- 32 unchanged lines hidden (view full) --- 222NXT_UNIT_JAR=nginx-unit-jsc-${NXT_JAVA_MODULE}-$NXT_VERSION.jar 223NXT_WS_API_JAR=websocket-api-${NXT_JAVA_MODULE}-$NXT_VERSION.jar 224 225NXT_JAVA_BUILD_CP=$NXT_BUILD_DIR/$NXT_JAVA_MODULE 226NXT_JAVA_INSTALL_JARS= 227NXT_JAVA_UNINSTALL_JARS= 228 229NXT_JAVA_JARS=$NXT_BUILD_DIR/$NXT_JAVA_MODULE/nxt_jars.h | 182 183 184nxt_found=no 185 186nxt_feature="JNI" 187nxt_feature_name="" 188nxt_feature_run=no 189nxt_feature_incs="${NXT_JAVA_INCLUDE}" --- 32 unchanged lines hidden (view full) --- 222NXT_UNIT_JAR=nginx-unit-jsc-${NXT_JAVA_MODULE}-$NXT_VERSION.jar 223NXT_WS_API_JAR=websocket-api-${NXT_JAVA_MODULE}-$NXT_VERSION.jar 224 225NXT_JAVA_BUILD_CP=$NXT_BUILD_DIR/$NXT_JAVA_MODULE 226NXT_JAVA_INSTALL_JARS= 227NXT_JAVA_UNINSTALL_JARS= 228 229NXT_JAVA_JARS=$NXT_BUILD_DIR/$NXT_JAVA_MODULE/nxt_jars.h |
230NXT_JAVA_MOUNTS_HEADER=$NXT_BUILD_DIR/$NXT_JAVA_MODULE/nxt_java_mounts.h |
|
230mkdir -p $NXT_BUILD_DIR/$NXT_JAVA_MODULE 231 232cat << END > $NXT_JAVA_JARS 233#ifndef _NXT_JAVA_JARS_INCLUDED_ 234#define _NXT_JAVA_JARS_INCLUDED_ 235 236#define NXT_JARS "$NXT_JARS" 237 --- 65 unchanged lines hidden (view full) --- 303 304cat << END >> $NXT_JAVA_JARS 305 NULL 306}; 307 308#endif /* _NXT_JAVA_JARS_INCLUDED_ */ 309END 310 | 231mkdir -p $NXT_BUILD_DIR/$NXT_JAVA_MODULE 232 233cat << END > $NXT_JAVA_JARS 234#ifndef _NXT_JAVA_JARS_INCLUDED_ 235#define _NXT_JAVA_JARS_INCLUDED_ 236 237#define NXT_JARS "$NXT_JARS" 238 --- 65 unchanged lines hidden (view full) --- 304 305cat << END >> $NXT_JAVA_JARS 306 NULL 307}; 308 309#endif /* _NXT_JAVA_JARS_INCLUDED_ */ 310END 311 |
312NXT_JAVA_LIBJVM="$NXT_JAVA_LIB_SERVER_PATH/libjvm.so" 313 314if [ "$NXT_SYSTEM" = "Darwin" ]; then 315NXT_JAVA_LIBC_DIR="/usr/lib" 316else 317NXT_JAVA_LIBC_DIR=`ldd "$NXT_JAVA_LIBJVM" | grep libc.so | cut -d' ' -f3` 318NXT_JAVA_LIBC_DIR=`dirname $NXT_JAVA_LIBC_DIR` 319fi 320 321cat << END > $NXT_JAVA_MOUNTS_HEADER 322#ifndef _NXT_JAVA_MOUNTS_H_INCLUDED_ 323#define _NXT_JAVA_MOUNTS_H_INCLUDED_ 324 325 326static const nxt_fs_mount_t nxt_java_mounts[] = { 327 {(u_char *) "proc", (u_char *) "/proc", (u_char *) "proc", 0, NULL}, 328 {(u_char *) "$NXT_JAVA_LIBC_DIR", (u_char *) "$NXT_JAVA_LIBC_DIR", 329 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 330 {(u_char *) "$NXT_JAVA_HOME", (u_char *) "$NXT_JAVA_HOME", 331 (u_char *) "bind", NXT_MS_BIND | NXT_MS_REC, NULL}, 332}; 333 334 335#endif /* _NXT_JAVA_MOUNTS_H_INCLUDED_ */ 336END 337 |
|
311$echo " + Java module: ${NXT_JAVA_MODULE}.unit.so" 312 313. auto/cc/deps 314 315$echo >> $NXT_MAKEFILE 316 317NXT_JAVA_MODULE_SRCS=" \ 318 src/nxt_java.c \ --- 294 unchanged lines hidden --- | 338$echo " + Java module: ${NXT_JAVA_MODULE}.unit.so" 339 340. auto/cc/deps 341 342$echo >> $NXT_MAKEFILE 343 344NXT_JAVA_MODULE_SRCS=" \ 345 src/nxt_java.c \ --- 294 unchanged lines hidden --- |