This repository is a base of Eos.
Revisión | bf93d62da01de0bfbb15039b8edc3833efaadcba (tree) |
---|---|
Tiempo | 2014-10-27 16:05:23 |
Autor | Takuo Yasunaga <yasunaga@bio....> |
Commiter | Takuo Yasunaga |
Bug fixed:
modified: Makefile
modified: sbin/makegeneral
modified: src/Objects/DataManip/mrcImage/src/lmrcImageSpatialFrequencyFilter.c
typechange: src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile
@@ -62,8 +62,8 @@ install: install-src install-Objects install-Tools | ||
62 | 62 | |
63 | 63 | rebuild-src: |
64 | 64 | echo "rebuild-src" |
65 | - cd src; rm -f Objects/Makefile; cp -f Config/Template/ObjectsHomeTemplate.Dir/Makefile Objects/Makefile | |
66 | - cd src; rm -f Tools/Makefile; cp -f Config/Template/ToolsHomeTemplate.Dir/Makefile Tools/Makefile | |
65 | + cd src; rm -f Objects/Makefile; cp -f Config/Template/ObjectsHomeTemplate.Dir/Makefile Objects/Makefile; rm -f Objects/Config/Target.inc; cp -f Config/Template/ObjectsHomeTemplate.Dir/Config/Target.inc Objects/Config/Target.inc | |
66 | + cd src; rm -f Tools/Makefile; cp -f Config/Template/ToolsHomeTemplate.Dir/Makefile Tools/Makefile; rm -f Tools/Config/Target.inc ; cp -f Config/Template/ToolsHomeTemplate.Dir/Config/Target.inc Tools/Config/Target.inc | |
67 | 67 | |
68 | 68 | rebuild-Objects: |
69 | 69 | cd src/Objects; make clean; make check; make depend; make ; make install |
@@ -552,7 +552,8 @@ ObjectClassDirModifyFollowingAction() | ||
552 | 552 | fi |
553 | 553 | done |
554 | 554 | rm -f ${AnotherHome}/src/Config |
555 | - ln -s ${EOS_HOME}/src/Config ${AnotherHome}/src/Config | |
555 | + #ln -s ${EOS_HOME}/src/Config ${AnotherHome}/src/Config | |
556 | + cp -r ${EOS_HOME}/src/Config ${AnotherHome}/src/Config | |
556 | 557 | ObjectClassHome=${AnotherHome}/src/Objects |
557 | 558 | ;; |
558 | 559 | *) |
@@ -653,9 +654,11 @@ ObjectDirModifyFollowingAction() | ||
653 | 654 | |
654 | 655 | ### src |
655 | 656 | rm -f ./Makefile |
656 | - ln -s ${ObjectTemplate}/Makefile Makefile | |
657 | + #ln -s ${ObjectTemplate}/Makefile Makefile | |
658 | + cp ${ObjectTemplate}/Makefile Makefile | |
657 | 659 | rm -f ./src/Makefile |
658 | - ln -s ${ObjectTemplate}/src/Makefile ./src/Makefile | |
660 | + #ln -s ${ObjectTemplate}/src/Makefile ./src/Makefile | |
661 | + cp ${ObjectTemplate}/src/Makefile ./src/Makefile | |
659 | 662 | touch src/.Depend |
660 | 663 | touch src/.Source |
661 | 664 | touch src/.CHeader |
@@ -663,14 +666,16 @@ ObjectDirModifyFollowingAction() | ||
663 | 666 | |
664 | 667 | ### inc |
665 | 668 | rm -f inc/Makefile |
666 | - ln -s ${ObjectTemplate}/inc/Makefile inc/Makefile | |
669 | + #ln -s ${ObjectTemplate}/inc/Makefile inc/Makefile | |
670 | + cp ${ObjectTemplate}/inc/Makefile inc/Makefile | |
667 | 671 | |
668 | 672 | ### doc |
669 | 673 | if [ -h doc/Makefile ] |
670 | 674 | then |
671 | 675 | rm doc/Makefile |
672 | 676 | fi |
673 | - ln -s ${ObjectTemplate}/doc/Makefile doc/Makefile | |
677 | + cp ${ObjectTemplate}/doc/Makefile doc/Makefile | |
678 | + #ln -s ${ObjectTemplate}/doc/Makefile doc/Makefile | |
674 | 679 | touch doc/.header |
675 | 680 | touch doc/.footer |
676 | 681 | touch doc/.${ObjectName}.html |
@@ -726,7 +731,8 @@ ToolClassDirModifyFollowingAction() | ||
726 | 731 | else |
727 | 732 | rm -f ${AnotherHome}/src/Config |
728 | 733 | fi |
729 | - ln -s ${EOS_HOME}/src/Config ${AnotherHome}/src/Config | |
734 | + #ln -s ${EOS_HOME}/src/Config ${AnotherHome}/src/Config | |
735 | + cp -r ${EOS_HOME}/src/Config ${AnotherHome}/src/Config | |
730 | 736 | ToolClassHome=${AnotherHome}/src/Tools |
731 | 737 | ;; |
732 | 738 | *) |
@@ -814,7 +820,8 @@ ToolClassDirModifyFollowingAction() | ||
814 | 820 | fi |
815 | 821 | |
816 | 822 | rm -f ./Makefile |
817 | - ln -s ${ToolClassTemplate}/Makefile ./Makefile | |
823 | + #ln -s ${ToolClassTemplate}/Makefile ./Makefile | |
824 | + cp ${ToolClassTemplate}/Makefile ./Makefile | |
818 | 825 | if [ -f ./.Source ] |
819 | 826 | then |
820 | 827 | echo "Tools/Makefile : implemented." |
@@ -860,7 +867,8 @@ ToolDirModifyFollowingAction() | ||
860 | 867 | All|AllFollowingControlFile|Another|AnotherFollowingControlFile) |
861 | 868 | ### Set Makefile |
862 | 869 | rm -f ./Makefile |
863 | - ln -s ${ToolClassTemplate}/Makefile ./Makefile | |
870 | + #ln -s ${ToolClassTemplate}/Makefile ./Makefile | |
871 | + cp ${ToolClassTemplate}/Makefile ./Makefile | |
864 | 872 | if [ -f ./.Source ] |
865 | 873 | then |
866 | 874 | echo "${fullToolDir}/Makefile : implemented." |
@@ -919,15 +927,18 @@ ToolDirModifyFollowingAction() | ||
919 | 927 | fi |
920 | 928 | ### Set Makefile ### |
921 | 929 | rm -f Makefile |
922 | - ln -s ${ToolTemplate}/Makefile Makefile | |
930 | + cp ${ToolTemplate}/Makefile Makefile | |
931 | + #ln -s ${ToolTemplate}/Makefile Makefile | |
923 | 932 | |
924 | 933 | ### Set src/Makefile, src/.Depend, src/.Source, doc/Makefile ### |
925 | 934 | rm -f ./src/Makefile |
926 | - ln -s ${ToolTemplate}/src/Makefile ./src/Makefile | |
935 | + #ln -s ${ToolTemplate}/src/Makefile ./src/Makefile | |
936 | + cp ${ToolTemplate}/src/Makefile ./src/Makefile | |
927 | 937 | touch src/.Depend |
928 | 938 | touch src/.Source |
929 | 939 | rm -f doc/Makefile |
930 | - ln -s ${ToolTemplate}/doc/Makefile ./doc/Makefile | |
940 | + #ln -s ${ToolTemplate}/doc/Makefile ./doc/Makefile | |
941 | + cp ${ToolTemplate}/doc/Makefile ./doc/Makefile | |
931 | 942 | ;; |
932 | 943 | *) |
933 | 944 | echo "Not supported action in ToolDirModifyFollowingAction: ${Action}" |
@@ -76,6 +76,7 @@ lmrcImageSpatialFrequencyFilter(mrcImage* out, mrcImage* in, lmrcImageSpatialFre | ||
76 | 76 | } else { |
77 | 77 | if(R==RH) { |
78 | 78 | W = 0.0; |
79 | + flag=0; | |
79 | 80 | } else { |
80 | 81 | R++; |
81 | 82 | } |
@@ -83,6 +84,7 @@ lmrcImageSpatialFrequencyFilter(mrcImage* out, mrcImage* in, lmrcImageSpatialFre | ||
83 | 84 | } else { |
84 | 85 | if(R==RL) { |
85 | 86 | W = 0.0; |
87 | + flag=0; | |
86 | 88 | } else { |
87 | 89 | R--; |
88 | 90 | } |
@@ -1 +0,0 @@ | ||
1 | -/home/people/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/Makefile | |
\ No newline at end of file |
@@ -0,0 +1,104 @@ | ||
1 | +include ../../../Config/Define.inc | |
2 | +include ../../Config/Define.inc | |
3 | +include ../Config/Define.inc | |
4 | +include Config/Define.inc | |
5 | + | |
6 | +all: | |
7 | + cd src; make all; cd .. | |
8 | + | |
9 | +install: | |
10 | + cd src; make install; cd .. | |
11 | + | |
12 | + | |
13 | +putSF: | |
14 | + if [ -f private ] ; \ | |
15 | + then \ | |
16 | + echo "$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME) is private"; \ | |
17 | + else \ | |
18 | + cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE commit || cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE import src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME); \ | |
19 | + fi | |
20 | + | |
21 | +put: | |
22 | + cd src; make put; cd .. | |
23 | + | |
24 | +clean: | |
25 | + cd src; make clean; cd .. | |
26 | + | |
27 | +depend: | |
28 | + cd src; make depend; cd .. | |
29 | + | |
30 | +check: | |
31 | + @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \ | |
32 | + echo making directory; \ | |
33 | + mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \ | |
34 | + fi | |
35 | + ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); | |
36 | + @$(RM) src/Makefile | |
37 | + @echo "New src/Makefile" | |
38 | + @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile | |
39 | + @cd src; touch $(OSTYPE)/.Depend; make depend | |
40 | + | |
41 | +cvsupdate:: | |
42 | + cvs -d $(EOS_CVSROOT) update -d | |
43 | + | |
44 | +cvscommit:: | |
45 | + cvs -d $(EOS_CVSROOT) commit | |
46 | + | |
47 | +backup: | |
48 | + @cd ../../../..; \ | |
49 | + echo $(OBJECTNAME) ; \ | |
50 | + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config ; \ | |
51 | + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\ | |
52 | + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \ | |
53 | + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \ | |
54 | + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \ | |
55 | + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \ | |
56 | + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \ | |
57 | + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \ | |
58 | + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile | |
59 | + | |
60 | +backup-all: | |
61 | + @cd ../../../..; \ | |
62 | + echo $(OBJECTNAME) ; \ | |
63 | + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config ; \ | |
64 | + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\ | |
65 | + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \ | |
66 | + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \ | |
67 | + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \ | |
68 | + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \ | |
69 | + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \ | |
70 | + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \ | |
71 | + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile | |
72 | + | |
73 | +distribute: | |
74 | + cd ../../../..; \ | |
75 | + echo $(OBJECTNAME) ; \ | |
76 | + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config ; \ | |
77 | + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\ | |
78 | + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \ | |
79 | + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \ | |
80 | + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \ | |
81 | + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \ | |
82 | + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \ | |
83 | + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \ | |
84 | + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \ | |
85 | + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) | |
86 | + | |
87 | +distribute-all: | |
88 | + @cd ../../../..; \ | |
89 | + echo $(OBJECTNAME) ; \ | |
90 | + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config ; \ | |
91 | + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\ | |
92 | + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \ | |
93 | + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \ | |
94 | + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \ | |
95 | + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \ | |
96 | + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \ | |
97 | + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \ | |
98 | + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \ | |
99 | + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) | |
100 | + | |
101 | +eosintroduce: | |
102 | + ${EOS_HOME}/sbin/eosintroduce ${WORLDNAME} ${CLASSNAME} ${OBJECTNAME} ./ | |
103 | + | |
104 | +include Config/Target.inc |