Changeset 1948
- Timestamp:
- Nov 15, 2010, 12:52:59 PM (14 years ago)
- Location:
- branches/blt4
- Files:
-
- 2 added
- 103 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/blt4/Makefile.in
r1744 r1948 69 69 distrib: 70 70 $(RM) -r exported 71 $(MKDIR_P) exported71 $(MKDIR_P) -m 0755 exported 72 72 (cd exported; svn export -q $(rappture_repo) rappture) 73 73 tar -C exported -czlf $(rappture_source_tarfile) rappture … … 76 76 runtime-distrib: 77 77 $(RM) -r exported 78 $(MKDIR_P) exported78 $(MKDIR_P) -m 0755 exported 79 79 (cd exported; svn export -q $(runtime_repo) runtime) 80 80 tar -C exported -czlf $(runtime_source_tarfile) runtime -
branches/blt4/examples/3D/Makefile.in
r1082 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/Makefile.in
r1466 r1948 40 40 41 41 install: 42 $(MKDIR_P) $(destdir)42 $(MKDIR_P) -m 0755 $(destdir) 43 43 for i in $(FILES) ; do \ 44 $(INSTALL) -m 555 $$i $(destdir) ; \44 $(INSTALL) -m 0555 $$i $(destdir) ; \ 45 45 done 46 46 for i in $(SUBDIRS) ; do \ -
branches/blt4/examples/app-fermi/2.0/Makefile.in
r1082 r1948 23 23 24 24 install: 25 $(MKDIR_P) $(destdir)25 $(MKDIR_P) -m 0755 $(destdir) 26 26 for i in $(FILES) ; do \ 27 $(INSTALL) -m 444 $$i $(destdir) ; \27 $(INSTALL) -m 0444 $$i $(destdir) ; \ 28 28 done 29 29 -
branches/blt4/examples/app-fermi/cee/Makefile.in
r1082 r1948 37 37 38 38 install: fermi 39 $(MKDIR_P) $(destdir)39 $(MKDIR_P) -m 0755 $(destdir) 40 40 for i in $(FILES) ; do \ 41 $(INSTALL) -m 444 $$i $(destdir) ; \41 $(INSTALL) -m 0444 $$i $(destdir) ; \ 42 42 done 43 $(INSTALL) -m 555 fermi $(destdir)43 $(INSTALL) -m 0555 fermi $(destdir) 44 44 45 45 clean: -
branches/blt4/examples/app-fermi/fortran/Makefile.in
r1082 r1948 36 36 37 37 install: fermi 38 $(MKDIR_P) $(destdir)38 $(MKDIR_P) -m 0755 $(destdir) 39 39 for i in $(FILES) ; do \ 40 $(INSTALL) -m 444 $$i $(destdir) ; \40 $(INSTALL) -m 0444 $$i $(destdir) ; \ 41 41 done 42 $(INSTALL) -m 555 fermi $(destdir)42 $(INSTALL) -m 0555 fermi $(destdir) 43 43 44 44 -
branches/blt4/examples/app-fermi/java/Makefile.in
r1744 r1948 30 30 31 31 install: all 32 $(MKDIR_P) $(destdir)32 $(MKDIR_P) -m 0755 $(destdir) 33 33 for i in $(FILES) ; do \ 34 $(INSTALL) -m 444 $$i $(destdir) ; \34 $(INSTALL) -m 0444 $$i $(destdir) ; \ 35 35 done 36 36 -
branches/blt4/examples/app-fermi/matlab/compiled/Makefile.in
r1222 r1948 35 35 install: ${APPNAME} 36 36 sed s/YOURAPPNAME/$^/ < $(srcdir)/run_app.patch | patch run_$^.sh 37 $(MKDIR_P) $(destdir)37 $(MKDIR_P) -m 0755 $(destdir) 38 38 for i in $(FILES) ; do \ 39 $(INSTALL) -m 444 $$i $(destdir) ; \39 $(INSTALL) -m 0444 $$i $(destdir) ; \ 40 40 done 41 $(INSTALL) -m 444 readme.txt $(destdir)/$^.readme42 $(INSTALL) -m 555 run_$^.sh $^ $(destdir)41 $(INSTALL) -m 0444 readme.txt $(destdir)/$^.readme 42 $(INSTALL) -m 0555 run_$^.sh $^ $(destdir) 43 43 $(bindir)/simsim --tool $(srcdir)/tool.xml --values default --nosim --driver driver.$^ 44 44 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:$(libdir) $(destdir)/run_$^.sh /apps/matlab/mcr driver.$^ -
branches/blt4/examples/app-fermi/matlab/uncompiled/Makefile.in
r1222 r1948 22 22 23 23 install: 24 $(MKDIR_P) $(destdir)24 $(MKDIR_P) -m 0755 $(destdir) 25 25 for i in $(FILES) ; do \ 26 $(INSTALL) -m 444 $$i $(destdir) ; \26 $(INSTALL) -m 0444 $$i $(destdir) ; \ 27 27 done 28 28 -
branches/blt4/examples/app-fermi/octave/2/Makefile.in
r1581 r1948 22 22 23 23 install: 24 $(MKDIR_P) $(destdir)24 $(MKDIR_P) -m 0755 $(destdir) 25 25 for i in $(FILES) ; do \ 26 $(INSTALL) -m 444 $$i $(destdir) ; \26 $(INSTALL) -m 0444 $$i $(destdir) ; \ 27 27 done 28 28 -
branches/blt4/examples/app-fermi/octave/3/Makefile.in
r1581 r1948 22 22 23 23 install: 24 $(MKDIR_P) $(destdir)24 $(MKDIR_P) -m 0755 $(destdir) 25 25 for i in $(FILES) ; do \ 26 $(INSTALL) -m 444 $$i $(destdir) ; \26 $(INSTALL) -m 0444 $$i $(destdir) ; \ 27 27 done 28 28 -
branches/blt4/examples/app-fermi/octave/Makefile.in
r1581 r1948 13 13 14 14 INSTALL = @INSTALL@ 15 MKDIR_P = @MKDIR_P@16 15 17 16 all: all_2 all_3 -
branches/blt4/examples/app-fermi/perl/Makefile.in
r1082 r1948 22 22 23 23 install: 24 $(MKDIR_P) $(destdir)24 $(MKDIR_P) -m 0755 $(destdir) 25 25 for i in $(FILES) ; do \ 26 $(INSTALL) -m 444 $$i $(destdir) ; \26 $(INSTALL) -m 0444 $$i $(destdir) ; \ 27 27 done 28 28 clean: -
branches/blt4/examples/app-fermi/python/Makefile.in
r1082 r1948 22 22 23 23 install: 24 $(MKDIR_P) $(destdir)24 $(MKDIR_P) -m 0755 $(destdir) 25 25 for i in $(FILES) ; do \ 26 $(INSTALL) -m 444 $$i $(destdir) ; \26 $(INSTALL) -m 0444 $$i $(destdir) ; \ 27 27 done 28 28 -
branches/blt4/examples/app-fermi/ruby/Makefile.in
r1082 r1948 22 22 23 23 install: 24 $(MKDIR_P) $(destdir)24 $(MKDIR_P) -m 0755 $(destdir) 25 25 for i in $(FILES) ; do \ 26 $(INSTALL) -m 444 $$i $(destdir) ; \26 $(INSTALL) -m 0444 $$i $(destdir) ; \ 27 27 done 28 28 -
branches/blt4/examples/app-fermi/tcl/Makefile.in
r1082 r1948 21 21 all: 22 22 install: 23 $(MKDIR_P) $(destdir)23 $(MKDIR_P) -m 0755 $(destdir) 24 24 for i in $(FILES) ; do \ 25 $(INSTALL) -m 444 $$i $(destdir) ; \25 $(INSTALL) -m 0444 $$i $(destdir) ; \ 26 26 done 27 27 -
branches/blt4/examples/app-fermi/wrapper/cee/Makefile.in
r1082 r1948 38 38 39 39 install: fermi 40 $(MKDIR_P) $(destdir)40 $(MKDIR_P) -m 0755 $(destdir) 41 41 for i in $(FILES) ; do \ 42 $(INSTALL) -m 444 $$i $(destdir) ; \42 $(INSTALL) -m 0444 $$i $(destdir) ; \ 43 43 done 44 $(INSTALL) -m 555 fermi $(destdir)44 $(INSTALL) -m 0555 fermi $(destdir) 45 45 46 46 clean: -
branches/blt4/examples/app-fermi/wrapper/perl/Makefile.in
r1897 r1948 22 22 23 23 install: 24 $(MKDIR_P) $(destdir)24 $(MKDIR_P) -m 0755 $(destdir) 25 25 for i in $(FILES) ; do \ 26 $(INSTALL) -m 444 $$i $(destdir) ; \26 $(INSTALL) -m 0444 $$i $(destdir) ; \ 27 27 done 28 28 -
branches/blt4/examples/app-fermi/wrapper/python/Makefile.in
r1082 r1948 22 22 23 23 install: 24 $(MKDIR_P) $(destdir)24 $(MKDIR_P) -m 0755 $(destdir) 25 25 for i in $(FILES) ; do \ 26 $(INSTALL) -m 444 $$i $(destdir) ; \26 $(INSTALL) -m 0444 $$i $(destdir) ; \ 27 27 done 28 28 -
branches/blt4/examples/app-fermi/wrapper/tcl/Makefile.in
r1082 r1948 22 22 23 23 install: 24 $(MKDIR_P) $(destdir)24 $(MKDIR_P) -m 0755 $(destdir) 25 25 for i in $(FILES) ; do \ 26 $(INSTALL) -m 444 $$i $(destdir) ; \26 $(INSTALL) -m 0444 $$i $(destdir) ; \ 27 27 done 28 28 -
branches/blt4/examples/c-example/Makefile.in
r1082 r1948 60 60 61 61 install: 62 $(MKDIR_P) $(destdir)62 $(MKDIR_P) -m 0755 $(destdir) 63 63 for i in $(FILES) ; do \ 64 $(INSTALL) -m 444 $$i $(destdir) ; \64 $(INSTALL) -m 0444 $$i $(destdir) ; \ 65 65 done 66 66 for i in $(PROGS) ; do \ 67 $(INSTALL) -m 555 $$i $(destdir) ; \67 $(INSTALL) -m 0555 $$i $(destdir) ; \ 68 68 done 69 69 -
branches/blt4/examples/canvas/Makefile.in
r1082 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/flow/Makefile.in
r1466 r1948 32 32 33 33 install: 34 $(MKDIR_P) $(destdir)34 $(MKDIR_P) -m 0755 $(destdir) 35 35 for i in $(FILES) ; do \ 36 $(INSTALL) -m 444 $$i $(destdir) ; \36 $(INSTALL) -m 0444 $$i $(destdir) ; \ 37 37 done 38 38 for i in $(examples) ; do \ -
branches/blt4/examples/flow/demo1/Makefile.in
r1466 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/flow/demo2/Makefile.in
r1466 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/flow/demo3/Makefile.in
r1466 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/graph/Makefile.in
r1082 r1948 24 24 25 25 install: 26 $(MKDIR_P) $(destdir)26 $(MKDIR_P) -m 0755 $(destdir) 27 27 for i in $(FILES) ; do \ 28 $(INSTALL) -m 444 $$i $(destdir) ; \28 $(INSTALL) -m 0444 $$i $(destdir) ; \ 29 29 done 30 30 -
branches/blt4/examples/lang/tcl/loadercopy/Makefile.in
r1226 r1948 26 26 27 27 install: 28 $(MKDIR_P) $(destdir)28 $(MKDIR_P) -m 0755 $(destdir) 29 29 for i in $(FILES) ; do \ 30 $(INSTALL) -m 444 $$i $(destdir) ; \30 $(INSTALL) -m 0444 $$i $(destdir) ; \ 31 31 done 32 32 $(MAKE) -C examples install -
branches/blt4/examples/lang/tcl/loadercopy/docs/Makefile.in
r1226 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/lang/tcl/loadercopy/examples/Makefile.in
r1226 r1948 24 24 25 25 install: 26 $(MKDIR_P) $(destdir)26 $(MKDIR_P) -m 0755 $(destdir) 27 27 for i in $(FILES) ; do \ 28 $(INSTALL) -m 444 $$i $(destdir) ; \28 $(INSTALL) -m 0444 $$i $(destdir) ; \ 29 29 done 30 30 -
branches/blt4/examples/objects/axis/Makefile.in
r1528 r1948 48 48 49 49 install: 50 $(MKDIR_P) $(destdir)50 $(MKDIR_P) -m 0755 $(destdir) 51 51 for i in $(FILES) ; do \ 52 $(INSTALL) -m 444 $$i $(destdir) ; \52 $(INSTALL) -m 0444 $$i $(destdir) ; \ 53 53 done 54 54 for i in $(PROGS) ; do \ 55 $(INSTALL) -m 555 $$i $(destdir) ; \55 $(INSTALL) -m 0555 $$i $(destdir) ; \ 56 56 done 57 57 -
branches/blt4/examples/objects/contour/Makefile.in
r1528 r1948 48 48 49 49 install: 50 $(MKDIR_P) $(destdir)50 $(MKDIR_P) -m 0755 $(destdir) 51 51 for i in $(FILES) ; do \ 52 $(INSTALL) -m 444 $$i $(destdir) ; \52 $(INSTALL) -m 0444 $$i $(destdir) ; \ 53 53 done 54 54 for i in $(PROGS) ; do \ 55 $(INSTALL) -m 555 $$i $(destdir) ; \55 $(INSTALL) -m 0555 $$i $(destdir) ; \ 56 56 done 57 57 -
branches/blt4/examples/objects/curve/Makefile.in
r1386 r1948 48 48 49 49 install: 50 $(MKDIR_P) $(destdir)50 $(MKDIR_P) -m 0755 $(destdir) 51 51 for i in $(FILES) ; do \ 52 $(INSTALL) -m 444 $$i $(destdir) ; \52 $(INSTALL) -m 0444 $$i $(destdir) ; \ 53 53 done 54 54 for i in $(PROGS) ; do \ 55 $(INSTALL) -m 555 $$i $(destdir) ; \55 $(INSTALL) -m 0555 $$i $(destdir) ; \ 56 56 done 57 57 -
branches/blt4/examples/objects/dxWriter/Makefile.in
r1100 r1948 44 44 45 45 install: 46 $(MKDIR_P) $(destdir)46 $(MKDIR_P) -m 0755 $(destdir) 47 47 for i in $(FILES) ; do \ 48 $(INSTALL) -m 444 $$i $(destdir) ; \48 $(INSTALL) -m 0444 $$i $(destdir) ; \ 49 49 done 50 50 for i in $(PROGS) ; do \ 51 $(INSTALL) -m 555 $$i $(destdir) ; \51 $(INSTALL) -m 0555 $$i $(destdir) ; \ 52 52 done 53 53 -
branches/blt4/examples/objects/floatBuffer/Makefile.in
r1826 r1948 44 44 45 45 install: 46 $(MKDIR_P) $(destdir)46 $(MKDIR_P) -m 0755 $(destdir) 47 47 for i in $(FILES) ; do \ 48 $(INSTALL) -m 444 $$i $(destdir) ; \48 $(INSTALL) -m 0444 $$i $(destdir) ; \ 49 49 done 50 50 for i in $(PROGS) ; do \ 51 $(INSTALL) -m 555 $$i $(destdir) ; \51 $(INSTALL) -m 0555 $$i $(destdir) ; \ 52 52 done 53 53 -
branches/blt4/examples/objects/histogram/Makefile.in
r1528 r1948 48 48 49 49 install: 50 $(MKDIR_P) $(destdir)50 $(MKDIR_P) -m 0755 $(destdir) 51 51 for i in $(FILES) ; do \ 52 $(INSTALL) -m 444 $$i $(destdir) ; \52 $(INSTALL) -m 0444 $$i $(destdir) ; \ 53 53 done 54 54 for i in $(PROGS) ; do \ 55 $(INSTALL) -m 555 $$i $(destdir) ; \55 $(INSTALL) -m 0555 $$i $(destdir) ; \ 56 56 done 57 57 -
branches/blt4/examples/objects/library/Makefile.in
r1566 r1948 54 54 55 55 install: 56 $(MKDIR_P) $(destdir)56 $(MKDIR_P) -m 0755 $(destdir) 57 57 for i in $(FILES) ; do \ 58 $(INSTALL) -m 444 $$i $(destdir) ; \58 $(INSTALL) -m 0444 $$i $(destdir) ; \ 59 59 done 60 60 for i in $(PROGS) ; do \ 61 $(INSTALL) -m 555 $$i $(destdir) ; \61 $(INSTALL) -m 0555 $$i $(destdir) ; \ 62 62 done 63 63 -
branches/blt4/examples/objects/number/Makefile.in
r1581 r1948 48 48 49 49 install: 50 $(MKDIR_P) $(destdir)50 $(MKDIR_P) -m 0755 $(destdir) 51 51 for i in $(FILES) ; do \ 52 $(INSTALL) -m 444 $$i $(destdir) ; \52 $(INSTALL) -m 0444 $$i $(destdir) ; \ 53 53 done 54 54 for i in $(PROGS) ; do \ 55 $(INSTALL) -m 555 $$i $(destdir) ; \55 $(INSTALL) -m 0555 $$i $(destdir) ; \ 56 56 done 57 57 -
branches/blt4/examples/objects/path/Makefile.in
r1528 r1948 48 48 49 49 install: 50 $(MKDIR_P) $(destdir)50 $(MKDIR_P) -m 0755 $(destdir) 51 51 for i in $(FILES) ; do \ 52 $(INSTALL) -m 444 $$i $(destdir) ; \52 $(INSTALL) -m 0444 $$i $(destdir) ; \ 53 53 done 54 54 for i in $(PROGS) ; do \ 55 $(INSTALL) -m 555 $$i $(destdir) ; \55 $(INSTALL) -m 0555 $$i $(destdir) ; \ 56 56 done 57 57 -
branches/blt4/examples/objects/plot/Makefile.in
r1386 r1948 48 48 49 49 install: 50 $(MKDIR_P) $(destdir)50 $(MKDIR_P) -m 0755 $(destdir) 51 51 for i in $(FILES) ; do \ 52 $(INSTALL) -m 444 $$i $(destdir) ; \52 $(INSTALL) -m 0444 $$i $(destdir) ; \ 53 53 done 54 54 for i in $(PROGS) ; do \ 55 $(INSTALL) -m 555 $$i $(destdir) ; \55 $(INSTALL) -m 0555 $$i $(destdir) ; \ 56 56 done 57 57 -
branches/blt4/examples/objects/scatter/Makefile.in
r1528 r1948 48 48 49 49 install: 50 $(MKDIR_P) $(destdir)50 $(MKDIR_P) -m 0755 $(destdir) 51 51 for i in $(FILES) ; do \ 52 $(INSTALL) -m 444 $$i $(destdir) ; \52 $(INSTALL) -m 0444 $$i $(destdir) ; \ 53 53 done 54 54 for i in $(PROGS) ; do \ 55 $(INSTALL) -m 555 $$i $(destdir) ; \55 $(INSTALL) -m 0555 $$i $(destdir) ; \ 56 56 done 57 57 -
branches/blt4/examples/objects/string/Makefile.in
r1386 r1948 48 48 49 49 install: 50 $(MKDIR_P) $(destdir)50 $(MKDIR_P) -m 0755 $(destdir) 51 51 for i in $(FILES) ; do \ 52 $(INSTALL) -m 444 $$i $(destdir) ; \52 $(INSTALL) -m 0444 $$i $(destdir) ; \ 53 53 done 54 54 for i in $(PROGS) ; do \ 55 $(INSTALL) -m 555 $$i $(destdir) ; \55 $(INSTALL) -m 0555 $$i $(destdir) ; \ 56 56 done 57 57 -
branches/blt4/examples/objects/tree/Makefile.in
r1528 r1948 48 48 49 49 install: 50 $(MKDIR_P) $(destdir)50 $(MKDIR_P) -m 0755 $(destdir) 51 51 for i in $(FILES) ; do \ 52 $(INSTALL) -m 444 $$i $(destdir) ; \52 $(INSTALL) -m 0444 $$i $(destdir) ; \ 53 53 done 54 54 for i in $(PROGS) ; do \ 55 $(INSTALL) -m 555 $$i $(destdir) ; \55 $(INSTALL) -m 0555 $$i $(destdir) ; \ 56 56 done 57 57 -
branches/blt4/examples/objects/xmlparser/Makefile.in
r1581 r1948 55 55 56 56 install: 57 $(MKDIR_P) $(destdir)57 $(MKDIR_P) -m 0755 $(destdir) 58 58 for i in $(FILES) ; do \ 59 $(INSTALL) -m 444 $$i $(destdir) ; \59 $(INSTALL) -m 0444 $$i $(destdir) ; \ 60 60 done 61 61 for i in $(PROGS) ; do \ 62 $(INSTALL) -m 555 $$i $(destdir) ; \62 $(INSTALL) -m 0555 $$i $(destdir) ; \ 63 63 done 64 64 -
branches/blt4/examples/zoo/binary/Makefile.in
r1082 r1948 24 24 25 25 install: 26 $(MKDIR_P) $(destdir)26 $(MKDIR_P) -m 0755 $(destdir) 27 27 for i in $(FILES) ; do \ 28 $(INSTALL) -m 444 $$i $(destdir) ; \28 $(INSTALL) -m 0444 $$i $(destdir) ; \ 29 29 done 30 30 -
branches/blt4/examples/zoo/boolean/Makefile.in
r1082 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/zoo/choice/Makefile.in
r1082 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/zoo/cloud/Makefile.in
r1082 r1948 27 27 28 28 install: 29 $(MKDIR_P) $(destdir)29 $(MKDIR_P) -m 0755 $(destdir) 30 30 for i in $(FILES) ; do \ 31 $(INSTALL) -m 444 $$i $(destdir) ; \31 $(INSTALL) -m 0444 $$i $(destdir) ; \ 32 32 done 33 33 $(MAKE) -C matlab install -
branches/blt4/examples/zoo/cloud/matlab/Makefile.in
r1082 r1948 24 24 25 25 install: 26 $(MKDIR_P) $(destdir)26 $(MKDIR_P) -m 0755 $(destdir) 27 27 for i in $(FILES) ; do \ 28 $(INSTALL) -m 444 $$i $(destdir) ; \28 $(INSTALL) -m 0444 $$i $(destdir) ; \ 29 29 done 30 30 -
branches/blt4/examples/zoo/curve/Makefile.in
r1082 r1948 26 26 27 27 install: 28 $(MKDIR_P) $(destdir)28 $(MKDIR_P) -m 0755 $(destdir) 29 29 for i in $(FILES) ; do \ 30 $(INSTALL) -m 444 $$i $(destdir) ; \30 $(INSTALL) -m 0444 $$i $(destdir) ; \ 31 31 done 32 32 -
branches/blt4/examples/zoo/datatable/Makefile.in
r1938 r1948 26 26 install: 27 27 $(MAKE) -C matlab install 28 $(MKDIR_P) $(destdir)28 $(MKDIR_P) -m 0755 $(destdir) 29 29 for i in $(FILES) ; do \ 30 $(INSTALL) -m 444 $$i $(destdir) ; \30 $(INSTALL) -m 0444 $$i $(destdir) ; \ 31 31 done 32 32 -
branches/blt4/examples/zoo/datatable/matlab/Makefile.in
r1938 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/zoo/enable/Makefile.in
r1082 r1948 24 24 25 25 install: 26 $(MKDIR_P) $(destdir)26 $(MKDIR_P) -m 0755 $(destdir) 27 27 for i in $(FILES) ; do \ 28 $(INSTALL) -m 444 $$i $(destdir) ; \28 $(INSTALL) -m 0444 $$i $(destdir) ; \ 29 29 done 30 30 -
branches/blt4/examples/zoo/field/Makefile.in
r1082 r1948 26 26 27 27 install: 28 $(MKDIR_P) $(destdir)28 $(MKDIR_P) -m 0755 $(destdir) 29 29 for i in $(FILES) ; do \ 30 $(INSTALL) -m 444 $$i $(destdir) ; \30 $(INSTALL) -m 0444 $$i $(destdir) ; \ 31 31 done 32 32 -
branches/blt4/examples/zoo/filechoice/Makefile.in
r1695 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/zoo/group/Makefile.in
r1082 r1948 26 26 27 27 install: 28 $(MKDIR_P) $(destdir)28 $(MKDIR_P) -m 0755 $(destdir) 29 29 for i in $(FILES) ; do \ 30 $(INSTALL) -m 444 $$i $(destdir) ; \30 $(INSTALL) -m 0444 $$i $(destdir) ; \ 31 31 done 32 32 -
branches/blt4/examples/zoo/image/Makefile.in
r1082 r1948 28 28 29 29 install: 30 $(MKDIR_P) $(destdir)30 $(MKDIR_P) -m 0755 $(destdir) 31 31 for i in $(FILES) ; do \ 32 $(INSTALL) -m 444 $$i $(destdir) ; \32 $(INSTALL) -m 0444 $$i $(destdir) ; \ 33 33 done 34 34 $(MAKE) -C examples install -
branches/blt4/examples/zoo/image/docs/Makefile.in
r1082 r1948 24 24 25 25 install: 26 $(MKDIR_P) $(destdir)26 $(MKDIR_P) -m 0755 $(destdir) 27 27 for i in $(FILES) ; do \ 28 $(INSTALL) -m 444 $$i $(destdir) ; \28 $(INSTALL) -m 0444 $$i $(destdir) ; \ 29 29 done 30 30 -
branches/blt4/examples/zoo/image/examples/Makefile.in
r1082 r1948 24 24 25 25 install: 26 $(MKDIR_P) $(destdir)26 $(MKDIR_P) -m 0755 $(destdir) 27 27 for i in $(FILES) ; do \ 28 $(INSTALL) -m 444 $$i $(destdir) ; \28 $(INSTALL) -m 0444 $$i $(destdir) ; \ 29 29 done 30 30 -
branches/blt4/examples/zoo/integer/Makefile.in
r1082 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/zoo/integer2/Makefile.in
r1082 r1948 24 24 25 25 install: 26 $(MKDIR_P) $(destdir)26 $(MKDIR_P) -m 0755 $(destdir) 27 27 for i in $(FILES) ; do \ 28 $(INSTALL) -m 444 $$i $(destdir) ; \28 $(INSTALL) -m 0444 $$i $(destdir) ; \ 29 29 done 30 30 -
branches/blt4/examples/zoo/loader/Makefile.in
r1082 r1948 28 28 29 29 install: 30 $(MKDIR_P) $(destdir)30 $(MKDIR_P) -m 0755 $(destdir) 31 31 for i in $(FILES) ; do \ 32 $(INSTALL) -m 444 $$i $(destdir) ; \32 $(INSTALL) -m 0444 $$i $(destdir) ; \ 33 33 done 34 34 $(MAKE) -C examples install -
branches/blt4/examples/zoo/loader/examples/Makefile.in
r1082 r1948 26 26 27 27 install: 28 $(MKDIR_P) $(destdir)28 $(MKDIR_P) -m 0755 $(destdir) 29 29 for i in $(FILES) ; do \ 30 $(INSTALL) -m 444 $$i $(destdir) ; \30 $(INSTALL) -m 0444 $$i $(destdir) ; \ 31 31 done 32 32 -
branches/blt4/examples/zoo/loadrun/Makefile.in
r1217 r1948 27 27 28 28 install: 29 $(MKDIR_P) $(destdir)29 $(MKDIR_P) -m 0755 $(destdir) 30 30 for i in $(FILES) ; do \ 31 $(INSTALL) -m 444 $$i $(destdir) ; \31 $(INSTALL) -m 0444 $$i $(destdir) ; \ 32 32 done 33 33 -
branches/blt4/examples/zoo/log/Makefile.in
r1082 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/zoo/note/Makefile.in
r1082 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 $(MAKE) -C docs install -
branches/blt4/examples/zoo/note/docs/Makefile.in
r1082 r1948 24 24 25 25 install: 26 $(MKDIR_P) $(destdir)26 $(MKDIR_P) -m 0755 $(destdir) 27 27 for i in $(FILES) ; do \ 28 $(INSTALL) -m 444 $$i $(destdir) ; \28 $(INSTALL) -m 0444 $$i $(destdir) ; \ 29 29 done 30 30 -
branches/blt4/examples/zoo/number/Makefile.in
r1082 r1948 26 26 27 27 install: 28 $(MKDIR_P) $(destdir)28 $(MKDIR_P) -m 0755 $(destdir) 29 29 for i in $(FILES) ; do \ 30 $(INSTALL) -m 444 $$i $(destdir) ; \30 $(INSTALL) -m 0444 $$i $(destdir) ; \ 31 31 done 32 32 -
branches/blt4/examples/zoo/number2/Makefile.in
r1082 r1948 24 24 25 25 install: 26 $(MKDIR_P) $(destdir)26 $(MKDIR_P) -m 0755 $(destdir) 27 27 for i in $(FILES) ; do \ 28 $(INSTALL) -m 444 $$i $(destdir) ; \28 $(INSTALL) -m 0444 $$i $(destdir) ; \ 29 29 done 30 30 -
branches/blt4/examples/zoo/periodicelement/Makefile.in
r1628 r1948 24 24 25 25 install: 26 $(MKDIR_P) $(destdir)26 $(MKDIR_P) -m 0755 $(destdir) 27 27 for i in $(FILES) ; do \ 28 $(INSTALL) -m 444 $$i $(destdir) ; \28 $(INSTALL) -m 0444 $$i $(destdir) ; \ 29 29 done 30 30 -
branches/blt4/examples/zoo/phase/Makefile.in
r1082 r1948 27 27 28 28 install: 29 $(MKDIR_P) $(destdir)29 $(MKDIR_P) -m 0755 $(destdir) 30 30 for i in $(FILES) ; do \ 31 $(INSTALL) -m 444 $$i $(destdir) ; \31 $(INSTALL) -m 0444 $$i $(destdir) ; \ 32 32 done 33 33 -
branches/blt4/examples/zoo/sequence/Makefile.in
r1082 r1948 27 27 28 28 install: 29 $(MKDIR_P) $(destdir)29 $(MKDIR_P) -m 0755 $(destdir) 30 30 for i in $(FILES) ; do \ 31 $(INSTALL) -m 444 $$i $(destdir) ; \31 $(INSTALL) -m 0444 $$i $(destdir) ; \ 32 32 done 33 33 $(MAKE) -C examples install -
branches/blt4/examples/zoo/sequence/examples/Makefile.in
r1082 r1948 24 24 25 25 install: 26 $(MKDIR_P) $(destdir)26 $(MKDIR_P) -m 0755 $(destdir) 27 27 for i in $(FILES) ; do \ 28 $(INSTALL) -m 444 $$i $(destdir) ; \28 $(INSTALL) -m 0444 $$i $(destdir) ; \ 29 29 done 30 30 -
branches/blt4/examples/zoo/string/Makefile.in
r1082 r1948 26 26 27 27 install: 28 $(MKDIR_P) $(destdir)28 $(MKDIR_P) -m 0755 $(destdir) 29 29 for i in $(FILES) ; do \ 30 $(INSTALL) -m 444 $$i $(destdir) ; \30 $(INSTALL) -m 0444 $$i $(destdir) ; \ 31 31 done 32 32 -
branches/blt4/examples/zoo/structure/Makefile.in
r1082 r1948 31 31 32 32 install: 33 $(MKDIR_P) $(destdir)33 $(MKDIR_P) -m 0755 $(destdir) 34 34 for i in $(FILES) ; do \ 35 $(INSTALL) -m 444 $$i $(destdir) ; \35 $(INSTALL) -m 0444 $$i $(destdir) ; \ 36 36 done 37 37 $(MAKE) -C examples install -
branches/blt4/examples/zoo/structure/examples/Makefile.in
r1082 r1948 28 28 29 29 install: 30 $(MKDIR_P) $(destdir)30 $(MKDIR_P) -m 0755 $(destdir) 31 31 for i in $(FILES) ; do \ 32 $(INSTALL) -m 444 $$i $(destdir) ; \32 $(INSTALL) -m 0444 $$i $(destdir) ; \ 33 33 done 34 34 -
branches/blt4/examples/zoo/table/Makefile.in
r1082 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/examples/zoo/unirect2d/Makefile.in
r1259 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/gui/Makefile.in
r1082 r1948 38 38 39 39 install: install_scripts install_apps 40 $(MKDIR_P) $(destdir)40 $(MKDIR_P) -m 0755 $(destdir) 41 41 @for i in $(FILES); do \ 42 42 echo "Installing $$i" ; \ 43 $(INSTALL) -m 444 $$i $(destdir) ; \43 $(INSTALL) -m 0444 $$i $(destdir) ; \ 44 44 done 45 $(INSTALL) -m 444 pkgIndex.tcl $(destdir)45 $(INSTALL) -m 0444 pkgIndex.tcl $(destdir) 46 46 47 47 install_scripts: scripts -
branches/blt4/gui/apps/Makefile.in
r1897 r1948 43 43 44 44 install: 45 $(MKDIR_P) $(bindir)45 $(MKDIR_P) -m 0755 $(bindir) 46 46 @for i in $(SCRIPTS); do \ 47 47 echo "Installing $$i" ; \ 48 $(INSTALL) -m 555 $$i $(bindir) ; \48 $(INSTALL) -m 0555 $$i $(bindir) ; \ 49 49 done 50 50 -
branches/blt4/gui/scripts/Makefile.in
r1923 r1948 138 138 139 139 install_scripts: 140 $(MKDIR_P) $(destdir)140 $(MKDIR_P) -m 0755 $(destdir) 141 141 @for i in $(FILES); do \ 142 142 echo "Installing $$i" ; \ 143 $(INSTALL) -m 444 $$i $(destdir) ; \143 $(INSTALL) -m 0444 $$i $(destdir) ; \ 144 144 done 145 $(INSTALL) -m 444 tclIndex $(destdir)145 $(INSTALL) -m 0444 tclIndex $(destdir) 146 146 147 147 install_images: 148 $(MKDIR_P) $(destdir)/images148 $(MKDIR_P) -m 0755 $(destdir)/images 149 149 @for i in $(srcdir)/images/*.gif $(srcdir)/images/*.png $(srcdir)/images/*.xbm; do \ 150 150 echo "Installing $$i" ; \ 151 $(INSTALL) -m 444 $$i $(destdir)/images ; \151 $(INSTALL) -m 0444 $$i $(destdir)/images ; \ 152 152 done 153 153 -
branches/blt4/gui/scripts/molvisviewer.tcl
r1923 r1948 58 58 private variable _model 59 59 private variable _mlist 60 private variable _mrep resentation"ballnstick"60 private variable _mrep "ballnstick" 61 61 62 62 private variable _imagecache … … 83 83 private variable _height 84 84 private variable _restore 1; # Restore camera settings 85 private variable _cell 0; # Restore camera settings 85 86 86 87 constructor { hostlist args } { … … 95 96 Rappture::VisViewer::SetServerList "pymol" $namelist 96 97 } 97 private method Build ViewTab {}98 private method BuildSettingsTab {} 98 99 private method DoResize {} 99 100 private method EventuallyResize { w h } … … 119 120 public method ResetView {} 120 121 public method add {dataobj {options ""}} 121 public method cartoontrace {option {model "all"}}122 122 public method delete {args} 123 123 public method download {option args} … … 125 125 public method isconnected {} 126 126 public method labels {option {model "all"}} 127 public method opacity {option {models "all"} }128 127 public method parameters {title args} { 129 128 # do nothing 130 129 } 131 130 public method snap { w h } 132 public method spherescale {option {models "all"} } 133 public method stickradius {option {models "all"} } 134 public method projection {option} 135 public method representation {option {model "all"} } 136 public method rock {option} 131 private method Opacity {option {models "all"} } 132 private method SphereScale {option {models "all"} } 133 private method StickRadius {option {models "all"} } 134 private method OrthoProjection {option} 135 private method Representation {option {model "all"} } 136 private method CartoonTrace {option {model "all"}} 137 private method Cell {option} 138 private method Rock {option} 137 139 138 140 } … … 161 163 # Rocker 162 164 $_dispatcher register !rocker 163 $_dispatcher dispatch $this !rocker "[itcl::code $this rock step]; list"165 $_dispatcher dispatch $this !rocker "[itcl::code $this Rock step]; list" 164 166 # Mouse Event 165 167 $_dispatcher register !mevent … … 214 216 $this-rock no 215 217 $this-showlabels no 218 $this-showcell yes 216 219 $this-showlabels-initialized no 217 220 }] … … 279 282 -onimage [Rappture::icon molvis-rock-view] \ 280 283 -offimage [Rappture::icon molvis-rock-view] \ 281 -command [itcl::code $this rock toggle] \284 -command [itcl::code $this Rock toggle] \ 282 285 -variable [itcl::scope _settings($this-rock)] 283 286 } … … 294 297 295 298 bind $itk_component(ortho) <ButtonPress> \ 296 [itcl::code $this projection toggle]297 298 Build ViewTab299 [itcl::code $this OrthoProjection toggle] 300 301 BuildSettingsTab 299 302 300 303 # HACK ALERT. Initially force a requested width of the 3dview label. … … 400 403 } 401 404 402 itcl::body Rappture::MolvisViewer::Build ViewTab {} {405 itcl::body Rappture::MolvisViewer::BuildSettingsTab {} { 403 406 set fg [option get $itk_component(hull) font Font] 404 407 405 408 set tab [$itk_component(main) insert end \ 406 -title " ViewSettings" \409 -title "Settings" \ 407 410 -icon [Rappture::icon wrench]] 408 411 blt::scrollset $tab.ss \ … … 423 426 424 427 radiobutton $inner.bstick -text "balls and sticks" \ 425 -command [itcl::code $this representation ballnstick all] \428 -command [itcl::code $this Representation ballnstick all] \ 426 429 -variable Rappture::MolvisViewer::_settings($this-model) \ 427 430 -value ballnstick -font "Arial 9" -pady 0 … … 430 433 431 434 radiobutton $inner.spheres -text "spheres" \ 432 -command [itcl::code $this representation spheres all] \435 -command [itcl::code $this Representation spheres all] \ 433 436 -variable Rappture::MolvisViewer::_settings($this-model) \ 434 437 -value spheres -font "Arial 9" -pady 0 … … 437 440 438 441 radiobutton $inner.sticks -text "sticks" \ 439 -command [itcl::code $this representation sticks all] \442 -command [itcl::code $this Representation sticks all] \ 440 443 -variable Rappture::MolvisViewer::_settings($this-model) \ 441 444 -value sticks -font "Arial 9" -pady 0 … … 444 447 445 448 radiobutton $inner.lines -text "lines" \ 446 -command [itcl::code $this representation lines all] \449 -command [itcl::code $this Representation lines all] \ 447 450 -variable [itcl::scope _settings($this-model)] \ 448 451 -value lines -font "Arial 9" -pady 0 … … 451 454 452 455 radiobutton $inner.cartoon -text "cartoon" \ 453 -command [itcl::code $this representation cartoon all] \456 -command [itcl::code $this Representation cartoon all] \ 454 457 -variable [itcl::scope _settings($this-model)] \ 455 458 -value cartoon -font "Arial 9" -pady 0 … … 460 463 -from 0.1 -to 2.0 -resolution 0.05 -label "Sphere Scale" \ 461 464 -showvalue true -orient horizontal \ 462 -command [itcl::code $this spherescale] \465 -command [itcl::code $this SphereScale] \ 463 466 -variable Rappture::MolvisViewer::_settings($this-spherescale) 464 467 $inner.spherescale set $_settings($this-spherescale) … … 469 472 -from 0.1 -to 1.0 -resolution 0.025 -label "Stick Radius" \ 470 473 -showvalue true -orient horizontal \ 471 -command [itcl::code $this stickradius] \474 -command [itcl::code $this StickRadius] \ 472 475 -variable Rappture::MolvisViewer::_settings($this-stickradius) 473 476 Rappture::Tooltip::for $inner.stickradius \ … … 483 486 484 487 checkbutton $inner.rock -text "Rock model back and forth" \ 485 -command [itcl::code $this rock toggle] \488 -command [itcl::code $this Rock toggle] \ 486 489 -variable Rappture::MolvisViewer::_settings($this-rock) \ 487 490 -font "Arial 9 bold" … … 490 493 491 494 checkbutton $inner.ortho -text "Orthoscopic projection" \ 492 -command [itcl::code $this projection update] \495 -command [itcl::code $this OrthoProjection update] \ 493 496 -variable Rappture::MolvisViewer::_settings($this-ortho) \ 494 497 -font "Arial 9 bold" … … 497 500 498 501 checkbutton $inner.cartoontrace -text "Cartoon Trace" \ 499 -command [itcl::code $this cartoontrace update] \502 -command [itcl::code $this CartoonTrace update] \ 500 503 -variable [itcl::scope _settings($this-cartoontrace)] \ 501 504 -font "Arial 9 bold" 502 505 Rappture::Tooltip::for $inner.cartoontrace \ 503 506 "Set cartoon representation of bonds (sticks)." 507 508 checkbutton $inner.cell -text "Cell" \ 509 -command [itcl::code $this Cell toggle] \ 510 -font "Arial 9 bold" 511 $inner.cell select 504 512 505 513 label $inner.spacer … … 516 524 8,0 $inner.ortho -anchor w -columnspan 4 -pady {1 0} \ 517 525 9,0 $inner.cartoontrace -anchor w -columnspan 4 -pady {1 0} \ 518 10,1 $inner.spherescale -fill x -columnspan 4 -pady {1 0} \ 526 10,0 $inner.cell -anchor w -columnspan 4 -pady {1 0} \ 527 11,1 $inner.spherescale -fill x -columnspan 4 -pady {1 0} \ 519 528 11,1 $inner.stickradius -fill x -columnspan 4 -pady {1 0} \ 520 529 … … 525 534 blt::table configure $inner r13 -resize expand 526 535 } 527 528 536 529 537 # ---------------------------------------------------------------------- … … 721 729 #blt::bltdebug 100 722 730 set _buffering 1 731 set _cell 0 723 732 724 733 if { $_restore } { … … 797 806 set _dataobjs($model-$state) 1 798 807 } 799 800 808 # lammps dump file overwrites pdb file (change this?) 801 809 set lammpstypemap [$dataobj get components.molecule.lammpstypemap] … … 848 856 } 849 857 set _dataobjs($model-$state) 1 850 858 } 851 859 } 852 860 if { ![info exists _model($model-transparency)] } { 853 861 set _model($model-transparency) "" 854 862 } 855 if { ![info exists _model($model-rep resentation)] } {856 set _model($model-rep resentation) ""857 set _model($model-newrep resentation) $_mrepresentation863 if { ![info exists _model($model-rep)] } { 864 set _model($model-rep) "" 865 set _model($model-newrep) $_mrep 858 866 } 859 867 if { $_model($model-transparency) != $_dobj2transparency($dataobj) } { … … 865 873 set _active($model) $dataobj 866 874 } 867 } 868 875 set vectors [$dataobj get components.parallelpiped.vectors] 876 if { $vectors != "" } { 877 set rows [ComputeParellelPiped] 878 regsub -all {,} $vectors { } vectors 879 set rows {} 880 foreach { x y z } $vectors { 881 lappend rows " \[ $x, $y, $z \]" 882 } 883 set rows [join $rows ",\\\n"] 884 SendCmd "raw -defer {verts = \[$rows\]\n}" 885 SendCmd "raw -defer {run \$PYMOL_PATH/rappture/box.py\n}" 886 SendCmd "raw -defer {draw_box(verts)\n}" 887 set _cell 1 888 } 889 } 890 869 891 # enable/disable models as required (0=off->off, 1=on->off, 2=off->on, 870 892 # 3=on->on) … … 884 906 if { $_mlist($model) == 1 } { 885 907 if { [info exists _model($model-newtransparency)] || 886 [info exists _model($model-newrep resentation)] } {887 if { ![info exists _model($model-newrep resentation)] } {888 set _model($model-newrep resentation) $_model($model-representation)908 [info exists _model($model-newrep)] } { 909 if { ![info exists _model($model-newrep)] } { 910 set _model($model-newrep) $_model($model-rep) 889 911 } 890 912 if { ![info exists _model($model-newtransparency)] } { 891 913 set _model($model-newtransparency) $_model($model-transparency) 892 914 } 893 set rep $_model($model-newrep resentation)915 set rep $_model($model-newrep) 894 916 set transp $_model($model-newtransparency) 895 917 SendCmd "representation -defer -model $model $rep" … … 901 923 set changed 1 902 924 set _model($model-transparency) $_model($model-newtransparency) 903 set _model($model-rep resentation) $_model($model-newrepresentation)925 set _model($model-rep) $_model($model-newrep) 904 926 catch { 905 927 unset _model($model-newtransparency) 906 unset _model($model-newrep resentation)928 unset _model($model-newrep) 907 929 } 908 930 } … … 944 966 945 967 # Default settings for all models. 946 spherescale update947 stickradius update968 SphereScale update 969 StickRadius update 948 970 labels update 949 opacity update950 cartoontrace update951 952 projection update953 representation update971 Opacity update 972 CartoonTrace update 973 Cell update 974 OrthoProjection update 975 Representation update 954 976 SendCmd "raw -defer {zoom complete=1}" 955 977 set _restore 0 956 978 } 957 979 set tab [$itk_component(main) panel "Settings"] 980 set inner $tab.ss.frame 981 if { $_cell } { 982 $inner.cell configure -state normal 983 } else { 984 $inner.cell configure -state disabled 985 } 958 986 if { $flush } { 959 987 global readyForNextFrame … … 977 1005 itcl::body Rappture::MolvisViewer::Unmap { } { 978 1006 # Pause rocking loop while unmapped (saves CPU time) 979 rock pause1007 Rock pause 980 1008 981 1009 # Blank image, mark current image dirty … … 991 1019 if { [isconnected] } { 992 1020 # Resume rocking loop if it was on 993 rock unpause1021 Rock unpause 994 1022 # Rebuild image if modified, or redisplay cached image if not 995 1023 $_dispatcher event -idle !rebuild … … 1088 1116 1089 1117 # ---------------------------------------------------------------------- 1090 # USAGE: rock on|off|toggle1091 # USAGE: rock pause|unpause|step1118 # USAGE: Rock on|off|toggle 1119 # USAGE: Rock pause|unpause|step 1092 1120 # 1093 1121 # Used to control the "rocking" model for the molecule being displayed. … … 1095 1123 # internal control of the rocking motion. 1096 1124 # ---------------------------------------------------------------------- 1097 itcl::body Rappture::MolvisViewer:: rock { option } {1125 itcl::body Rappture::MolvisViewer::Rock { option } { 1098 1126 # cancel any pending rocks 1099 1127 if { [info exists _rocker(afterid)] } { … … 1119 1147 } 1120 1148 if { $_rocker(on) && $option != "pause" } { 1121 set _rocker(afterid) [after 200 [itcl::code $this rock step]]1149 set _rocker(afterid) [after 200 [itcl::code $this Rock step]] 1122 1150 } 1123 1151 } … … 1321 1349 1322 1350 # ---------------------------------------------------------------------- 1323 # USAGE: representation spheres|ballnstick|lines|sticks1351 # USAGE: Representation spheres|ballnstick|lines|sticks 1324 1352 # 1325 1353 # Used internally to change the molecular representation used to render 1326 1354 # our scene. 1327 1355 # ---------------------------------------------------------------------- 1328 itcl::body Rappture::MolvisViewer:: representation {option {model "all"} } {1329 if { $option == $_mrep resentation} {1356 itcl::body Rappture::MolvisViewer::Representation {option {model "all"} } { 1357 if { $option == $_mrep } { 1330 1358 return 1331 1359 } … … 1338 1366 set _settings($this-modelimg) [Rappture::icon $option] 1339 1367 } 1340 set tab [$itk_component(main) panel " ViewSettings"]1368 set tab [$itk_component(main) panel "Settings"] 1341 1369 set inner $tab.ss.frame 1342 1370 $inner.pict configure -image $_settings($this-modelimg) … … 1345 1373 # This method gets called without the user clicking on a radiobutton. 1346 1374 set _settings($this-model) $option 1347 set _mrep resentation$option1375 set _mrep $option 1348 1376 1349 1377 if { $model == "all" } { … … 1354 1382 1355 1383 foreach model $models { 1356 if { [info exists _model($model-rep resentation)] } {1357 if { $_model($model-rep resentation) != $option } {1358 set _model($model-newrep resentation) $option1384 if { [info exists _model($model-rep)] } { 1385 if { $_model($model-rep) != $option } { 1386 set _model($model-newrep) $option 1359 1387 } else { 1360 catch { unset _model($model-newrep resentation) }1388 catch { unset _model($model-newrep) } 1361 1389 } 1362 1390 } … … 1370 1398 1371 1399 # ---------------------------------------------------------------------- 1372 # USAGE: projection on|off|toggle1373 # USAGE: projection update1400 # USAGE: OrthoProjection on|off|toggle 1401 # USAGE: OrthoProjection update 1374 1402 # 1375 1403 # Used internally to turn labels associated with atoms on/off, and to 1376 1404 # update the positions of the labels so they sit on top of each atom. 1377 1405 # ---------------------------------------------------------------------- 1378 itcl::body Rappture::MolvisViewer:: projection {option} {1406 itcl::body Rappture::MolvisViewer::OrthoProjection {option} { 1379 1407 switch -- $option { 1380 1408 "orthoscopic" { … … 1410 1438 set _settings($this-ortho) 0 1411 1439 SendCmd "orthoscopic off" 1440 } 1441 } 1442 1443 # ---------------------------------------------------------------------- 1444 # USAGE: Cell on|off|toggle 1445 # 1446 # Used internally to turn labels associated with atoms on/off, and to 1447 # update the positions of the labels so they sit on top of each atom. 1448 # ---------------------------------------------------------------------- 1449 itcl::body Rappture::MolvisViewer::Cell {option} { 1450 switch -- $option { 1451 "on" - "off" { 1452 set cell $option 1453 } 1454 "toggle" { 1455 set cell [expr {$_settings($this-showcell) == 0}] 1456 } 1457 "update" { 1458 set cell $_settings($this-showcell) 1459 } 1460 default { 1461 error "bad option \"$option\": should be on, off, toggle, or update" 1462 } 1463 } 1464 if { $cell == $_settings($this-showcell) && $option != "update"} { 1465 # nothing to do 1466 return 1467 } 1468 if { $cell } { 1469 Rappture::Tooltip::for $itk_component(ortho) \ 1470 "Hide the cell." 1471 set _settings($this-showcell) 1 1472 SendCmd "raw {show everything,unitcell}" 1473 } else { 1474 Rappture::Tooltip::for $itk_component(ortho) \ 1475 "Show the cell." 1476 set _settings($this-showcell) 0 1477 SendCmd "raw {hide everything,unitcell}" 1412 1478 } 1413 1479 } … … 1695 1761 1696 1762 # ---------------------------------------------------------------------- 1697 # USAGE: spherescale radius ?model?1698 # spherescale update ?model?1763 # USAGE: SphereScale radius ?model? 1764 # SphereScale update ?model? 1699 1765 # 1700 1766 # Used internally to change the molecular atom scale used to render … … 1705 1771 # ---------------------------------------------------------------------- 1706 1772 1707 itcl::body Rappture::MolvisViewer:: spherescale { option {models "all"} } {1773 itcl::body Rappture::MolvisViewer::SphereScale { option {models "all"} } { 1708 1774 if { $option == "update" } { 1709 1775 set radius $_settings($this-spherescale) … … 1731 1797 1732 1798 # ---------------------------------------------------------------------- 1733 # USAGE: stickradius radius ?models?1734 # stickradius update ?models?1799 # USAGE: StickRadius radius ?models? 1800 # StickRadius update ?models? 1735 1801 # 1736 1802 # Used internally to change the stick radius used to render … … 1741 1807 # ---------------------------------------------------------------------- 1742 1808 1743 itcl::body Rappture::MolvisViewer:: stickradius { option {models "all"} } {1809 itcl::body Rappture::MolvisViewer::StickRadius { option {models "all"} } { 1744 1810 if { $option == "update" } { 1745 1811 set radius $_settings($this-stickradius) … … 1767 1833 1768 1834 # ---------------------------------------------------------------------- 1769 # USAGE: opacity value ?models?1770 # opacity update ?models?1835 # USAGE: Opacity value ?models? 1836 # Opacity update ?models? 1771 1837 # 1772 1838 # Used internally to change the opacity (transparency) used to render … … 1777 1843 # ---------------------------------------------------------------------- 1778 1844 1779 itcl::body Rappture::MolvisViewer:: opacity { option {models "all"} } {1845 itcl::body Rappture::MolvisViewer::Opacity { option {models "all"} } { 1780 1846 if { $option == "update" } { 1781 1847 set opacity $_settings($this-opacity) … … 1835 1901 1836 1902 # ---------------------------------------------------------------------- 1837 # USAGE: cartoontrace on|off|toggle1838 # USAGE: cartoontrace update1903 # USAGE: CartoonTrace on|off|toggle 1904 # USAGE: CartoonTrace update 1839 1905 # 1840 1906 # Used internally to turn labels associated with atoms on/off, and to 1841 1907 # update the positions of the labels so they sit on top of each atom. 1842 1908 # ---------------------------------------------------------------------- 1843 itcl::body Rappture::MolvisViewer:: cartoontrace {option {models "all"}} {1909 itcl::body Rappture::MolvisViewer::CartoonTrace {option {models "all"}} { 1844 1910 set trace $_settings($this-cartoontrace) 1845 1911 if { $option == "update" } { … … 1980 2046 return $img 1981 2047 } 2048 2049 itcl::body Rappture::MolvisViewer::ComputeParallelPiped { dataobj } { 2050 set scale [$dataobj get components.parallelpiped.scale] 2051 set n [llength $scale] 2052 if { $n == 1 } { 2053 set sx [lindex $scale 0] 2054 set sy [lindex $scale 0] 2055 set sz [lindex $scale 0] 2056 } else { $n == 2 } { 2057 set sx [lindex $scale 0] 2058 set sy [lindex $scale 1] 2059 set sz 1.0 2060 } else { $n == 3 } { 2061 set sx [lindex $scale 0] 2062 set sy [lindex $scale 1] 2063 set sz [lindex $scale 2] 2064 } 2065 set scale [$dataobj get components.parallelpiped.origin] 2066 set n [llength $origin] 2067 set x0 0.0 2068 set y0 0.0 2069 set z0 0.0 2070 if { $n == 1 } { 2071 set x0 [lindex $origin 0] 2072 } else { $n == 2 } { 2073 set x0 [lindex $scale 0] 2074 set y0 [lindex $scale 1] 2075 } else { $n == 3 } { 2076 set x0 [lindex $scale 0] 2077 set y0 [lindex $scale 1] 2078 set z0 [lindex $scale 2] 2079 } 2080 set vectors [$dataobj get components.parallelpiped.vectors] 2081 regexp -all {,} $vectors {} vectors 2082 regexp -all {;} $vectors {\n} vectors 2083 2084 # ----------------------------------------------------------------------------- 2085 # vscale -- 2086 # 2087 # Takes: List a and list b 2088 # Returns: A new list with the components of a scaled by the components of b 2089 # ----------------------------------------------------------------------------- 2090 2091 proc vscale {a b} { 2092 set nl [] 2093 lappend nl [expr [lindex $a 0]*[lindex $b 0]] 2094 lappend nl [expr [lindex $a 1]*[lindex $b 0]] 2095 lappend nl [expr [lindex $a 2]*[lindex $b 0]] 2096 return $nl 2097 } 2098 2099 set v1 [blt::vector create v1] 2100 $v1 length 3 2101 $v1 set [lindex $vectors 1] 2102 $v1 expr v1 * $ 2103 # Scale lattice vectors 2104 set vec1 [vscale $uc(lv1) $uc(alatt)] 2105 set vec2 [vscale $uc(lv2) $uc(alatt)] 2106 set vec3 [vscale $uc(lv3) $uc(alatt)] 2107 # Scale lattice vectors 2108 set vec1 [vscale $uc(lv1) $uc(alatt)] 2109 set vec2 [vscale $uc(lv2) $uc(alatt)] 2110 set vec3 [vscale $uc(lv3) $uc(alatt)] 2111 2112 # Build list of unit cell vertices 2113 set vlist [] 2114 lappend vlist [list 0.0 0.0 0.0] ;# O 2115 lappend vlist $vec1 ;# O+a 2116 lappend vlist $vec2 ;# O+b 2117 lappend vlist $vec3 ;# O+c 2118 lappend vlist [vsum [lindex $vlist 1] $vec2] ;# O+a+b 2119 lappend vlist [vsum [lindex $vlist 4] $vec3] ;# O+a+b+c 2120 lappend vlist [vsum [lindex $vlist 2] $vec3] ;# O+b+c 2121 lappend vlist [vsum [lindex $vlist 1] $vec3] ;# O+a+c 2122 } -
branches/blt4/instant/Makefile.in
r1745 r1948 90 90 91 91 install-scripts: tclIndex 92 $(MKDIR_P) $(destdir)93 $(INSTALL) -m 444 tclIndex $(destdir)94 $(MKDIR_P) $(bindir)92 $(MKDIR_P) -m 0755 $(destdir) 93 $(INSTALL) -m 0444 tclIndex $(destdir) 94 $(MKDIR_P) -m 0755 $(bindir) 95 95 @for i in $(SCRIPTS); do \ 96 96 echo "Installing $$i" ; \ 97 $(INSTALL) -m 555 $$i $(bindir) ; \97 $(INSTALL) -m 0555 $$i $(bindir) ; \ 98 98 done 99 99 100 100 install-files: $(FILES) 101 $(MKDIR_P) $(destdir)101 $(MKDIR_P) -m 0755 $(destdir) 102 102 @for i in $(FILES); do \ 103 103 echo "Installing $$i" ; \ 104 $(INSTALL) -m 555 $$i $(destdir) ; \104 $(INSTALL) -m 0555 $$i $(destdir) ; \ 105 105 done 106 106 107 107 install-images: $(IMAGEFILES) 108 $(MKDIR_P) $(destdir)/images108 $(MKDIR_P) -m 0755 $(destdir)/images 109 109 @for i in $(IMAGEFILES); do \ 110 110 echo "Installing $$i" ; \ 111 $(INSTALL) -m 555 $$i $(destdir)/images ; \111 $(INSTALL) -m 0555 $$i $(destdir)/images ; \ 112 112 done 113 113 114 114 install-objects: $(OBJECTFILES) 115 $(MKDIR_P) $(destdir)/objects115 $(MKDIR_P) -m 0755 $(destdir)/objects 116 116 @for i in $(OBJECTFILES); do \ 117 117 echo "Installing $$i" ; \ 118 $(INSTALL) -m 555 $$i $(destdir)/objects ; \118 $(INSTALL) -m 0555 $$i $(destdir)/objects ; \ 119 119 done 120 120 121 121 install-types: $(TYPEFILES) 122 $(MKDIR_P) $(destdir)/types122 $(MKDIR_P) -m 0755 $(destdir)/types 123 123 @for i in $(TYPEFILES); do \ 124 124 echo "Installing $$i" ; \ 125 $(INSTALL) -m 555 $$i $(destdir)/types ; \125 $(INSTALL) -m 0555 $$i $(destdir)/types ; \ 126 126 done 127 127 128 128 install-validations: $(VALIDATEFILES) 129 $(MKDIR_P) $(destdir)/validations129 $(MKDIR_P) -m 0755 $(destdir)/validations 130 130 @for i in $(VALIDATEFILES); do \ 131 131 echo "Installing $$i" ; \ 132 $(INSTALL) -m 555 $$i $(destdir)/validations ; \132 $(INSTALL) -m 0555 $$i $(destdir)/validations ; \ 133 133 done 134 134 -
branches/blt4/lang/java/Makefile.in
r1744 r1948 102 102 103 103 install-library: $(shared_lib) 104 $(MKDIR_P) $(libdir)105 $(INSTALL) -m 555 $(shared_lib) $(libdir)104 $(MKDIR_P) -m 0755 $(libdir) 105 $(INSTALL) -m 0555 $(shared_lib) $(libdir) 106 106 107 107 install-classfiles: -
branches/blt4/lang/java/rappture/Makefile.in
r1744 r1948 57 57 58 58 install: $(CLASSFILES) 59 $(MKDIR_P) $(packagedir)59 $(MKDIR_P) -m 0755 $(packagedir) 60 60 for i in $(CLASSFILES) ; do \ 61 $(INSTALL) -m 444 $$i $(packagedir) ; \61 $(INSTALL) -m 0444 $$i $(packagedir) ; \ 62 62 done 63 63 -
branches/blt4/lang/matlab/Makefile.in
r1228 r1948 80 80 81 81 install: $(OBJS) 82 $(MKDIR_P) $(destdir)82 $(MKDIR_P) -m 0755 $(destdir) 83 83 for i in $(OBJS) ; do \ 84 $(INSTALL) -m 444 $$i $(destdir) ; \84 $(INSTALL) -m 0444 $$i $(destdir) ; \ 85 85 done 86 86 -
branches/blt4/lang/octave/Makefile.in
r1888 r1948 11 11 12 12 INSTALL = @INSTALL@ 13 MKDIR_P = @MKDIR_P@14 13 RM = rm -f 15 14 OCTAVE2 = @OCTAVE2@ -
branches/blt4/lang/octave/octave2/Makefile.in
r1888 r1948 72 72 73 73 install: $(OBJS) 74 $(MKDIR_P) $(destdir)74 $(MKDIR_P) -m 0755 $(destdir) 75 75 for i in $(OBJS) ; do \ 76 $(INSTALL) -m 444 $$i $(destdir) ; \76 $(INSTALL) -m 0444 $$i $(destdir) ; \ 77 77 done 78 78 -
branches/blt4/lang/octave/octave3/Makefile.in
r1888 r1948 72 72 73 73 install: $(OBJS) 74 $(MKDIR_P) $(destdir)74 $(MKDIR_P) -m 0755 $(destdir) 75 75 for i in $(OBJS) ; do \ 76 $(INSTALL) -m 444 $$i $(destdir) ; \76 $(INSTALL) -m 0444 $$i $(destdir) ; \ 77 77 done 78 78 -
branches/blt4/lang/perl/Makefile.in
r1897 r1948 96 96 97 97 install: $(lib) $(bootstrap) $(man) $(pod) 98 $(MKDIR_P) $(destdir)99 $(INSTALL) -m 555 $(lib) $(destdir)100 $(INSTALL) -m 444 $(srcdir)/lib/Rappture.pm $(destdir)101 $(INSTALL) -m 444 $(bootstrap) $(destdir)102 $(INSTALL) -m 444 $(man) $(destdir)103 $(INSTALL) -m 444 $(pod) $(destdir)98 $(MKDIR_P) -m 0755 $(destdir) 99 $(INSTALL) -m 0555 $(lib) $(destdir) 100 $(INSTALL) -m 0444 $(srcdir)/lib/Rappture.pm $(destdir) 101 $(INSTALL) -m 0444 $(bootstrap) $(destdir) 102 $(INSTALL) -m 0444 $(man) $(destdir) 103 $(INSTALL) -m 0444 $(pod) $(destdir) 104 104 105 105 clean: … … 118 118 pkgtmp: 119 119 $(RM) -r $(pkg_build_dir) 120 $(MKDIR_P) $(pkg_build_dir)120 $(MKDIR_P) -m 0755 $(pkg_build_dir) 121 121 cp -p Makefile.PL $(pkg_build_dir)/Makefile.PL 122 122 tar -C $(srcdir) -clf - . | tar -C $(pkg_build_dir) -xpf - -
branches/blt4/lang/python/Makefile.in
r1614 r1948 37 37 38 38 build/tmp: 39 $(MKDIR_P) build/tmp39 $(MKDIR_P) -m 0755 build/tmp 40 40 $(LN_S) $(srcdir2)/Rappture/*.cc build/tmp 41 41 42 42 install: 43 $(MKDIR_P) $(pythonlib)43 $(MKDIR_P) -m 0755 $(pythonlib) 44 44 $(PYTHON) setup.py install --install-lib=$(pythonlib) 45 45 -
branches/blt4/lang/ruby/Makefile.in
r1100 r1948 71 71 $(LIB_SEARCH_DIRS) $(LIBS) 72 72 install: $(lib) 73 $(MKDIR_P) $(destdir)74 $(INSTALL) -m 555 $(lib) $(destdir)73 $(MKDIR_P) -m 0755 $(destdir) 74 $(INSTALL) -m 0555 $(lib) $(destdir) 75 75 76 76 clean: -
branches/blt4/lang/tcl/Makefile.in
r1614 r1948 50 50 51 51 install: 52 $(MKDIR_P) $(destdir)52 $(MKDIR_P) -m 0755 $(destdir) 53 53 $(INSTALL) -m 0444 pkgIndex.tcl $(destdir) 54 54 $(MAKE) -C src install -
branches/blt4/lang/tcl/scripts/Makefile.in
r1643 r1948 51 51 52 52 install: tclIndex 53 $(MKDIR_P) $(destdir)53 $(MKDIR_P) -m 0755 $(destdir) 54 54 for i in $(FILES); do \ 55 $(INSTALL) -m 444 $$i $(destdir) ; \55 $(INSTALL) -m 0444 $$i $(destdir) ; \ 56 56 done 57 57 $(INSTALL) -m 0444 tclIndex $(destdir) -
branches/blt4/lang/tcl/src/Makefile.in
r1932 r1948 90 90 91 91 install: $(lib) 92 $(MKDIR_P) $(destdir)93 $(INSTALL) -m 555 $(lib) $(destdir)92 $(MKDIR_P) -m 0755 $(destdir) 93 $(INSTALL) -m 0555 $(lib) $(destdir) 94 94 95 95 .cc.o: -
branches/blt4/lib/Makefile.in
r1082 r1948 25 25 26 26 install: 27 $(MKDIR_P) $(destdir)27 $(MKDIR_P) -m 0755 $(destdir) 28 28 for i in $(FILES) ; do \ 29 $(INSTALL) -m 444 $$i $(destdir) ; \29 $(INSTALL) -m 0444 $$i $(destdir) ; \ 30 30 done 31 31 -
branches/blt4/packages/vizservers/Makefile.in
r1358 r1948 30 30 31 31 install: 32 $(MKDIR_P) $(destdir)32 $(MKDIR_P) -m 0755 $(destdir) 33 33 for i in $(SUBDIRS) ; do \ 34 34 $(MAKE) -C $$i install || exit 1 ; \ 35 35 done 36 $(INSTALL) -m 555 start_viz.sh $(bindir)/start_viz.sh36 $(INSTALL) -m 0555 start_viz.sh $(bindir)/start_viz.sh 37 37 38 38 clean: -
branches/blt4/packages/vizservers/nanovis/Makefile.in
r1933 r1948 272 272 273 273 install-resources: 274 $(MKDIR_P) $(libdir)/resources274 $(MKDIR_P) -m 0755 $(libdir)/resources 275 275 @for i in $(resources) ; do \ 276 276 echo "installing $$i..." ; \ … … 279 279 280 280 install-shaders: 281 $(MKDIR_P) $(libdir)/shaders281 $(MKDIR_P) -m 0755 $(libdir)/shaders 282 282 @for i in $(shaders) ; do \ 283 283 echo "installing $$i..." ; \ -
branches/blt4/packages/vizservers/pymolproxy/Makefile.in
r1114 r1948 31 31 LIBS = $(TCL_LIB_SPEC) 32 32 33 SCRIPTS = $(srcdir)/scripts/box.py 34 33 35 all: $(TARGETS) 34 36 … … 39 41 $(CC) $(CC_SWITCHES) -o $@ -c $< 40 42 41 install: pymolproxy 42 $(MKDIR_P) $(bindir) 43 $(INSTALL) -m 555 pymolproxy $(bindir)/pymolproxy 44 $(INSTALL) -m 555 $(srcdir)/pymol $(bindir)/pymol 43 install: install-pymolproxy install-scripts 44 45 install-pymolproxy: pymolproxy 46 $(MKDIR_P) -m 0755 $(bindir) 47 $(INSTALL) -m 0555 pymolproxy $(bindir)/pymolproxy 48 $(INSTALL) -m 0555 $(srcdir)/pymol $(bindir)/pymol 49 50 install-scripts: 51 $(MKDIR_P) -m 0755 $(libdir)/pymol/rappture 52 for i in $(SCRIPTS) ; do \ 53 $(INSTALL) -m 0555 $$i $(libdir)/pymol/rappture; \ 54 done 45 55 46 56 clean: -
branches/blt4/packages/vizservers/pymolproxy/pymolproxy.c
r1840 r1948 96 96 97 97 static FILE *flog; 98 static int debug = FALSE;98 static int debug = TRUE; 99 99 static FILE *scriptFile; 100 100 static int savescript = FALSE; … … 149 149 * are in the front of the list. */ 150 150 151 int s erverInput, serverOutput, serverError;/* Server file descriptors. */152 int c lientInput, clientOutput;/* Client file descriptors. */151 int sin, sout, serr; /* Server file descriptors. */ 152 int cin, cout; /* Client file descriptors. */ 153 153 ReadBuffer client; /* Read buffer for client input. */ 154 154 ReadBuffer server; /* Read buffer for server output. */ … … 651 651 /* Write the command out to the server. */ 652 652 length = strlen(buffer); 653 nWritten = write(proxyPtr->s erverInput, buffer, length);653 nWritten = write(proxyPtr->sin, buffer, length); 654 654 if (nWritten != length) { 655 655 trace("short write to pymol (wrote=%d, should have been %d)", … … 1837 1837 1838 1838 static int 1839 ProxyInit(int c _in, int c_out, char *const *argv)1839 ProxyInit(int cin, int cout, char *const *argv) 1840 1840 { 1841 1841 int status, result = 0; 1842 int s erverIn[2];1843 int s erverOut[2];1844 int ser verErr[2];1842 int sin[2]; 1843 int sout[2]; 1844 int serr[2]; 1845 1845 Tcl_Interp *interp; 1846 1846 int child; … … 1851 1851 * each for the applications's: stdin, stdout, and stderr */ 1852 1852 1853 if (pipe(s erverIn) == -1)1853 if (pipe(sin) == -1) 1854 1854 return -1; 1855 1855 1856 if (pipe(s erverOut) == -1) {1857 close(s erverIn[0]);1858 close(s erverIn[1]);1856 if (pipe(sout) == -1) { 1857 close(sin[0]); 1858 close(sin[1]); 1859 1859 return -1; 1860 1860 } 1861 1861 1862 if (pipe(ser verErr) == -1) {1863 close(s erverIn[0]);1864 close(s erverIn[1]);1865 close(s erverOut[0]);1866 close(s erverOut[1]);1862 if (pipe(serr) == -1) { 1863 close(sin[0]); 1864 close(sin[1]); 1865 close(sout[0]); 1866 close(sout[1]); 1867 1867 return -1; 1868 1868 } … … 1889 1889 /* Redirect stdin, stdout, and stderr to pipes before execing */ 1890 1890 1891 dup2(s erverIn[0], 0); // stdin1892 dup2(s erverOut[1],1); // stdout1893 dup2(ser verErr[1],2); // stderr1891 dup2(sin[0], 0); // stdin 1892 dup2(sout[1],1); // stdout 1893 dup2(serr[1],2); // stderr 1894 1894 1895 1895 /* Close all other descriptors */ … … 1905 1905 1906 1906 /* close opposite end of pipe, these now belong to the child process */ 1907 close(s erverIn[0]);1908 close(s erverOut[1]);1909 close(ser verErr[1]);1907 close(sin[0]); 1908 close(sout[1]); 1909 close(serr[1]); 1910 1910 1911 1911 signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE (e.g. nanoscale terminates)*/ 1912 1912 1913 1913 memset(&proxy, 0, sizeof(PymolProxy)); 1914 proxy.s erverInput = serverIn[1];1915 proxy.s erverOutput = serverOut[0];1916 proxy.ser verError = serverErr[0];1917 proxy.c lientInput = c_in;1918 proxy.c lientOutput = c_out;1914 proxy.sin = sin[1]; 1915 proxy.sout = sout[0]; 1916 proxy.serr = serr[0]; 1917 proxy.cin = cin; 1918 proxy.cout = cout; 1919 1919 proxy.flags = CAN_UPDATE; 1920 1920 proxy.frame = 1; … … 1958 1958 PollForEvents(&proxy); 1959 1959 1960 close(proxy.c lientOutput);1961 close(proxy.s erverOutput);1962 close(proxy.ser verError);1963 close(proxy.c lientInput);1964 close(proxy.s erverInput);1960 close(proxy.cout); 1961 close(proxy.sout); 1962 close(proxy.serr); 1963 close(proxy.cin); 1964 close(proxy.sin); 1965 1965 1966 1966 status = waitpid(child, &result, WNOHANG); … … 2025 2025 int flags; 2026 2026 2027 flags = fcntl(proxyPtr->c lientInput, F_GETFL);2028 fcntl(proxyPtr->c lientInput, F_SETFL, flags|O_NONBLOCK);2029 2030 pollResults[0].fd = proxyPtr->c lientOutput;2031 pollResults[1].fd = proxyPtr->s erverOutput;2032 pollResults[2].fd = proxyPtr->ser verError;2027 flags = fcntl(proxyPtr->cin, F_GETFL); 2028 fcntl(proxyPtr->cin, F_SETFL, flags|O_NONBLOCK); 2029 2030 pollResults[0].fd = proxyPtr->cout; 2031 pollResults[1].fd = proxyPtr->sout; 2032 pollResults[2].fd = proxyPtr->serr; 2033 2033 pollResults[0].events = pollResults[1].events = 2034 2034 pollResults[2].events = POLLIN; 2035 2035 2036 pollResults[3].fd = proxyPtr->c lientInput;2036 pollResults[3].fd = proxyPtr->cin; 2037 2037 pollResults[3].events = POLLOUT; 2038 2038 2039 InitBuffer(&proxyPtr->client, proxyPtr->c lientOutput);2040 InitBuffer(&proxyPtr->server, proxyPtr->s erverOutput);2039 InitBuffer(&proxyPtr->client, proxyPtr->cout); 2040 InitBuffer(&proxyPtr->server, proxyPtr->sout); 2041 2041 2042 2042 Tcl_DStringInit(&clientCmds); … … 2180 2180 return; 2181 2181 } 2182 -
branches/blt4/src/Makefile.in
r1371 r1948 53 53 54 54 docs: 55 $(MKDIR_P) docs/doxygen55 $(MKDIR_P) -m 0755 docs/doxygen 56 56 doxygen 57 57 -
branches/blt4/src/core/Makefile.in
r1897 r1948 179 179 180 180 install_headers: 181 $(MKDIR_P) $(incdir)181 $(MKDIR_P) -m 0755 $(incdir) 182 182 for i in $(HEADERS) ; do \ 183 $(INSTALL) -m 444 $(srcdir)/$$i $(incdir) ; \183 $(INSTALL) -m 0444 $(srcdir)/$$i $(incdir) ; \ 184 184 done 185 185 for i in $(LOCAL_HEADERS) ; do \ 186 $(INSTALL) -m 444 $$i $(incdir) ; \186 $(INSTALL) -m 0444 $$i $(incdir) ; \ 187 187 done 188 188 -
branches/blt4/src/core2/Makefile.in
r1897 r1948 101 101 102 102 install_libs: $(lib) $(shared_lib) 103 $(MKDIR_P) $(libdir)104 $(INSTALL) -m 444 $(lib) $(libdir)105 $(INSTALL) -m 555 $(shared_lib) $(libdir)103 $(MKDIR_P) -m 0755 $(libdir) 104 $(INSTALL) -m 0444 $(lib) $(libdir) 105 $(INSTALL) -m 0555 $(shared_lib) $(libdir) 106 106 107 107 # This is no manual page for rappture yet. 108 108 install_man: 109 $(MKDIR_P) $(man3dir)110 $(INSTALL) -m 444 rappture.3 $(man3dir)109 $(MKDIR_P) -m 0755 $(man3dir) 110 $(INSTALL) -m 0444 rappture.3 $(man3dir) 111 111 112 112 install_headers: 113 $(MKDIR_P) $(includedir)/rappture2113 $(MKDIR_P) -m 0755 $(includedir)/rappture2 114 114 for i in $(HEADERS) ; do \ 115 $(INSTALL) -m 444 $(srcdir)/$$i $(includedir)/rappture2; \115 $(INSTALL) -m 0444 $(srcdir)/$$i $(includedir)/rappture2; \ 116 116 done 117 117 … … 142 142 143 143 docs: 144 $(MKDIR_P) ../../docs/rappture2144 $(MKDIR_P) -m 0755 ../../docs/rappture2 145 145 doxygen 146 146
Note: See TracChangeset
for help on using the changeset viewer.