Revision | ac9c7d326a2f7fdc5bb5d901a2379f2c158ef8af (tree) |
---|---|
Time | 2015-03-06 05:30:19 |
Author | Takuo Yasunaga <yasunaga@bio....> |
Commiter | Takuo Yasunaga |
modified: Makefile
add comment and echo
@@ -18,8 +18,7 @@ help:: | ||
18 | 18 | @echo "---- To register new/Modified source codes. ----" |
19 | 19 | @echo " $$ make git-add or git-add[-all|-data|-tutorial|-optional|-others|-others2]" |
20 | 20 | @echo " $$ make git-commit or git-commit[-all|-data|-tutorial|-optional|-others|-others2]" |
21 | - @echo " $$ git tag " | |
22 | - @echo " $$ git tag newtag " | |
21 | + @echo " $$ make git-tag or git-tag[-all|-data|-tutorial|-optional|-others|-others2]" | |
23 | 22 | @echo " $$ make git-push or git-push[-all|-data|-tutorial|-optional|-others]" |
24 | 23 | @echo "" |
25 | 24 | @echo "---- To fetch and merge new/modified source codes. ----" |
@@ -98,6 +97,10 @@ relink: | ||
98 | 97 | ln -sf optional/objects . |
99 | 98 | ln -sf data/example . |
100 | 99 | |
100 | +# | |
101 | +# Add | |
102 | +# | |
103 | + | |
101 | 104 | git-add-all:: git-add git-add-data git-add-optional git-add-tutorial git-add-others |
102 | 105 | |
103 | 106 | git-add:: git-add-hostdepend |
@@ -124,13 +127,17 @@ git-add-others:: | ||
124 | 127 | git-add-others2:: |
125 | 128 | cd others2; git add --all . |
126 | 129 | |
130 | +# | |
131 | +# Commit | |
132 | +# | |
133 | + | |
127 | 134 | git-commit-all:: git-commit git-commit-data git-commit-optional git-commit-tutorial git-commit-others |
128 | 135 | |
129 | 136 | git-commit:: git-commit-hostdepend |
130 | - git commit || echo "Already commited" | |
137 | + @git commit || echo "Already commited" | |
131 | 138 | |
132 | 139 | git-commit-hostdepend:: |
133 | - cd hostdepend/$${EOS_HOSTDIR}/ ; git commit || echo "Already commited" | |
140 | + @cd hostdepend/$${EOS_HOSTDIR}/ ; git commit || echo "Already commited" | |
134 | 141 | |
135 | 142 | git-commit-optional:: |
136 | 143 | cd optional; git commit |
@@ -150,6 +157,10 @@ git-commit-others2:: | ||
150 | 157 | git-backup:: |
151 | 158 | git push $(EOS_GIT_BACKUPSITE) master --tags |
152 | 159 | |
160 | +# | |
161 | +# tag | |
162 | +# | |
163 | + | |
153 | 164 | git-tag:: |
154 | 165 | @export DIRECTORYNAME=./; \ |
155 | 166 | make git-tag-common; |
@@ -184,17 +195,23 @@ git-tag-common:: | ||
184 | 195 | fi; \ |
185 | 196 | fi; |
186 | 197 | |
198 | +# | |
199 | +# push | |
200 | +# | |
201 | + | |
187 | 202 | git-push-all:: git-push git-push-data git-push-optional git-push-tutorial git-push-others |
188 | 203 | |
189 | 204 | git-push::git-push-hostdepend |
190 | 205 | # git push origin master --tags |
206 | + @echo "base" | |
191 | 207 | @export DIRECTORYNAME=./; \ |
192 | 208 | export ORIGINNAME=origin; \ |
193 | 209 | make git-push-with-check; |
194 | 210 | |
195 | 211 | git-push-hostdepend:: |
196 | 212 | #git subtree push --prefix=hostdepend/$${EOS_HOSTDIR}/ --squash hostdepend$${EOS_HOSTDIR} master |
197 | - cd hostdepend/$${EOS_HOSTDIR}/; git push hostdepend$${EOS_HOSTDIR} master | |
213 | + @echo "hostdepend" | |
214 | + @cd hostdepend/$${EOS_HOSTDIR}/; git push hostdepend$${EOS_HOSTDIR} master | |
198 | 215 | |
199 | 216 | git-push-optional:: |
200 | 217 | # cd optional; git push optional master --tags |