Changeset 760

Timestamp:

Jun 8, 2007, 3:46:18 PM (17 years ago)

Author:

dkearney

Message:

added pymol script for launching pymol.
updated pymolproxy's makefile to install pymol and pymol's
modules from the rappture-runtime package.
updated start_viz.sh to include PYMOL_PATH environment variable
needed my pymol.

Location:

trunk/vizservers

Files:

• configure.in (modified) (1 diff)
• pymolproxy/Makefile.in (modified) (1 diff)
• pymolproxy/pymol (added)
• start_viz.sh.in (modified) (2 diffs)

trunk/vizservers/configure.in

@@ -186 +186 @@
 
 
-AC_OUTPUT( Makefile nanoscale/Makefile nanovis/Makefile pymolproxy/Makefile start_viz.sh)
+AC_OUTPUT(  Makefile \
+            nanoscale/Makefile \
+            nanovis/Makefile \
+            pymolproxy/Makefile \
+            start_viz.sh    )

trunk/vizservers/pymolproxy/Makefile.in

@@ -27 +27 @@
 install: pymolproxy
         $(INSTALL_PROGRAM) pymolproxy $(bindir)/pymolproxy
+        $(INSTALL_PROGRAM) pymol $(bindir)/pymol
+        cp -rL @RP_DIR@/lib/pymol $(libdir)/pymol
 
 clean:

trunk/vizservers/start_viz.sh.in

@@ -9 +9 @@
 PATH=${dir}/bin:$PATH
 LD_LIBRARY_PATH=${dir}/lib:$LD_LIBRARY_PATH
-export PATH LD_LIBRARY_PATH
+PYMOL_PATH=${dir}/lib/pymol
+export PATH LD_LIBRARY_PATH PYMOL_PATH
 
 cp -r ${install_dir}/* ${dir}
@@ -15 +16 @@
 cd ${dir}
 
-${dir}/bin/nanoscale -d -b 2000 -s 172.18.3.255 -l 2000 -c "${dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources"
-#${dir}/bin/nanoscale -b 2000 -s 172.18.3.255 -l 2020 -c "${dir}/bin/pymolproxy /opt/pymol/bin/pymol -p -q -i -x -X 0 -Y 0"
-#${dir}/bin/nanoscale -b 2000 -s 172.18.3.255 -l 2000 -c "${dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources" -l 2020 -c "${dir}/bin/pymolproxy /opt/pymol/bin/pymol -p -q -i -x -X 0 -Y 0"
+#${dir}/bin/nanoscale -d -b 2000 -s 172.18.3.255 -l 2000 -c "${dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources"
+#${dir}/bin/nanoscale -d -b 2000 -s 172.18.3.255 -l 2020 -c "${dir}/bin/pymolproxy ${dir}/bin/pymol -p -q -i -x -X 0 -Y 0"
+${dir}/bin/nanoscale -b 2000 -s 172.18.3.255 -l 2000 -c "${dir}/bin/nanovis -p ${dir}/lib/shaders:${dir}/lib/resources" -l 2020 -c "${dir}/bin/pymolproxy ${dir}/bin/pymol -p -q -i -x -X 0 -Y 0"