From: Takuo Yasunaga Date: Mon, 8 Jun 2015 02:08:01 +0000 (+0900) Subject: Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base X-Git-Tag: v2.3.65p0294~116 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=refs%2Ftags%2Fv2.3.1p0152;p=eos%2Fbase.git Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base --- 94393069133c83a213ff0e5af78f945ec14f9a9c diff --cc src/Objects/DataManip/mrcImage/src/mrcImageCopy.c index c8a4e15da7,f708652cee..2ceeb123a5 --- a/src/Objects/DataManip/mrcImage/src/mrcImageCopy.c +++ b/src/Objects/DataManip/mrcImage/src/mrcImageCopy.c @@@ -12,6 -12,8 +12,8 @@@ static char __sccs_id[] = "@(#)mrcImageCopy ver1.1; Date:96/05/08 @(#)"; #include #include -#define DEBUG ++#undef DEBUG + #include "genUtil.h" #include "../inc/mrcImage.h" void diff --cc src/Objects/DataManip/pdbFile/src/pdbTrans.c index d3a33ea9f4,e05047bb6d..73361f021d --- a/src/Objects/DataManip/pdbFile/src/pdbTrans.c +++ b/src/Objects/DataManip/pdbFile/src/pdbTrans.c @@@ -16,7 -16,8 +16,8 @@@ static char __sccs_id[] = "@(#)pdbTran #include #include --#define DEBUG ++#undef DEBUG + #undef DEBUG2 #include "../inc/pdbFile.h" #include "String.h" #include "eosCuda.h" diff --cc src/Objects/General/eosBayes/src/X86LINUX64 index 0000000000,0000000000..949b78b888 new file mode 120000 --- /dev/null +++ b/src/Objects/General/eosBayes/src/X86LINUX64 @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../hostdepend/X86LINUX64/src/Objects/General/eosBayes/src/X86LINUX64 diff --cc src/Tools/Config/Target.inc index 9c48220bd5,9c48220bd5..41c44d3ee4 --- a/src/Tools/Config/Target.inc +++ b/src/Tools/Config/Target.inc @@@ -38,8 -38,8 +38,10 @@@ check done depend: check ++ @echo ${SOURCE}; \ @for dir in ${SOURCE}; \ do \ ++ echo $${dir}; \ ${CD} $${dir}; make depend; ${CD} ..; \ done diff --cc src/Tools/DataManip/.Source.org index 0000000000,f3caea9554..99e07fe15d mode 000000,100644..100644 --- a/src/Tools/DataManip/.Source.org +++ b/src/Tools/DataManip/.Source.org @@@ -1,0 -1,4 +1,2 @@@ + SOURCE=\ -bmp2mrc \ -dm \ + #LastSource diff --cc src/Tools/mrcImage/mrcImage3DPeakGet/src/X86LINUX64 index 0000000000,0000000000..5a40cf3eb6 new file mode 120000 --- /dev/null +++ b/src/Tools/mrcImage/mrcImage3DPeakGet/src/X86LINUX64 @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImage3DPeakGet/src/X86LINUX64 diff --cc src/Tools/mrcImage/mrcImage3DPeakGet/src/mrcImage3DPeakGet.html index 0000000000,ea2d12f461..f0d15b56c4 mode 000000,100644..100644 --- a/src/Tools/mrcImage/mrcImage3DPeakGet/src/mrcImage3DPeakGet.html +++ b/src/Tools/mrcImage/mrcImage3DPeakGet/src/mrcImage3DPeakGet.html @@@ -1,0 -1,19 +1,1 @@@ - - -mrcImage3DPeakGet - - -

mrcImage3DPeakGet

-

Usage

-
 -Usage: mrcImage3DPeakGet
 -Options:
 -    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input:3D
 -    [-I[nformation]      Info                (stdin     ).as(inFile::ASCII       ) ] :Optional  :Input:ROI Info
 -    [-o[utput]           Out                 (stdout    ).as(outFile::ASCII      ) ] :Optional  :Output:Positon
 -    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
 -    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
 ------ Additional Usage -----
 -
