modified: src/Tools/mrcImage/mrcImageShrink/src/test/Makefile

[eos/hostdependX86LINUX64.git] / Makefile

diff --git a/Makefile b/Makefile
index 8e51e40..92c7b0b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,8 +62,8 @@ install: install-src install-Objects install-Tools
 
 rebuild-src:
        echo "rebuild-src"
-       cd src; rm -f Objects/Makefile; cp -f Config/Template/ObjectsHomeTemplate.Dir/Makefile Objects/Makefile
-       cd src; rm -f Tools/Makefile; cp -f Config/Template/ToolsHomeTemplate.Dir/Makefile Tools/Makefile
+       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
+       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
 
 rebuild-Objects:
        cd src/Objects;  make clean; make check; make depend; make ; make install
@@ -92,22 +92,22 @@ relink:
 git-add-all:: git-add git-add-data git-add-optional git-add-tutorial git-add-others
 
 git-add::
-       git add -v .
+       git add -v --all .
 
 git-add-optional::
-       cd optional; git add -v . 
+       cd optional; git add -v --all . 
 
 git-add-data::
-       cd data; git add -v . 
+       cd data; git add -v --all . 
 
 git-add-tutorial::
-       cd tutorial; git add -v . 
+       cd tutorial; git add -v --all . 
 
 git-add-others::
-       cd others; git add -v . 
+       cd others; git add -v --all . 
 
 git-add-others2::
-       cd others2; git add . 
+       cd others2; git add --all . 
 
 git-commit-all:: git-commit git-commit-data git-commit-optional git-commit-tutorial git-commit-others
 
@@ -132,39 +132,108 @@ git-commit-others2::
 git-backup::
        git push $(EOS_GIT_BACKUPSITE) master  --tags
 
+git-tag::
+       @export DIRECTORYNAME=./; \
+       make git-tag-common;
+
+git-tag-optional::
+       @export DIRECTORYNAME=optional; \
+       make git-tag-common;
+
+git-tag-data::
+       @export DIRECTORYNAME=data; \
+       make git-tag-common;
+
+git-tag-tutorial::
+       @export DIRECTORYNAME=tutorial; \
+       make git-tag-common;
+
+git-tag-others::
+       @export DIRECTORYNAME=others; \
+       make git-tag-common;
+
+git-tag-common::
+       @if [ ! -z "$$DIRECTORYNAME" ]; then \
+               cd $$DIRECTORYNAME; \
+               echo; \
+               git tag | sort -k 2,2 -n -t p ; \
+               echo "Version No. (e.g. vXX.YY.ZZpSSSS)"; \
+               read TTT; \
+               if [ ! -z "$$TTT" ]; then \
+                       git tag $$TTT; \
+               else \
+                       echo "Incorrect."; \
+               fi; \
+       fi;
+
 git-push-all:: git-push git-push-data git-push-optional git-push-tutorial git-push-others
 
 git-push::
-       git push origin master  --tags
+#      git push origin master  --tags
+       @export DIRECTORYNAME=./; \
+       export ORIGINNAME=origin; \
+       make git-push-with-check;
 
 git-push-optional::
-       cd optional; git push optional master --tags
+#      cd optional; git push optional master --tags
+       @export DIRECTORYNAME=optional; \
+       export ORIGINNAME=optional; \
+       make git-push-with-check;
 
 git-push-data::
-       cd data; git push data master --tags
+#      cd data; git push data master --tags
+       @export DIRECTORYNAME=data; \
+       export ORIGINNAME=data; \
+       make git-push-with-check;
 
 git-push-tutorial::
-       cd tutorial; git push tutorial master --tags 
+#      cd tutorial; git push tutorial master --tags
+       @export DIRECTORYNAME=tutorial; \
+       export ORIGINNAME=tutorial; \
+       make git-push-with-check;
 
 git-push-others::
-       cd others; git push others master --tags
+#      cd others; git push others master --tags
+       @export DIRECTORYNAME=others; \
+       export ORIGINNAME=others; \
+       make git-push-with-check;
+
+git-push-with-check::
+       @if [ ! -z "$$DIRECTORYNAME" -a ! -z "$$ORIGINNAME" ]; then \
+               cd $$DIRECTORYNAME; \
+               echo; \
+               SSS=`git tag | sort -k 2,2 -n -t p | tail -1`; \
+               if [ ! -z "$$SSS" ]; then \
+                       echo "$$SSS is Current Tags in $$ORIGINNAME."; \
+                       echo "Did Tag update? Y(: push) | N(or Otherwords : not push)"; \
+                       read TTT; \
+                       if [ "$$TTT" = Y ]; then \
+                               git push $$ORIGINNAME master --tags; \
+                       else \
+                               echo "not push."; \
+                       fi; \
+               else \
+                       echo "Tags do not exist in $$ORIGINNAME."; \
+                       echo "Before push please add tag at current repositry."; \
+               fi; \
+       fi;
 
 git-fetch-all:: git-fetch git-fetch-data git-fetch-optional git-fetch-tutorial git-fetch-others
 
 git-fetch::
-       cd .       ; git fetch origin master  ; git log -1
+       cd .       ; git fetch origin master --tags     ; git log -1
 
 git-fetch-data::
-       cd data    ; git fetch data master    ; git log -1
+       cd data    ; git fetch data master --tags               ; git log -1
 
 git-fetch-optional::
-       cd optional; git fetch optional master; git log -1
+       cd optional; git fetch optional master --tags   ; git log -1
 
 git-fetch-tutorial::
-       cd tutorial; git fetch tutorial master; git log -1
+       cd tutorial; git fetch tutorial master --tags   ; git log -1
 
 git-fetch-others::
-       cd others  ; git fetch others master  ; git log -1
+       cd others  ; git fetch others master --tags             ; git log -1
 
 git-merge-all:: git-merge git-merge-data git-merge-optional git-merge-tutorial git-merge-others