Commit: 502ffaff2985e411e82c09ebdb95d1fa2c73b15a - Eos (git)

Commit MetaInfo

• Revisión: 502ffaff2985e411e82c09ebdb95d1fa2c73b15a (tree)
• Tiempo: 2015-03-09 15:59:16
• Autor: Takuo Yasunaga <yasunaga@bio....>
• Commiter: Takuo Yasunaga

Log Message

Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base

Cambiar Resumen

• modified: env/install-eos.sh
• delete: hostdepend/X86MAC64/bin/X86MAC64/clusterLog2ToLog
• delete: hostdepend/X86MAC64/bin/X86MAC64/clusterLogASCII2Binary
• delete: hostdepend/X86MAC64/bin/X86MAC64/clusterShow
• delete: hostdepend/X86MAC64/bin/X86MAC64/mrcImageClusterAnalysis
• delete: hostdepend/X86MAC64/lib/X86MAC64/libCluster.a
• delete: hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a
• delete: hostdepend/X86MAC64/src/Tools/Cluster/clusterLog2ToLog/src/X86MAC64/clusterLog2ToLog
• delete: hostdepend/X86MAC64/src/Tools/Cluster/clusterLogASCII2Binary/src/X86MAC64/clusterLogASCII2Binary
• delete: hostdepend/X86MAC64/src/Tools/Cluster/clusterShow/src/X86MAC64/clusterShow
• delete: hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86MAC64/mrcImageClusterAnalysis
• modified: src/Objects/General/Cluster/doc/Cluster.html

Diferencia incremental

--- a/env/install-eos.sh
+++ b/env/install-eos.sh
@@ -18,7 +18,7 @@ fi
 
 #curl -L $ROOT_EOS_SOURCEFORGE/env/Eos_env?export=raw | sh - ; 
 
-git clone --depth 1 git://git.sourceforge.jp/gitroot/eos/base.git $EOS_HOME0
+git clone --depth 1 git://git.sourceforge.jp/gitroot/eos/base.git $EOS_HOME0 || echo "Already installed on $EOS_HOME0 or there are something wrong."
 
 if [ -z $EOS_HOME0 ] ; then
 	export EOS_HOME0=$HOME/Eos
@@ -40,7 +40,20 @@ test -r $HOME/.Eos_env  && . $HOME/.Eos_env
 EOF
 
 if [ ! -f $HOME/.Eos_env ] ; then
+	echo "No .Eos_env"
 	ln -sf $EOS_HOME0/env/Eos_env $HOME/.Eos_env 
 fi
-source ~/.Eos_env
-cd $EOS_HOME; cd hostdepend; git clone --depth 1 git://git.sourceforge.jp/gitroot/eos/hostdepend${EOS_HOSTDIR}.git ${EOS_HOSTDIR}
+
+source ~/.Eos_env || echo "Prepare environment"
+echo "hostdepend for ${EOS_HOSTDIR}"
+
+if [ ! -d $EOS_HOME0/hostdepend ] ; then
+	mkdir $EOS_HOME0/hostdepend	
+fi	
+
+if [ -d $EOS_HOME0/hostdepend ] ; then
+	cd $EOS_HOME0/hostdepend/;  
+	git clone --depth 1 git://git.sourceforge.jp/gitroot/eos/hostdepend${EOS_HOSTDIR}.git ${EOS_HOSTDIR} || echo "Already installed hostdepend/${EOS_HOSTDIR} or there are something wrong."; 
+else
+	echo "Cannot make hostdepend"
+fi

Binary files a/hostdepend/X86MAC64/bin/X86MAC64/clusterLog2ToLog and /dev/null differ

Binary files a/hostdepend/X86MAC64/bin/X86MAC64/clusterLogASCII2Binary and /dev/null differ

Binary files a/hostdepend/X86MAC64/bin/X86MAC64/clusterShow and /dev/null differ

Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageClusterAnalysis and /dev/null differ

Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libCluster.a and /dev/null differ

Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a and /dev/null differ

Binary files a/hostdepend/X86MAC64/src/Tools/Cluster/clusterLog2ToLog/src/X86MAC64/clusterLog2ToLog and /dev/null differ

Binary files a/hostdepend/X86MAC64/src/Tools/Cluster/clusterLogASCII2Binary/src/X86MAC64/clusterLogASCII2Binary and /dev/null differ

Binary files a/hostdepend/X86MAC64/src/Tools/Cluster/clusterShow/src/X86MAC64/clusterShow and /dev/null differ

Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86MAC64/mrcImageClusterAnalysis and /dev/null differ

--- a/src/Objects/General/Cluster/doc/Cluster.html
+++ b/src/Objects/General/Cluster/doc/Cluster.html
@@ -3,15 +3,6 @@
 <H2>Information from source codes</H2>
 </A>
 <PRE>
-../src/clusterLogAnalysis.c:
-
-../src/clusterLogInit.c:
-
-../src/clusterLogRead.c:
-
-../src/clusterLogUtil.c:
-
-../src/clusterLogWrite.c:
 </PRE>
 <HR>
 <A NAME="include">