- - ++/bin/bash: mrcImage3DPeakGet: そのようなファイルやディレクトリはありません diff --cc src/Tools/mrcImage/mrcImageLocalMaximumValuesFind/src/X86LINUX64 index 0000000000,0000000000..57bb53d401 new file mode 120000 --- /dev/null +++ b/src/Tools/mrcImage/mrcImageLocalMaximumValuesFind/src/X86LINUX64 @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageLocalMaximumValuesFind/src/X86LINUX64 diff --cc src/Tools/mrcImage/mrcImageSNEstimate/src/X86LINUX64 index 0000000000,0000000000..11d615a711 new file mode 120000 --- /dev/null +++ b/src/Tools/mrcImage/mrcImageSNEstimate/src/X86LINUX64 @@@ -1,0 -1,0 +1,1 @@@ ++../../../../../hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageSNEstimate/src/X86LINUX64 diff --cc src/Tools/mrcImage/mrcImageSNEstimate/src/mrcImageSNEstimate.html index 0000000000,d96efbabf9..6229eba534 mode 000000,100644..100644 --- a/src/Tools/mrcImage/mrcImageSNEstimate/src/mrcImageSNEstimate.html +++ b/src/Tools/mrcImage/mrcImageSNEstimate/src/mrcImageSNEstimate.html @@@ -1,0 -1,1 +1,1 @@@ -/bin/bash: mrcImageSNEstimate: No such file or directory ++/bin/bash: mrcImageSNEstimate: そのようなファイルやディレクトリはありません diff --cc src/Tools/openGL/gmolvie/src/gmolvie.html index c80fe000da,c80fe000da..8b2c9d6a66 --- a/src/Tools/openGL/gmolvie/src/gmolvie.html +++ b/src/Tools/openGL/gmolvie/src/gmolvie.html @@@ -1,18 -1,18 +1,1 @@@ -- -- --gmolvie -- -- --

gmolvie

--

Usage

--
--Usage: gmolvie
--Options:
--    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
--    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
--    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
--    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
------- Additional Usage -----
--
-- -- ++/bin/bash: gmolvie: そのようなファイルやディレクトリはありません diff --cc src/Tools/pdbUtil/pdb2mrc2d/src/test/Makefile index cedd45e25c,4eceb79042..aae357a63a --- a/src/Tools/pdbUtil/pdb2mrc2d/src/test/Makefile +++ b/src/Tools/pdbUtil/pdb2mrc2d/src/test/Makefile @@@ -3,7 -3,7 +3,7 @@@ include ../../../Config/Define.in include ../../../../Config/Define.inc include ../../../../../Config/Define.inc --all: help exec ++all: help exec exec2 exec3 exec4 help: @echo "----- Help Message Check -----" @@@ -14,4 -14,14 +14,16 @@@ exec ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.shift.pdb -o data/121p.mrc2d -O data/121p.mrc2dStack -s -30 -30 -n 13 13 -d 5 5 -Rot 8 8 -m 3 -sig 3 @echo "----- Calc check -----" + exec2: + @echo "----- Execution Check -----" + ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.shift.pdb -o data/121p.mrc2d2 -O data/121p.mrc2dStack2 -s -32 -32 -n 32 32 -d 2 2 -Rot 12 12 -m 3 -sig 3 + @echo "----- Calc check -----" + + exec3: + @echo "----- Execution Check -----" + ../$(OSTYPE)/$(OBJECTNAME) -i data/121p.shift.pdb -o data/121p.mrc2d3 -O data/121p.mrc2dStack3 -s -32 -32 -n 32 32 -d 2 2 -Rot 4 4 -m 3 -sig 3 + @echo "----- Calc check -----" + ++exec4: ++ clean: diff --cc src/Tools/pdbUtil/pdbHomologySearch/src/pdbHomologySearch.html index 3c02f8fc61,3c02f8fc61..dc0b8dcf2f --- a/src/Tools/pdbUtil/pdbHomologySearch/src/pdbHomologySearch.html +++ b/src/Tools/pdbUtil/pdbHomologySearch/src/pdbHomologySearch.html @@@ -1,1 -1,1 +1,1 @@@ --/bin/bash: pdbHomologySearch: No such file or directory ++/bin/bash: pdbHomologySearch: そのようなファイルやディレクトリはありません diff --cc src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html index f82838c344,f82838c344..ebfde53189 --- a/src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html +++ b/src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html @@@ -1,1 -1,1 +1,1 @@@ --/bin/bash: pdbMatrixCreate: No such file or directory ++/bin/bash: pdbMatrixCreate: そのようなファイルやディレクトリはありません diff --cc src/Tools/pdbUtil/pdbView/src/pdbView.html index 922e952dd9,922e952dd9..8eca5aba2a --- a/src/Tools/pdbUtil/pdbView/src/pdbView.html +++ b/src/Tools/pdbUtil/pdbView/src/pdbView.html @@@ -1,1 -1,1 +1,1 @@@ --/bin/bash: pdbView: No such file or directory ++/bin/bash: pdbView: そのようなファイルやディレクトリはありません