Changeset 1072 for trunk

Timestamp:

Jun 28, 2008 5:24:23 PM (16 years ago)

Author:

gah

Message:

nanovis Makefile fixes

Location:

trunk/packages/vizservers

Files:

• Makefile.in (modified) (1 diff)
• nanovis/Command.cpp (modified) (1 diff)
• pymolproxy/Makefile.in (modified) (2 diffs)
• pymolproxy/pymolproxy.c (modified) (2 diffs)

trunk/packages/vizservers/Makefile.in

@@ -1 +1 @@
 
-subdirs         = @SUBDIRS@
+bindir          = @bindir@
+datadir         = @datadir@
+datarootdir     = @datarootdir@
+exec_prefix     = @exec_prefix@
+includedir      = @includedir@
+libdir          = @libdir@
+mandir          = @mandir@
+prefix          = @prefix@
+srcdir          = @srcdir@
+
+destdir         = $(prefix)/bin
+
+INSTALL         = @INSTALL@
+SHELL           = @SHELL@
+RM              = rm -f
+VPATH           = $(srcdir)
+
+SUBDIRS         = nanoscale nanovis pymolproxy
+FILES           = \
+                start_viz.sh
+
+.PHONY: nanoscale nanovis pymolproxy
 
 all:
-        for dir in $(subdirs) ; do \
-                if test -d $$dir ; then \
-                    echo "$$dir: $(MAKE) $@" ; \
-                    if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1; fi ; \
-                else \
-                    exit 1; \
-                fi \
-        done;
+        for i in $(SUBDIRS) ; do \
+          $(MAKE) -C $$i all || exit 1 ; \
+        done
 
 install:
-        for dir in $(subdirs) ; do \
-                if test -d $$dir ; then \
-                    echo "$$dir: $(MAKE) $@" ; \
-                    if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1; fi ; \
-                else \
-                    exit 1; \
-                fi \
-        done;
-        install -c -m 755 start_viz.sh @prefix@/start_viz.sh
+        $(INSTALL) -d $(destdir)
+        for i in $(SUBDIRS) ; do \
+          $(MAKE) -C $$i install || exit 1 ; \
+        done
+        $(INSTALL) -m 555 start_viz.sh $(prefix)/start_viz.sh
 
 clean:
-        for dir in $(subdirs) ; do \
-                if test -d $$dir ; then \
-                    echo "$$dir: $(MAKE) $@" ; \
-                    if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1; fi ; \
-                else \
-                    exit 1; \
-                fi \
-        done;
+        for i in $(SUBDIRS) ; do \
+          $(MAKE) -C $$i clean ; \
+        done
 
 distclean:
-        for dir in $(subdirs) ; do \
-                if test -d $$dir ; then \
-                    echo "$$dir: $(MAKE) $@" ; \
-                    if (cd $$dir; $(MAKE) $@) ; then true ; else exit 1; fi ; \
-                else \
-                    exit 1; \
-                fi \
-        done;
-        rm -f *~
-        rm -f Makefile start_viz.sh
+        for i in $(SUBDIRS) ; do \
+          $(MAKE) -C $$i distclean ; \
+        done
+        rm -f Makefile start_viz.sh *~

trunk/packages/vizservers/nanovis/Command.cpp

@@ -2633 +2633 @@
 
     if (status != TCL_OK) {
-        std::ostringstream errmsg;
-        errmsg << "NanoVis Server Error: " << Tcl_GetStringResult(interp) << std::endl;
-        write(0, errmsg.str().c_str(), errmsg.str().size());
+        const char *string;
+        int nBytes;
+        string = Tcl_GetStringFromObj(Tcl_GetObjResult(_interp), &nBytes);
+
+        struct iovec iov[3];
+        iov[0].iov_base = "NanoVis Server Error: ";
+        iov[0].iov_len = strlen(iov[0].iov_base);
+        iov[1].iov_base = string;
+        iov[1].iov_len = nBytes;
+        iov[2].iov_base = '\n';
+        iov[2].iov_len = 1;
+        writev(0, iov, 3);
         return;
     }

trunk/packages/vizservers/pymolproxy/Makefile.in

@@ -21 +21 @@
 RP_DIR          = @RP_DIR@
 INSTALL         = @INSTALL@
-INSTALL_PROGRAM = ${INSTALL} -m 755
-INSTALL_DATA    = ${INSTALL} -m 644
-INSTALL_SCRIPT  = ${INSTALL} -m 644
 VPATH           = $(srcdir)
 
@@ -40 +37 @@
 
 install: pymolproxy
-        $(INSTALL_PROGRAM) pymolproxy $(bindir)/pymolproxy
-        $(INSTALL_PROGRAM) $(srcdir)/pymol $(bindir)/pymol
-        @if test "$(RP_DIR)/lib" != "$(libdir)" ; then \
-          cp -rL $(RP_DIR)/lib/pymol $(libdir)/pymol; \
-        fi
+        $(INSTALL) -d $(bindir)
+        $(INSTALL) -m 555 pymolproxy $(bindir)/pymolproxy
+        $(INSTALL) -m 555 $(srcdir)/pymol $(bindir)/pymol
 
 clean:
-        rm -rf a.out *.o *~ core* $(TARGETS) *.log *.tmp logfile* .deps/*.d
+        $(RM) a.out *.o *~ core* $(TARGETS) *.log *.tmp logfile* .deps/*.d
 
 distclean: clean
-        rm Makefile
+        $(RM) Makefile

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -825 +825 @@
 
 static int
+LoadPDBStrCmd(ClientData cdata, Tcl_Interp *interp, int argc, 
+              const char *argv[])
+{
+    const char *pdbdata, *pdb, *name;
+    char *buf;
+    char buffer[800];
+    struct pymol_proxy *pymol = (struct pymol_proxy *) cdata;
+    int state = 1;
+    int tmpf;
+    int arg, defer = 0, push = 0, varg = 1;
+    char filename[] = "/tmp/fileXXXXXX.pdb";
+    
+    if (pymol == NULL)
+        return(TCL_ERROR);
+    
+    clear_error(pymol);
+    
+    for(arg = 1; arg < argc; arg++) {
+        if ( strcmp(argv[arg],"-defer") == 0 )
+            defer = 1;
+        else if (strcmp(argv[arg],"-push") == 0)
+            push = 1;
+        else if (varg == 1) {
+            pdbdata = argv[arg];
+            varg++;
+        }
+        else if (varg == 2) {
+            name = argv[arg];
+            varg++;
+        }
+        else if (varg == 3) {
+            state = atoi( argv[arg] );
+            varg++;
+        }
+    }
+    
+    pymol->need_update = !defer || push;
+    pymol->immediate_update |= push;
+    
+    tmpf = open(filename,O_RDWR|O_TRUNC|O_CREAT,0700);
+    
+    if (tmpf <= 0) 
+        fprintf(stderr,"pymolproxy: error opening file %d\n",errno);
+    
+    write(tmpf,pdbdata,strlen(pdbdata));
+    close(tmpf);
+    
+    sendf(pymol, "load %s, %s, %d\n", filename, name, state);
+    sendf(pymol, "zoom buffer=2\n");
+    
+    return(pymol->status);
+}
+
+static int
 LoadPDBCmd(ClientData cdata, Tcl_Interp *interp, int argc, const char *argv[])
 {
@@ -892 +946 @@
     return pymol->status;
 }
+
 
 static int