- Timestamp:
- Mar 11, 2008, 3:36:47 PM (16 years ago)
- Location:
- trunk/vizservers
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/vizservers/configure
r916 r940 669 669 CXXFLAGS 670 670 ac_ct_CXX 671 SUBDIRS672 671 CXXCPP 673 672 GREP 674 673 EGREP 674 SUBDIRS 675 675 TCL_LIB_DIR 676 676 TCL_LIB … … 3272 3272 3273 3273 3274 SUBDIRS="nanoscale nanovis pymolproxy"3275 3276 3277 3278 # Check whether --with-tcllib was given.3279 if test "${with_tcllib+set}" = set; then3280 withval=$with_tcllib; with_tcllib=$withval3281 else3282 with_tcllib=/usr/lib3283 fi3284 3285 3286 TCL_LIB_DIR=""3287 TCL_LIB=""3288 TCL_LIB_VERSION=""3289 { echo "$as_me:$LINENO: checking for tcl binary libraries" >&53290 echo $ECHO_N "checking for tcl binary libraries... $ECHO_C" >&6; }3291 if test "x$with_tcllib" != "x" ; then3292 if test -f "$with_tcllib"3293 then3294 if test -n `basename $with_tcllib | grep libtcl0-9\.0-9.so`3295 then3296 TCL_LIB_DIR="$with_tcllib"3297 fi3298 else3299 if test -d "$with_tcllib"3300 then3301 if test -x "$with_tcllib/`ls $with_tcllib | grep libtcl0-9\.0-9\.so$`"3302 then3303 TCL_LIB_DIR="$with_tcllib"3304 else3305 { echo "$as_me:$LINENO: result: no" >&53306 echo "${ECHO_T}no" >&6; }3307 { { echo "$as_me:$LINENO: error: cannot find tcl binary libraries, try using --with-tcllib" >&53308 echo "$as_me: error: cannot find tcl binary libraries, try using --with-tcllib" >&2;}3309 { (exit 1); exit 1; }; }3310 fi3311 else3312 { echo "$as_me:$LINENO: result: no" >&53313 echo "${ECHO_T}no" >&6; }3314 { { echo "$as_me:$LINENO: error: cannot find tcl binary libraries inside $with_tcllib, try using --with-tcllib" >&53315 echo "$as_me: error: cannot find tcl binary libraries inside $with_tcllib, try using --with-tcllib" >&2;}3316 { (exit 1); exit 1; }; }3317 fi3318 fi3319 else3320 3274 3321 3275 ac_ext=cpp … … 3951 3905 3952 3906 3907 { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 3908 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } 3909 if test "${ac_cv_c_bigendian+set}" = set; then 3910 echo $ECHO_N "(cached) $ECHO_C" >&6 3911 else 3912 # See if sys/param.h defines the BYTE_ORDER macro. 3913 cat >conftest.$ac_ext <<_ACEOF 3914 /* confdefs.h. */ 3915 _ACEOF 3916 cat confdefs.h >>conftest.$ac_ext 3917 cat >>conftest.$ac_ext <<_ACEOF 3918 /* end confdefs.h. */ 3919 #include <sys/types.h> 3920 #include <sys/param.h> 3921 3922 int 3923 main () 3924 { 3925 #if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ 3926 && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) 3927 bogus endian macros 3928 #endif 3929 3930 ; 3931 return 0; 3932 } 3933 _ACEOF 3934 rm -f conftest.$ac_objext 3935 if { (ac_try="$ac_compile" 3936 case "(($ac_try" in 3937 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 3938 *) ac_try_echo=$ac_try;; 3939 esac 3940 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 3941 (eval "$ac_compile") 2>conftest.er1 3942 ac_status=$? 3943 grep -v '^ *+' conftest.er1 >conftest.err 3944 rm -f conftest.er1 3945 cat conftest.err >&5 3946 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3947 (exit $ac_status); } && { 3948 test -z "$ac_cxx_werror_flag" || 3949 test ! -s conftest.err 3950 } && test -s conftest.$ac_objext; then 3951 # It does; now see whether it defined to BIG_ENDIAN or not. 3952 cat >conftest.$ac_ext <<_ACEOF 3953 /* confdefs.h. */ 3954 _ACEOF 3955 cat confdefs.h >>conftest.$ac_ext 3956 cat >>conftest.$ac_ext <<_ACEOF 3957 /* end confdefs.h. */ 3958 #include <sys/types.h> 3959 #include <sys/param.h> 3960 3961 int 3962 main () 3963 { 3964 #if BYTE_ORDER != BIG_ENDIAN 3965 not big endian 3966 #endif 3967 3968 ; 3969 return 0; 3970 } 3971 _ACEOF 3972 rm -f conftest.$ac_objext 3973 if { (ac_try="$ac_compile" 3974 case "(($ac_try" in 3975 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 3976 *) ac_try_echo=$ac_try;; 3977 esac 3978 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 3979 (eval "$ac_compile") 2>conftest.er1 3980 ac_status=$? 3981 grep -v '^ *+' conftest.er1 >conftest.err 3982 rm -f conftest.er1 3983 cat conftest.err >&5 3984 echo "$as_me:$LINENO: \$? = $ac_status" >&5 3985 (exit $ac_status); } && { 3986 test -z "$ac_cxx_werror_flag" || 3987 test ! -s conftest.err 3988 } && test -s conftest.$ac_objext; then 3989 ac_cv_c_bigendian=yes 3990 else 3991 echo "$as_me: failed program was:" >&5 3992 sed 's/^/| /' conftest.$ac_ext >&5 3993 3994 ac_cv_c_bigendian=no 3995 fi 3996 3997 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 3998 else 3999 echo "$as_me: failed program was:" >&5 4000 sed 's/^/| /' conftest.$ac_ext >&5 4001 4002 # It does not; compile a test program. 4003 if test "$cross_compiling" = yes; then 4004 # try to guess the endianness by grepping values into an object file 4005 ac_cv_c_bigendian=unknown 4006 cat >conftest.$ac_ext <<_ACEOF 4007 /* confdefs.h. */ 4008 _ACEOF 4009 cat confdefs.h >>conftest.$ac_ext 4010 cat >>conftest.$ac_ext <<_ACEOF 4011 /* end confdefs.h. */ 4012 short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; 4013 short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; 4014 void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } 4015 short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; 4016 short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; 4017 void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } 4018 int 4019 main () 4020 { 4021 _ascii (); _ebcdic (); 4022 ; 4023 return 0; 4024 } 4025 _ACEOF 4026 rm -f conftest.$ac_objext 4027 if { (ac_try="$ac_compile" 4028 case "(($ac_try" in 4029 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 4030 *) ac_try_echo=$ac_try;; 4031 esac 4032 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 4033 (eval "$ac_compile") 2>conftest.er1 4034 ac_status=$? 4035 grep -v '^ *+' conftest.er1 >conftest.err 4036 rm -f conftest.er1 4037 cat conftest.err >&5 4038 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4039 (exit $ac_status); } && { 4040 test -z "$ac_cxx_werror_flag" || 4041 test ! -s conftest.err 4042 } && test -s conftest.$ac_objext; then 4043 if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then 4044 ac_cv_c_bigendian=yes 4045 fi 4046 if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then 4047 if test "$ac_cv_c_bigendian" = unknown; then 4048 ac_cv_c_bigendian=no 4049 else 4050 # finding both strings is unlikely to happen, but who knows? 4051 ac_cv_c_bigendian=unknown 4052 fi 4053 fi 4054 else 4055 echo "$as_me: failed program was:" >&5 4056 sed 's/^/| /' conftest.$ac_ext >&5 4057 4058 4059 fi 4060 4061 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 4062 else 4063 cat >conftest.$ac_ext <<_ACEOF 4064 /* confdefs.h. */ 4065 _ACEOF 4066 cat confdefs.h >>conftest.$ac_ext 4067 cat >>conftest.$ac_ext <<_ACEOF 4068 /* end confdefs.h. */ 4069 $ac_includes_default 4070 int 4071 main () 4072 { 4073 4074 /* Are we little or big endian? From Harbison&Steele. */ 4075 union 4076 { 4077 long int l; 4078 char c[sizeof (long int)]; 4079 } u; 4080 u.l = 1; 4081 return u.c[sizeof (long int) - 1] == 1; 4082 4083 ; 4084 return 0; 4085 } 4086 _ACEOF 4087 rm -f conftest$ac_exeext 4088 if { (ac_try="$ac_link" 4089 case "(($ac_try" in 4090 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 4091 *) ac_try_echo=$ac_try;; 4092 esac 4093 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 4094 (eval "$ac_link") 2>&5 4095 ac_status=$? 4096 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4097 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' 4098 { (case "(($ac_try" in 4099 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 4100 *) ac_try_echo=$ac_try;; 4101 esac 4102 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 4103 (eval "$ac_try") 2>&5 4104 ac_status=$? 4105 echo "$as_me:$LINENO: \$? = $ac_status" >&5 4106 (exit $ac_status); }; }; then 4107 ac_cv_c_bigendian=no 4108 else 4109 echo "$as_me: program exited with status $ac_status" >&5 4110 echo "$as_me: failed program was:" >&5 4111 sed 's/^/| /' conftest.$ac_ext >&5 4112 4113 ( exit $ac_status ) 4114 ac_cv_c_bigendian=yes 4115 fi 4116 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext 4117 fi 4118 4119 4120 fi 4121 4122 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 4123 fi 4124 { echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 4125 echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } 4126 case $ac_cv_c_bigendian in 4127 yes) 4128 4129 cat >>confdefs.h <<\_ACEOF 4130 #define WORDS_BIGENDIAN 1 4131 _ACEOF 4132 ;; 4133 no) 4134 ;; 4135 *) 4136 { { echo "$as_me:$LINENO: error: unknown endianness 4137 presetting ac_cv_c_bigendian=no (or yes) will help" >&5 4138 echo "$as_me: error: unknown endianness 4139 presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} 4140 { (exit 1); exit 1; }; } ;; 4141 esac 4142 4143 4144 SUBDIRS="nanoscale nanovis pymolproxy" 4145 4146 4147 4148 # Check whether --with-tcllib was given. 4149 if test "${with_tcllib+set}" = set; then 4150 withval=$with_tcllib; with_tcllib=$withval 4151 else 4152 with_tcllib=/usr/lib 4153 fi 4154 4155 4156 TCL_LIB_DIR="" 4157 TCL_LIB="" 4158 TCL_LIB_VERSION="" 4159 { echo "$as_me:$LINENO: checking for tcl binary libraries" >&5 4160 echo $ECHO_N "checking for tcl binary libraries... $ECHO_C" >&6; } 4161 if test "x$with_tcllib" != "x" ; then 4162 if test -f "$with_tcllib" 4163 then 4164 if test -n `basename $with_tcllib | grep libtcl0-9\.0-9.so` 4165 then 4166 TCL_LIB_DIR="$with_tcllib" 4167 fi 4168 else 4169 if test -d "$with_tcllib" 4170 then 4171 if test -x "$with_tcllib/`ls $with_tcllib | grep libtcl0-9\.0-9\.so$`" 4172 then 4173 TCL_LIB_DIR="$with_tcllib" 4174 else 4175 { echo "$as_me:$LINENO: result: no" >&5 4176 echo "${ECHO_T}no" >&6; } 4177 { { echo "$as_me:$LINENO: error: cannot find tcl binary libraries, try using --with-tcllib" >&5 4178 echo "$as_me: error: cannot find tcl binary libraries, try using --with-tcllib" >&2;} 4179 { (exit 1); exit 1; }; } 4180 fi 4181 else 4182 { echo "$as_me:$LINENO: result: no" >&5 4183 echo "${ECHO_T}no" >&6; } 4184 { { echo "$as_me:$LINENO: error: cannot find tcl binary libraries inside $with_tcllib, try using --with-tcllib" >&5 4185 echo "$as_me: error: cannot find tcl binary libraries inside $with_tcllib, try using --with-tcllib" >&2;} 4186 { (exit 1); exit 1; }; } 4187 fi 4188 fi 4189 else 3953 4190 3954 4191 for ac_header in tcl.h … … 4524 4761 4525 4762 4526 ac_config_files="$ac_config_files Makefile nanoscale/Makefile nanovis/Makefile nanovis/newmat11/Makefile nanovis/R2/src/Makefile nanovis/imgLoaders/Makefile pymolproxy/Makefile start_viz.sh"4763 ac_config_files="$ac_config_files Makefile nanoscale/Makefile nanovis/Makefile nanovis/newmat11/Makefile nanovis/R2/src/Makefile nanovis/imgLoaders/Makefile nanovis/transfer-function/Makefile pymolproxy/Makefile start_viz.sh" 4527 4764 4528 4765 cat >confcache <<\_ACEOF … … 5100 5337 "nanovis/R2/src/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/R2/src/Makefile" ;; 5101 5338 "nanovis/imgLoaders/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/imgLoaders/Makefile" ;; 5339 "nanovis/transfer-function/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/transfer-function/Makefile" ;; 5102 5340 "pymolproxy/Makefile") CONFIG_FILES="$CONFIG_FILES pymolproxy/Makefile" ;; 5103 5341 "start_viz.sh") CONFIG_FILES="$CONFIG_FILES start_viz.sh" ;; … … 5216 5454 CXXFLAGS!$CXXFLAGS$ac_delim 5217 5455 ac_ct_CXX!$ac_ct_CXX$ac_delim 5218 SUBDIRS!$SUBDIRS$ac_delim5219 5456 CXXCPP!$CXXCPP$ac_delim 5220 5457 GREP!$GREP$ac_delim 5221 5458 EGREP!$EGREP$ac_delim 5459 SUBDIRS!$SUBDIRS$ac_delim 5222 5460 TCL_LIB_DIR!$TCL_LIB_DIR$ac_delim 5223 5461 TCL_LIB!$TCL_LIB$ac_delim -
trunk/vizservers/configure.in
r916 r940 34 34 AC_PROG_CXX 35 35 AC_LANG_CPLUSPLUS 36 37 AC_C_BIGENDIAN 36 38 37 39 SUBDIRS="nanoscale nanovis pymolproxy" … … 194 196 nanovis/R2/src/Makefile \ 195 197 nanovis/imgLoaders/Makefile \ 198 nanovis/transfer-function/Makefile \ 196 199 pymolproxy/Makefile \ 197 200 start_viz.sh ) -
trunk/vizservers/nanoscale/Makefile.in
r750 r940 5 5 LDFLAGS = @LDFLAGS@ 6 6 7 bindir = @bindir@ 8 datadir = @datarootdir@ 9 exec_prefix = @exec_prefix@ 10 includedir = @includedir@ 11 libdir = @libdir@ 12 mandir = @mandir@ 7 13 prefix = @prefix@ 8 exec_prefix = @exec_prefix@ 9 bindir = @bindir@ 10 libdir = @libdir@ 11 includedir = @includedir@ 12 mandir = @mandir@ 14 srcdir = @srcdir@ 15 16 VPATH = $(srcdir) 13 17 14 18 INSTALL = @INSTALL@ 15 INSTALL_PROGRAM = ${INSTALL} -m 75516 INSTALL_DATA = ${INSTALL} -m 64417 INSTALL_SCRIPT = ${INSTALL} -m 64419 INSTALL_PROGRAM = ${INSTALL} -m 555 20 INSTALL_DATA = ${INSTALL} -m 444 21 INSTALL_SCRIPT = ${INSTALL} -m 444 18 22 19 23 .PHONY: all install clean distclean … … 34 38 distclean: clean 35 39 rm Makefile 40 -
trunk/vizservers/nanovis/Makefile.in
r939 r940 7 7 .PHONY: all install clean distclean 8 8 9 bindir = @bindir@ 10 datadir = @datarootdir@ 11 exec_prefix = @exec_prefix@ 12 includedir = @includedir@ 13 libdir = @libdir@ 14 mandir = @mandir@ 9 15 prefix = @prefix@ 10 exec_prefix = @exec_prefix@11 bindir = @bindir@12 libdir = @libdir@13 16 srcdir = @srcdir@ 14 includedir = @includedir@ 15 mandir = @mandir@ 17 18 VPATH = $(srcdir) 16 19 17 20 INSTALL = @INSTALL@ 18 21 #Why are these files installed owner writable? 19 INSTALL_PROGRAM = ${INSTALL} -m 75520 INSTALL_DATA = ${INSTALL} -m 64421 INSTALL_SCRIPT = ${INSTALL} -m 64422 INSTALL_PROGRAM = ${INSTALL} -m 555 23 INSTALL_DATA = ${INSTALL} -m 444 24 INSTALL_SCRIPT = ${INSTALL} -m 444 22 25 RM = rm -f 23 26 … … 31 34 IMG_DIR = ./imgLoaders 32 35 IMG_INC_SPEC = -I$(srcdir)/$(IMG_DIR) 33 IMG_LIB = $(IMG_DIR)/ libImageLoaders.a36 IMG_LIB = $(IMG_DIR)/ImageLoaders.a 34 37 IMG_LIB_SPEC = $(IMG_LIB) 35 38 MAT_DIR = ./newmat11 36 39 MAT_INC_SPEC = -I$(srcdir)/$(MAT_DIR) 37 MAT_LIB = $(MAT_DIR)/ libnewmat11.a40 MAT_LIB = $(MAT_DIR)/newmat11.a 38 41 MAT_LIB_SPEC = $(MAT_LIB) 39 42 R2_DIR = ./R2 40 43 R2_INC_SPEC = -I$(srcdir)/$(R2_DIR)/include 41 R2_LIB = $(R2_DIR)/src/ libR2.a44 R2_LIB = $(R2_DIR)/src/R2.a 42 45 R2_LIB_SPEC = $(R2_LIB) 43 46 … … 48 51 TF_DIR = ./transfer-function 49 52 TF_INC_SPEC = -I$(TF_DIR) 50 TF_LIB = $(TF_DIR)/ libTransferFunction.a53 TF_LIB = $(TF_DIR)/transfer-function.a 51 54 TF_LIB_SPEC = $(TF_LIB) 52 55 … … 62 65 63 66 INCLUDES = \ 64 -I .\67 -I$(srcdir) \ 65 68 $(RP_INC_SPEC) \ 66 69 $(GL_INC_SPEC) \ -
trunk/vizservers/nanovis/R2/src/Makefile.in
r913 r940 4 4 .PHONY: all install clean distclean 5 5 6 bindir = @bindir@ 7 datadir = @datarootdir@ 8 exec_prefix = @exec_prefix@ 9 includedir = @includedir@ 10 libdir = @libdir@ 11 mandir = @mandir@ 6 12 prefix = @prefix@ 7 exec_prefix = @exec_prefix@8 bindir = @bindir@9 libdir = @libdir@10 13 srcdir = @srcdir@ 11 includedir = @includedir@12 mandir = @mandir@13 14 14 15 INSTALL = @INSTALL@ 15 INSTALL_PROGRAM = ${INSTALL} -m 75516 INSTALL_DATA = ${INSTALL} -m 64417 INSTALL_SCRIPT = ${INSTALL} -m 64416 INSTALL_PROGRAM = ${INSTALL} -m 555 17 INSTALL_DATA = ${INSTALL} -m 444 18 INSTALL_SCRIPT = ${INSTALL} -m 444 18 19 RM = rm -f 19 20 AR = ar rc 20 21 RANLIB = @RANLIB@ 21 22 CC = @CC@ 23 VPATH = $(srcdir) 22 24 23 25 INCLUDES = -I$(srcdir)/../include … … 28 30 CC_SWITCHES = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES) 29 31 30 OBJS 31 R2FilePath.o \32 R2Fonts.o \33 R2Geometry.o \34 R2IndexBuffer.o \35 R2Object.o \36 R2VertexBuffer.o \37 R2string.o32 OBJS = \ 33 R2FilePath.o \ 34 R2Fonts.o \ 35 R2Geometry.o \ 36 R2IndexBuffer.o \ 37 R2Object.o \ 38 R2VertexBuffer.o \ 39 R2string.o 38 40 39 R2LIB = libR2.a41 R2LIB = R2.a 40 42 41 43 all: $(R2LIB) -
trunk/vizservers/nanovis/imgLoaders/Makefile.in
r918 r940 4 4 .PHONY: all install clean distclean 5 5 6 bindir = @bindir@ 7 datadir = @datarootdir@ 8 exec_prefix = @exec_prefix@ 9 includedir = @includedir@ 10 libdir = @libdir@ 11 mandir = @mandir@ 6 12 prefix = @prefix@ 7 exec_prefix = @exec_prefix@8 bindir = @bindir@9 libdir = @libdir@10 13 srcdir = @srcdir@ 11 includedir = @includedir@12 mandir = @mandir@13 14 14 15 INSTALL = @INSTALL@ 15 INSTALL_PROGRAM = ${INSTALL} -m 75516 INSTALL_DATA = ${INSTALL} -m 64417 INSTALL_SCRIPT = ${INSTALL} -m 64416 INSTALL_PROGRAM = ${INSTALL} -m 555 17 INSTALL_DATA = ${INSTALL} -m 444 18 INSTALL_SCRIPT = ${INSTALL} -m 444 18 19 RM = rm -f 19 20 AR = ar rc 20 21 RANLIB = @RANLIB@ 21 22 CC = @CC@ 23 VPATH = $(srcdir) 22 24 23 INCLUDES 25 INCLUDES = -I$(srcdir) 24 26 25 CFLAGS 26 EXTRA_CFLAGS 27 DEFINES 28 CC_SWITCHES 27 CFLAGS = @CFLAGS@ 28 EXTRA_CFLAGS = -Wall 29 DEFINES = @DEFINES@ 30 CC_SWITCHES = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES) 29 31 30 IMGLIB = libImageLoaders.a32 IMGLIB = ImageLoaders.a 31 33 32 OBJS 33 BMPImageLoaderImpl.o \34 Image.o \35 ImageLoader.o \36 ImageLoaderFactory.o \37 ImageLoaderImpl.o34 OBJS = \ 35 BMPImageLoaderImpl.o \ 36 Image.o \ 37 ImageLoader.o \ 38 ImageLoaderFactory.o \ 39 ImageLoaderImpl.o 38 40 39 41 all: $(IMGLIB) -
trunk/vizservers/nanovis/newmat11/Makefile.in
r913 r940 4 4 .PHONY: all install clean distclean 5 5 6 bindir = @bindir@ 7 datadir = @datarootdir@ 8 exec_prefix = @exec_prefix@ 9 includedir = @includedir@ 10 libdir = @libdir@ 11 mandir = @mandir@ 6 12 prefix = @prefix@ 7 exec_prefix = @exec_prefix@8 bindir = @bindir@9 libdir = @libdir@10 13 srcdir = @srcdir@ 11 includedir = @includedir@12 mandir = @mandir@13 14 14 15 INSTALL = @INSTALL@ 15 INSTALL_PROGRAM = ${INSTALL} -m 75516 INSTALL_DATA = ${INSTALL} -m 64417 INSTALL_SCRIPT = ${INSTALL} -m 64416 INSTALL_PROGRAM = ${INSTALL} -m 555 17 INSTALL_DATA = ${INSTALL} -m 444 18 INSTALL_SCRIPT = ${INSTALL} -m 444 18 19 RM = rm -f 19 20 AR = ar rc 20 21 RANLIB = @RANLIB@ 21 22 CC = @CC@ 23 VPATH = $(srcdir) 22 24 23 INCLUDES 25 INCLUDES = -I$(srcdir) 24 26 25 CFLAGS 26 EXTRA_CFLAGS 27 DEFINES 28 CC_SWITCHES 27 CFLAGS = @CFLAGS@ 28 EXTRA_CFLAGS = -Wall 29 DEFINES = @DEFINES@ 30 CC_SWITCHES = $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES) 29 31 30 MATLIB = libnewmat11.a32 MATLIB = newmat11.a 31 33 32 OBJS 33 bandmat.o \34 cholesky.o \35 evalue.o \36 fft.o \37 hholder.o \38 jacobi.o \39 myexcept.o \40 newfft.o \41 newmat1.o \42 newmat2.o \43 newmat3.o \44 newmat4.o \45 newmat5.o \46 newmat6.o \47 newmat7.o \48 newmat8.o \49 newmat9.o \50 newmatex.o \51 newmatnl.o \52 newmatrm.o \53 nm_misc.o \54 solution.o \55 sort.o \56 submat.o \57 svd.o34 OBJS = \ 35 bandmat.o \ 36 cholesky.o \ 37 evalue.o \ 38 fft.o \ 39 hholder.o \ 40 jacobi.o \ 41 myexcept.o \ 42 newfft.o \ 43 newmat1.o \ 44 newmat2.o \ 45 newmat3.o \ 46 newmat4.o \ 47 newmat5.o \ 48 newmat6.o \ 49 newmat7.o \ 50 newmat8.o \ 51 newmat9.o \ 52 newmatex.o \ 53 newmatnl.o \ 54 newmatrm.o \ 55 nm_misc.o \ 56 solution.o \ 57 sort.o \ 58 submat.o \ 59 svd.o 58 60 59 61 all: $(MATLIB) -
trunk/vizservers/pymolproxy/Makefile.in
r760 r940 1 TARGETS = pymolproxy2 1 3 CC = @CC@ 4 CFLAGS = @CFLAGS@ -I@TCL_INCL_DIR@ 5 LDFLAGS = @LDFLAGS@ 6 # LDFLAGS = $(LDFLAGS) 2 TARGETS = pymolproxy 7 3 4 CC = @CC@ 5 INCLUDES = -I@TCL_INCL_DIR@ 6 CFLAGS = @CFLAGS@ 7 EXTRA_CFLAGS = -Wall 8 DEFINES = -DSTANDALONE 9 CC_SWITCHES = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES) 10 11 bindir = @bindir@ 12 datadir = @datarootdir@ 13 exec_prefix = @exec_prefix@ 14 includedir = @includedir@ 15 libdir = @libdir@ 16 mandir = @mandir@ 8 17 prefix = @prefix@ 9 exec_prefix = @exec_prefix@ 10 bindir = @bindir@ 11 libdir = @libdir@ 12 includedir = @includedir@ 13 mandir = @mandir@ 18 srcdir = @srcdir@ 14 19 20 RP_DIR = @RP_DIR@ 15 21 INSTALL = @INSTALL@ 16 22 INSTALL_PROGRAM = ${INSTALL} -m 755 17 23 INSTALL_DATA = ${INSTALL} -m 644 18 24 INSTALL_SCRIPT = ${INSTALL} -m 644 25 VPATH = $(srcdir) 19 26 20 27 .PHONY: all install clean distclean 21 28 29 OBJS = pymolproxy.o 30 LIBS = -ltcl8.4 31 22 32 all: $(TARGETS) 23 33 24 pymolproxy: pymolproxy.o 25 $(CC) $(CFLAGS) $(LDFLAGS) -DSTANDALONE pymolproxy.c -o pymolproxy -ltcl8.4 34 pymolproxy: $(OBJS) 35 $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS) 36 37 .c.o: 38 $(CC) $(CC_SWITCHES) -o $@ -c $< 26 39 27 40 install: pymolproxy 28 41 $(INSTALL_PROGRAM) pymolproxy $(bindir)/pymolproxy 29 $(INSTALL_PROGRAM) pymol $(bindir)/pymol30 cp -rL @RP_DIR@/lib/pymol $(libdir)/pymol42 $(INSTALL_PROGRAM) $(srcdir)/pymol $(bindir)/pymol 43 cp -rL $(RP_DIR)/lib/pymol $(libdir)/pymol 31 44 32 45 clean: -
trunk/vizservers/pymolproxy/pymolproxy.c
r914 r940 112 112 assert(buffer != NULL); 113 113 if (length == 0) { 114 114 dyBufferFree(buffer); 115 115 } else if (length > buffer->used) { 116 117 118 119 120 121 122 123 116 char *newdata; 117 118 newdata = realloc(buffer->data, length); 119 if (newdata != NULL) { 120 buffer->data = newdata; 121 buffer->used = length; 122 buffer->allocated = length; 123 } 124 124 } else { 125 125 buffer->used = length; 126 126 } 127 127 } … … 167 167 int result, total, left; 168 168 169 for( total = 0, left = size; left > 0; left -= result) 170 { 171 result = read(sock,buffer+total,left); 172 173 if (result > 0) { 174 total += result; 175 continue; 176 } 177 178 if ((result < 0) && (errno != EAGAIN) && (errno != EINTR)) 179 { 180 trace("pymolproxy: Error reading sock(%d), %d/%s\n", 181 sock, errno,strerror(errno)); 182 break; 183 } 184 185 result = 0; 186 } 187 169 for( total = 0, left = size; left > 0; left -= result) { 170 result = read(sock,buffer+total,left); 171 172 if (result > 0) { 173 total += result; 174 continue; 175 } 176 177 if ((result < 0) && (errno != EAGAIN) && (errno != EINTR)) { 178 trace("pymolproxy: Error reading sock(%d), %d/%s\n", 179 sock, errno,strerror(errno)); 180 break; 181 } 182 183 result = 0; 184 } 188 185 return(total); 189 186 } 187 188 #ifdef notdef 190 189 191 190 static int … … 194 193 int bsize; 195 194 196 while(bytes) 197 { 198 if (bytes > size) 199 bsize = size; 200 else 201 bsize = bytes; 202 203 bsize = bread(sock,buffer,bsize); 204 205 bytes -= bsize; 206 } 195 while(bytes) { 196 if (bytes > size) 197 bsize = size; 198 else 199 bsize = bytes; 200 201 bsize = bread(sock,buffer,bsize); 202 203 bytes -= bsize; 204 } 207 205 } 208 206 209 207 #undef timersub 210 #undef timeradd211 212 208 static void 213 209 timersub(struct timeval *a, struct timeval *b, struct timeval *result) … … 222 218 } 223 219 220 #endif 221 224 222 static void 225 223 timersub_ms(struct timeval *a, struct timeval *b, int *result) … … 238 236 } 239 237 240 238 #undef timeradd 241 239 static void 242 timeradd (struct timeval *a, struct timeval *b, struct timeval *result)240 timeradd (struct timeval *a, struct timeval *b, struct timeval *result) 243 241 { 244 242 result->tv_sec = a->tv_sec + b->tv_sec; 245 243 result->tv_usec = a->tv_usec + b->tv_usec; 246 244 247 while (result->tv_usec >= 1000000) {245 while (result->tv_usec >= 1000000) { 248 246 result->tv_sec += 1; 249 247 result->tv_usec -= 1000000; … … 293 291 break; 294 292 295 if (buffer[pos] == '\n') 296 { 297 pos++; 298 break; 299 } 300 293 if (buffer[pos] == '\n') { 294 pos++; 295 break; 296 } 301 297 pos++; 302 303 298 } 304 299 … … 325 320 break; 326 321 } 322 trace("stdout-u>read(%s)", buffer); 327 323 if (strncmp(buffer, string, strlen(string)) == 0) { 328 324 trace("stdout-e> %s",buffer); … … 331 327 break; 332 328 } 333 trace("stdout-u>(%s)", buffer);334 329 } 335 330 … … 348 343 send_expect(PymolProxy *pymol, char *expect, char *cmd) 349 344 { 350 char string[800]; 351 352 if (pymol->error) 345 if (pymol->error) { 353 346 return(TCL_ERROR); 354 347 } 355 348 trace("to-pymol>(%s)", cmd); 356 349 write(pymol->p_stdin, cmd, strlen(cmd)); … … 661 654 push = 1; 662 655 else { 663 656 cmd = argv[arg]; 664 657 } 665 658 } … … 834 827 LoadPDBCmd(ClientData cdata, Tcl_Interp *interp, int argc, const char *argv[]) 835 828 { 836 const char *pdbdata, *pdb, *name; 837 char *buf; 838 char buffer[800]; 829 const char *pdbdata, *name; 839 830 PymolProxy *pymol = (PymolProxy *) cdata; 840 831 int state = 1; 841 832 int arg, defer = 0, push = 0, varg = 1; 842 char filename[] = "/tmp/fileXXXXXX.pdb"; 843 844 clear_error(pymol); 845 833 834 clear_error(pymol); 835 836 pdbdata = name = NULL; /* Suppress compiler warning. */ 846 837 for(arg = 1; arg < argc; arg++) { 847 838 if ( strcmp(argv[arg],"-defer") == 0 ) … … 866 857 pymol->immediate_update |= push; 867 858 868 #ifdef notdef869 859 { 870 /* Pymol expects to load the pdb from a file. 871 * Should create a rappture owned directory to write files. 872 */ 873 int fd; 874 char fileName[200]; 875 876 sprintf(fileName, "/tmp/pymol-%d.pdb", getpid()); 877 fd = open(fileName,O_WRONLY | O_TRUNC | O_CREAT, 0600); 878 if (fd < 0) { 879 Tcl_AppendResult(interp, "pymolproxy: error opening \"", fileName, 880 "\": ", strerror(errno), (char *)NULL); 881 pymol->status = TCL_ERROR; 882 return TCL_ERROR; 883 } 884 write(fd, pdbdata, strlen(pdbdata)); 885 close(fd); 886 sendf(pymol, "load %s, %s, %d\n", fileName, name, state); 887 } 888 #else 889 { 890 int count; 891 const char *p; 892 char *q, *newdata; 893 894 count = 0; 895 for (p = pdbdata; *p != '\0'; p++) { 896 if (*p == '\n') { 897 count++; 898 } 899 count++; 900 } 901 902 q = newdata = malloc(count + 100); 903 strcpy(newdata, "cmd.read_pdbstr(\"\"\"\\\n"); 904 q = newdata + strlen(newdata); 905 for (p = pdbdata; *p != '\0'; p++, q++) { 906 if (*p == '\n') { 907 *q++ = '\\'; 908 } 909 *q = *p; 910 } 911 sprintf(q, "\\\n\"\"\",\"%s\",%d)\n", name, state); 912 { 913 char expect[800]; 914 915 sprintf(expect, "PyMOL>\"\"\",\"%s\",%d)\n", name, state); 916 send_expect(pymol, expect, newdata); 917 } 918 free(newdata); 919 } 920 #endif 860 int count; 861 const char *p; 862 char *q, *newdata; 863 864 count = 0; 865 for (p = pdbdata; *p != '\0'; p++) { 866 if (*p == '\n') { 867 count++; 868 } 869 count++; 870 } 871 872 q = newdata = malloc(count + 100); 873 strcpy(newdata, "cmd.read_pdbstr(\"\"\"\\\n"); 874 q = newdata + strlen(newdata); 875 for (p = pdbdata; *p != '\0'; p++, q++) { 876 if (*p == '\n') { 877 *q++ = '\\'; 878 } 879 *q = *p; 880 } 881 sprintf(q, "\\\n\"\"\",\"%s\",%d)\n", name, state); 882 { 883 char expect[800]; 884 885 sprintf(expect, "PyMOL>\"\"\",\"%s\",%d)\n", name, state); 886 send_expect(pymol, expect, newdata); 887 } 888 free(newdata); 889 } 921 890 sendf(pymol, "zoom buffer=2\n"); 922 891 … … 1091 1060 int pairOut[2]; 1092 1061 int pairErr[2]; 1093 char buffer[800];1094 1062 Tcl_Interp *interp; 1095 1063 Tcl_DString cmdbuffer; … … 1125 1093 pid = fork(); 1126 1094 1127 if (pid < 0) 1095 if (pid < 0) { 1096 fprintf(stderr, "can't fork process: %s\n", strerror(errno)); 1128 1097 return(-3); 1129 1130 if (pid == 0) /* child process */1131 {1132 int i, fd; 1133 1134 /* Create a new process group, so we can later kill this process1135 * and all its children without affecting the process that created1136 * this one1137 */1138 1139 setpgid(pid, 0);1140 1141 /* Redirect stdin, stdout, and stderr to pipes before execing */1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 trace("pymolproxy: Failed to start pyMol\n");1152 1153 1098 } 1099 if (pid == 0) { 1100 int fd; 1101 1102 /* Child process */ 1103 1104 /* 1105 * Create a new process group, so we can later kill this process and 1106 * all its children without affecting the process that created this 1107 * one. 1108 */ 1109 setpgid(pid, 0); 1110 1111 /* Redirect stdin, stdout, and stderr to pipes before execing */ 1112 dup2(pairIn[0] ,0); // stdin 1113 dup2(pairOut[1],1); // stdout 1114 dup2(pairErr[1],2); // stderr 1115 1116 for(fd = 3; fd < FD_SETSIZE; fd++) /* close all other descriptors */ 1117 close(fd); 1118 1119 execvp(argv[0], argv); 1120 trace("pymolproxy: Failed to start pyMol %s\n", argv[0]); 1121 exit(-1); 1122 } 1154 1123 1155 1124 /* close opposite end of pipe, these now belong to the child process */ … … 1193 1162 dyBufferInit(&dybuffer2); 1194 1163 1195 Tcl_CreateCommand(interp, "bmp", BMPCmd,&pymol, NULL);1196 Tcl_CreateCommand(interp, "png", PNGCmd,&pymol, NULL);1197 Tcl_CreateCommand(interp, "screen", ViewportCmd,&pymol, NULL);1198 Tcl_CreateCommand(interp, "viewport",ViewportCmd, 1199 Tcl_CreateCommand(interp, "rotate", RotateCmd,&pymol, NULL);1200 Tcl_CreateCommand(interp, "zoom", ZoomCmd,&pymol, NULL);1201 Tcl_CreateCommand(interp, "loadpdb", LoadPDBCmd, 1164 Tcl_CreateCommand(interp, "bmp", BMPCmd, &pymol, NULL); 1165 Tcl_CreateCommand(interp, "png", PNGCmd, &pymol, NULL); 1166 Tcl_CreateCommand(interp, "screen", ViewportCmd, &pymol, NULL); 1167 Tcl_CreateCommand(interp, "viewport",ViewportCmd, &pymol, NULL); 1168 Tcl_CreateCommand(interp, "rotate", RotateCmd, &pymol, NULL); 1169 Tcl_CreateCommand(interp, "zoom", ZoomCmd, &pymol, NULL); 1170 Tcl_CreateCommand(interp, "loadpdb", LoadPDBCmd, &pymol, NULL); 1202 1171 Tcl_CreateCommand(interp, "ballnstick",BallNStickCmd, &pymol, NULL); 1203 Tcl_CreateCommand(interp, "spheres", SpheresCmd, 1204 Tcl_CreateCommand(interp, "lines", LinesCmd,&pymol, NULL);1205 Tcl_CreateCommand(interp, "raw", RawCmd,&pymol, NULL);1206 Tcl_CreateCommand(interp, "label", LabelCmd,&pymol, NULL);1207 Tcl_CreateCommand(interp, "reset", ResetCmd,&pymol, NULL);1208 Tcl_CreateCommand(interp, "rock", RockCmd,&pymol, NULL);1209 Tcl_CreateCommand(interp, "frame", FrameCmd,&pymol, NULL);1210 Tcl_CreateCommand(interp, "vmouse", VMouseCmd,&pymol, NULL);1211 Tcl_CreateCommand(interp, "disable", DisableCmd, 1212 Tcl_CreateCommand(interp, "enable", EnableCmd,&pymol, NULL);1172 Tcl_CreateCommand(interp, "spheres", SpheresCmd, &pymol, NULL); 1173 Tcl_CreateCommand(interp, "lines", LinesCmd, &pymol, NULL); 1174 Tcl_CreateCommand(interp, "raw", RawCmd, &pymol, NULL); 1175 Tcl_CreateCommand(interp, "label", LabelCmd, &pymol, NULL); 1176 Tcl_CreateCommand(interp, "reset", ResetCmd, &pymol, NULL); 1177 Tcl_CreateCommand(interp, "rock", RockCmd, &pymol, NULL); 1178 Tcl_CreateCommand(interp, "frame", FrameCmd, &pymol, NULL); 1179 Tcl_CreateCommand(interp, "vmouse", VMouseCmd, &pymol, NULL); 1180 Tcl_CreateCommand(interp, "disable", DisableCmd, &pymol, NULL); 1181 Tcl_CreateCommand(interp, "enable", EnableCmd, &pymol, NULL); 1213 1182 1214 1183 // Main Proxy Loop … … 1374 1343 { 1375 1344 if (debug) { 1376 1377 1345 flog = stderr; 1346 flog = fopen("/tmp/pymolproxy.log", "w"); 1378 1347 } 1379 1348 ProxyInit(fileno(stdout), fileno(stdin), argv + 1);
Note: See TracChangeset
for help on using the changeset viewer.