SamplingUnitChange -R option were added.

[eos/base.git] / Makefile

diff --git a/Makefile b/Makefile
index e4f0ca0..e0e4a80 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,12 @@ install:
 rebuild-src:
        echo "rebuild-src"
        cd src; rm -f Makefile; cp -f Config/Template/Makefile 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
+       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 ;  \
+               rm -f Objects/Config/Define.inc; sed -e s/worldname/Objects/ Config/Template/ObjectsHomeTemplate.Dir/Config/Define.inc > Objects/Config/Define.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 ; \
+               rm -f Tools/Config/Define.inc ; sed  -e s/worldname/Tools/ Config/Template/ToolsHomeTemplate.Dir/Config/Define.inc > Tools/Config/Define.inc 
 
 rebuild-Objects:
        cd src/Objects;  make clean; make check; make depend; make ; make install
@@ -108,14 +112,14 @@ install-Tools:
        cd src/Tools;    make check; make depend; make ; make install
 
 setting:relink
-       if [ ! -d hostdepend] ; then \
+       if [ ! -d hostdepend ] ; then \
                mkdir hostdepend; \
        fi
 
 relink:
-       ln -sf optional/doc .
-       ln -sf optional/objects .
-       ln -sf data/example .
+       rm doc; ln -sf optional/doc .
+       rm objects;  ln -sf optional/objects .
+       rm example; ln -sf data/SampleData example
 
 #
 # Add
@@ -129,7 +133,19 @@ git-add:: git-add-hostdepend
 
 git-add-hostdepend::
        @echo "hostdepend directory"
-       @cd hostdepend/$${EOS_HOSTDIR}/ ; git remote add hostdepend$${EOS_HOSTDIR} $${EOS_GITUSER}@$(EOS_GIT_REPOSITRY_HOSTDEPEND)$${EOS_HOSTDIR}.git || echo "Already exist"
+       @cd hostdepend/$${EOS_HOSTDIR}/ ; FLAG=N; \
+       for name in `git remote`; do if [ $$name = hostdepend$${EOS_HOSTDIR} ] ; then FLAG=Y; fi; done; \
+       if [ $$FLAG = 'N' ] ; then \
+       git remote add hostdepend$${EOS_HOSTDIR} $${EOS_GITUSER}@$(EOS_GIT_REPOSITRY_HOSTDEPEND)$${EOS_HOSTDIR}.git || echo "Already exist"; \
+       fi 
+       @cd hostdepend/$${EOS_HOSTDIR}/ ; FLAG=N; \
+       for name in `git remote`; do if [ $$name = origin ] ; then FLAG=Y; fi; done; \
+       if [ $$FLAG = 'N' ] ; then \
+       git remote add origin $${EOS_GITUSER}@$(EOS_GIT_REPOSITRY_HOSTDEPEND)$${EOS_HOSTDIR}.git || echo "Already exist"; \
+       elif [ ! -z $${EOS_GITUSER} ] ; then \
+       git remote remove origin || echo "No exist"; \
+       git remote add origin $${EOS_GITUSER}@$(EOS_GIT_REPOSITRY_HOSTDEPEND)$${EOS_HOSTDIR}.git || echo "Already exist"; \
+       fi 
        @cd hostdepend/$${EOS_HOSTDIR}/ ; git add -v --all . || echo "No files to be added\n" 
 
 git-add-optional::
@@ -229,9 +245,10 @@ git-push::git-push-hostdepend
        make git-push-with-check;
 
 git-push-hostdepend::
-#      git subtree push --prefix=hostdepend/$${EOS_HOSTDIR}/ --squash hostdepend$${EOS_HOSTDIR} master 
+       @#git subtree push --prefix=hostdepend/$${EOS_HOSTDIR}/ --squash hostdepend$${EOS_HOSTDIR} master 
        @echo "hostdepend"
-       @cd hostdepend/$${EOS_HOSTDIR}/;  git push hostdepend$${EOS_HOSTDIR} master 
+       @#cd hostdepend/$${EOS_HOSTDIR}/;  git push hostdepend$${EOS_HOSTDIR} master 
+       @cd hostdepend/$${EOS_HOSTDIR}/;  git push || git push --set-upstream origin master || git push hostdepend$${EOS_HOSTDIR} master 
 
 git-push-optional::
 #      cd optional; git push optional master --tags
@@ -313,22 +330,28 @@ git-fetch-others::
 git-merge-all:: git-merge git-merge-zephyr git-merge-data git-merge-optional git-merge-tutorial git-merge-others
 
 git-merge::
-       cd .       ; git log -1; git merge FETCH_HEAD 
+       #cd .       ; git log -1; git merge FETCH_HEAD 
+       cd .       ; git log -1; git merge 
 
 git-merge-zephyr::
-       cd zephyr  ; git log -1; git merge FETCH_HEAD 
+       #cd zephyr  ; git log -1; git merge FETCH_HEAD 
+       cd zephyr  ; git log -1; git merge 
 
 git-merge-data::
-       cd data    ; git log -1; git merge FETCH_HEAD 
+       #cd data    ; git log -1; git merge FETCH_HEAD 
+       cd data    ; git log -1; git merge 
 
 git-merge-optional::
-       cd optional; git log -1; git merge FETCH_HEAD
+       #cd optional; git log -1; git merge FETCH_HEAD
+       cd optional; git log -1; git merge 
 
 git-merge-tutorial::
-       cd tutorial; git log -1; git merge FETCH_HEAD 
+       #cd tutorial; git log -1; git merge FETCH_HEAD 
+       cd tutorial; git log -1; git merge 
 
 git-merge-others::
-       cd others  ; git log -1; git merge FETCH_HEAD 
+       #cd others  ; git log -1; git merge FETCH_HEAD 
+       cd others  ; git log -1; git merge 
 
 #
 # Nickname