• R/O
  • HTTP
  • SSH
  • HTTPS

tutorial: Commit

This repository is for tutorials of Eos.


Commit MetaInfo

Revisiona04d77ca857c9671444f4002ec9dba371372117c (tree)
Time2014-10-17 12:44:53
Authorkinoshita-eos <kinoshita@yasu...>
Commiterkinoshita-eos

Log Message

Add: Template of Makefile in Small Tools.

new file: Small Tools/Template/Makefile/Makefile
new file: Small Tools/Template/Makefile/Makefile-lib
new file: Small Tools/mrcImage/Makefile

Modify: Rename Subfile .config -> -lib
modified: CTFCorrection/CTFCorrection2/Makefile.config
modified: CTFCorrection/CTFCorrection4/Makefile.config
modified: CTFCorrection/CTFCorrection5/Makefile.config
modified: Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
renamed: Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile.config -> Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib
modified: TIPS/BackImage/Makefile
renamed: TIPS/BackImage/Makefile.config -> TIPS/BackImage/Makefile-lib
modified: TIPS/CreateGridImage/Makefile
renamed: TIPS/CreateGridImage/Makefile.config -> TIPS/CreateGridImage/Makefile-lib
renamed: TIPS/Help/Makefile.config -> TIPS/Help/Makefile-lib
modified: TIPS/LoopCommand/Makefile
renamed: TIPS/LoopCommand/Makefile.config -> TIPS/LoopCommand/Makefile-lib
modified: TIPS/MaskImage/Makefile
renamed: TIPS/MaskImage/Makefile.config -> TIPS/MaskImage/Makefile-lib
modified: TIPS/NulImage/Makefile
renamed: TIPS/NulImage/Makefile.config -> TIPS/NulImage/Makefile-lib

Change Summary

Incremental Difference

--- a/CTFCorrection/CTFCorrection2/Makefile.config
+++ b/CTFCorrection/CTFCorrection2/Makefile.config
@@ -15,7 +15,7 @@ INPUT_3D_EXT=3d
1515
1616 #### INCLUDE ####
1717 -include ../CTFCorrection1/Makefile
18--include ../../TIPS/CreateGridImage/Makefile.config
18+-include ../../TIPS/CreateGridImage/Makefile-lib
1919 -include INPUT_2D_LIST
2020 -include CTF_2D_LIST
2121 -include FFT_2D_LIST
--- a/CTFCorrection/CTFCorrection4/Makefile.config
+++ b/CTFCorrection/CTFCorrection4/Makefile.config
@@ -9,7 +9,7 @@
99 #### Suffixes rule ####
1010
1111 #### INCLUDE ####
12--include ../../TIPS/LoopCommand/Makefile.config
12+-include ../../TIPS/LoopCommand/Makefile-lib
1313 -include ../CTFCorrection2/Makefile.config
1414
1515 #### Definition ####
--- a/CTFCorrection/CTFCorrection5/Makefile.config
+++ b/CTFCorrection/CTFCorrection5/Makefile.config
@@ -8,7 +8,7 @@
88
99 #### INCLUDE ####
1010 -include ../CTFCorrection3/Makefile.config
11--include ../../TIPS/LoopCommand/Makefile.config
11+-include ../../TIPS/LoopCommand/Makefile-lib
1212
1313 #### Definition ####
1414
--- /dev/null
+++ b/Small Tools/Template/Makefile/Makefile
@@ -0,0 +1,61 @@
1+#
2+# This is Main Makefile for !!Command!!.
3+#
4+
5+#### Root Makefile ####
6+MAKE_ROOT=!!Command!!
7+
8+#### Input extention ####
9+INI=ini
10+
11+#### Suffixes rule ####
12+# Defined at Sub
13+
14+#### INCLUDE ####
15+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
16+-include Makefile-lib
17+
18+#### Definition ####
19+# Path of Input File
20+# Basically, use a linked data from /SampleData.
21+# INPUT_PATH=${EOS_HOME}/tutorial/SampleData/XXXX.mrc
22+
23+### FileData
24+FILE_NAME=Input
25+
26+#### Rules of the list created ####
27+# Defined at Sub
28+
29+##### Commands #####
30+# Defined at Sub basically
31+# By make Initial, Create input data for this command.
32+Initial::
33+ make InitialData;
34+
35+# By make Exe, Execute the sample of this command.
36+Exe::
37+
38+# By make all, Initial -> Exe.
39+all::
40+ make Initial;
41+ make Exe;
42+
43+help_!!Command!!::
44+ @echo
45+ @echo "Makefile for !!Command!!"
46+ @echo "This is Main Makefile for !!Command!!."
47+ @echo
48+ @echo " (Command):"
49+ @echo " Initial: Create input data for this command."
50+ @echo " (Setting Data):"
51+ @echo " INI: input extention for Initial"
52+ @echo
53+ @echo " Exe: Execute the sample of this command."
54+ @echo
55+ @echo " all: Initial -> Exe."
56+ @echo
57+ @echo " (Setting Data):"
58+ @echo " FILE_NAME: filename of input"
59+
60+##### Commands(Input to Output) #####
61+# Defined at Sub
--- /dev/null
+++ b/Small Tools/Template/Makefile/Makefile-lib
@@ -0,0 +1,28 @@
1+#
2+# This is Sub Makefile for !!Command!!.
3+#
4+
5+#### Input extention ####
6+# Defined at Main
7+
8+#### Suffixes rule ####
9+.SUFFIXES: .$(INI)
10+
11+#### INCLUDE ####
12+# Use TIPS File.
13+# -include ${EOS_HOME}/tutorial/TIPS/XXXX/Makefile-lib
14+
15+#### Definition ####
16+# Defined at Main
17+
18+#### Rules of the list created ####
19+
20+
21+##### Commands #####
22+InitialData::
23+ touch $(FILE_NAME).$(INI);
24+ rm $(FILE_NAME).$(INI);
25+ ln -s $(INPUT_PATH) $(FILE_NAME).$(INI)
26+
27+##### Commands(Input to Output) #####
28+
--- /dev/null
+++ b/Small Tools/mrcImage/Makefile
@@ -0,0 +1,48 @@
1+#
2+# This is Makefile to create the Template Makefile for Small Tools, TIPS, and so on.
3+#
4+
5+#### Root Makefile ####
6+MAKE_ROOT=makeTemplate
7+
8+#### INCLUDE ####
9+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
10+
11+#### Definition ####
12+# Path of Template Files.
13+SOURCE="../../../Template/Makefile/"
14+
15+##### Commands #####
16+.DEFAULT::
17+ @CreateFlag=
18+ @export TARGET=$@; \
19+ if [ ! -z $$TARGET ] ; then \
20+ CreateFlag=true; \
21+ fi; \
22+ if [ ! -z $$CreateFlag ] ; then \
23+ make CreateInitialMakefileDirectory; \
24+ fi
25+
26+CreateInitialMakefileDirectory::
27+ @mkdir $$TARGET;
28+ @cd ./$$TARGET; \
29+ mkdir Makefile; \
30+ cd ./Makefile; \
31+ cp ${SOURCE}Makefile Makefile; \
32+ cp ${SOURCE}Makefile-lib Makefile-lib; \
33+ sed -e s/"!!Command!!"/"$$TARGET"/g Makefile > tmp; \
34+ cp tmp Makefile; \
35+ sed -e s/"!!Command!!"/"$$TARGET"/g Makefile-lib > tmp; \
36+ cp tmp Makefile-lib; \
37+ rm tmp;
38+
39+help_makeTemplate::
40+ @echo
41+ @echo "Makefile for Template"
42+ @echo "This is Makefile to create the Template Makefile for Small Tools, TIPS, and so on."
43+ @echo
44+ @echo " (Command):"
45+ @echo " make XXXX: create XXXX directory and Makefile."
46+ @echo " if exist the directory already, do not process."
47+ @echo
48+
\ No newline at end of file
--- a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
+++ b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
@@ -15,8 +15,8 @@ FSC=fsc
1515 # Defined at Sub
1616
1717 #### INCLUDE ####
18--include ${EOS_HOME}/tutorial/TIPS/Help/Makefile.config
19--include Makefile.config
18+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
19+-include Makefile-lib
2020
2121 #### Definition ####
2222 # Path of Input File
@@ -58,7 +58,7 @@ help_mrcImageFourierNeighborCorrelation::
5858 @echo " (Command):"
5959 @echo " Initial: Create Initial File for execution."
6060 @echo " (Setting Data):"
61- @echo " INI: input extention"
61+ @echo " INI: input extention for Initial"
6262 @echo " INIpad: for -i"
6363 @echo " MASK: for -mask"
6464 @echo " MASKBACK: for -maskBack"
similarity index 92%
rename from Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile.config
rename to Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib
index c92d54cb964f1ebf49cef8a639f1c45e0f8ab401..7260f5884166e306a6592ce3d28bf6687a60230b 100644
--- a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile.config
+++ b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib
@@ -9,8 +9,8 @@
99 .SUFFIXES: .$(INI) .$(INI)info .$(FSC)
1010
1111 #### INCLUDE ####
12--include ${EOS_HOME}/tutorial/TIPS/MaskImage/Makefile.config
13--include ${EOS_HOME}/tutorial/TIPS/BackImage/Makefile.config
12+-include ${EOS_HOME}/tutorial/TIPS/MaskImage/Makefile-lib
13+-include ${EOS_HOME}/tutorial/TIPS/BackImage/Makefile-lib
1414
1515 #### Definition ####
1616 # Defined at Main
--- a/TIPS/BackImage/Makefile
+++ b/TIPS/BackImage/Makefile
@@ -14,8 +14,8 @@ BACK=back
1414 # Defined at Sub
1515
1616 #### INCLUDE ####
17--include ${EOS_HOME}/tutorial/TIPS/Help/Makefile.config
18--include Makefile.config
17+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
18+-include Makefile-lib
1919
2020 #### Definition ####
2121 ### FileData
--- a/TIPS/BackImage/Makefile.config
+++ b/TIPS/BackImage/Makefile-lib
@@ -9,7 +9,7 @@
99 .SUFFIXES: .$(NUL) .$(IN_BACK) .$(BACK)
1010
1111 #### INCLUDE ####
12--include ${EOS_HOME}/tutorial/TIPS/NulImage/Makefile.config
12+-include ${EOS_HOME}/tutorial/TIPS/NulImage/Makefile-lib
1313
1414 #### Definition ####
1515 # Defined at Main
--- a/TIPS/CreateGridImage/Makefile
+++ b/TIPS/CreateGridImage/Makefile
@@ -12,7 +12,7 @@ TIFF=tiff
1212 # Defined at Sub
1313
1414 #### INCLUDE ####
15--include Makefile.config
15+-include Makefile-lib
1616
1717 #### Definition ####
1818 ### FileData
--- a/TIPS/CreateGridImage/Makefile.config
+++ b/TIPS/CreateGridImage/Makefile-lib
@@ -9,7 +9,7 @@
99 .SUFFIXES: .$(NUL) .$(ONE) .$(GRID)
1010
1111 #### INCLUDE ####
12--include ${EOS_HOME}/tutorial/TIPS/NulImage/Makefile.config
12+-include ${EOS_HOME}/tutorial/TIPS/NulImage/Makefile-lib
1313
1414 #### Definition ####
1515 # Defined at Main
--- a/TIPS/LoopCommand/Makefile
+++ b/TIPS/LoopCommand/Makefile
@@ -9,7 +9,7 @@
99 # Defined at Sub
1010
1111 #### INCLUDE ####
12--include Makefile.config
12+-include Makefile-lib
1313
1414 #### Definition ####
1515 ## For define varioable
--- a/TIPS/MaskImage/Makefile
+++ b/TIPS/MaskImage/Makefile
@@ -13,8 +13,8 @@ MASK=mask
1313 # Defined at Sub
1414
1515 #### INCLUDE ####
16--include ${EOS_HOME}/tutorial/TIPS/Help/Makefile.config
17--include Makefile.config
16+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
17+-include Makefile-lib
1818
1919 #### Definition ####
2020 ### FileData
--- a/TIPS/NulImage/Makefile
+++ b/TIPS/NulImage/Makefile
@@ -12,8 +12,8 @@ NUL=nul
1212 # Defined at Sub
1313
1414 #### INCLUDE ####
15--include ${EOS_HOME}/tutorial/TIPS/Help/Makefile.config
16--include Makefile.config
15+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
16+-include Makefile-lib
1717
1818 #### Definition ####
1919 ### FileData
Show on old repository browser