Adapt for season 2016 repository.

roboterclubaachen · Jul 8, 2015 · 1db642e · 1db642e
1 parent 759a203
commit 1db642e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/eurobot-vm.json b/eurobot-vm.json
@@ -112,6 +112,10 @@
     "type": "file",
     "source": "http/Season2015",
     "destination": "~/Season2015"
+  },{
+    "type": "file",
+    "source": "http/Season2016",
+    "destination": "~/Season2016"
   },{
     "type": "file",
     "source": "http/Initializer",

diff --git a/http/Season2016 b/http/Season2016
@@ -0,0 +1,6 @@
+#!/bin/zsh
+
+xfce4-terminal -T "Bot Control" --working-directory=/home/rca/rcasoftware/s2016/bot_control/ \
+--tab -T "Big" --working-directory=/home/rca/rcasoftware/s2016/season/big/ \
+--tab -T "Little" --working-directory=/home/rca/rcasoftware/s2016/season/little/ \
+--tab -T "Simulator" --working-directory=/home/rca/rcasoftware/s2016/simulator/src
diff --git a/http/eaglerc b/http/eaglerc
@@ -19,9 +19,9 @@ ControlPanel.View.Sort = "0"
 Dialog.CheckForUpdate.Size = "400 300"
 Directories.Cam = "$EAGLEDIR/cam:$HOME/rcasoftware/roboter/allgemein/et/eagle/cam"
 Directories.Dru = "$EAGLEDIR/dru:$HOME/rcasoftware/roboter/allgemein/et/eagle/scripts"
-Directories.Epf = "$HOME/eagle:$EAGLEDIR/projects/examples:$HOME/rcasoftware/roboter/allgemein/et/eagle/projekte:$HOME/rcasoftware/roboter/2013_common/et/projects:$HOME/rcasoftware/roboter/2013_Grosserbot/et/projects:$HOME/rcasoftware/roboter/2013_Kleinerbot/et/projects:$HOME/rcasoftware/roboter/2014_common/et/projects:$HOME/rcasoftware/roboter/2014_grosserbot/et/projects:$HOME/rcasoftware/roboter/2015_common/et/projects:$HOME/rcasoftware/roboter/2015_Phobos/et/projects:$HOME/rcasoftware/roboter/2015_hal/et/projects"
+Directories.Epf = "$HOME/eagle:$EAGLEDIR/projects/examples:$HOME/rcasoftware/roboter/allgemein/et/eagle/projekte:$HOME/rcasoftware/roboter/2013_common/et/projects:$HOME/rcasoftware/roboter/2013_Grosserbot/et/projects:$HOME/rcasoftware/roboter/2013_Kleinerbot/et/projects:$HOME/rcasoftware/roboter/2014_common/et/projects:$HOME/rcasoftware/roboter/2014_grosserbot/et/projects:$HOME/rcasoftware/roboter/2015_common/et/projects:$HOME/rcasoftware/roboter/2015_Phobos/et/projects:$HOME/rcasoftware/roboter/2015_hal/et/projects:$HOME/rcasoftware/roboter/2016_big/et/projects:$HOME/rcasoftware/roboter/2016_little/et/projects"
 Directories.IgnoreNonExisting = "0"
-Directories.Lbr = "$EAGLEDIR/lbr:$HOME/rcasoftware/roboter/allgemein/et/eagle/lib:$HOME/rcasoftware/roboter/2013_common/et/lib:$HOME/rcasoftware/roboter/2013_common/et/lib:$HOME/rcasoftware/roboter/2014_common/et/lib"
+Directories.Lbr = "$EAGLEDIR/lbr:$HOME/rcasoftware/roboter/allgemein/et/eagle/lib:$HOME/rcasoftware/roboter/2013_common/et/lib:$HOME/rcasoftware/roboter/2013_common/et/lib:$HOME/rcasoftware/roboter/2014_common/et/lib:$HOME/rcasoftware/roboter/2015_common/et/lib:$HOME/rcasoftware/roboter/2016_common/et/lib"
 Directories.Scr = "$EAGLEDIR/scr:$HOME/rcasoftware/roboter/allgemein/et/eagle/scripts"
 Directories.Ulp = "$EAGLEDIR/ulp:$HOME/rcasoftware/roboter/allgemein/et/eagle/scripts"
 EAGLE.Version = "6.5"

diff --git a/http/init.sh b/http/init.sh
@@ -31,6 +31,9 @@ if [[ ! $(git config --global --get user.name) || ! $(git config --global --get
         cd ~/rcasoftware/s2015/xpcc/
         git config user.name "$GIT_PSEUDONYM"
         git config user.email "$GIT_PSEUDONYM"
+        cd ~/rcasoftware/s2016/xpcc/
+        git config user.name "$GIT_PSEUDONYM"
+        git config user.email "$GIT_PSEUDONYM"
     fi
     echo
     echo 'Thanks, I have set up git for you.'
@@ -54,6 +57,10 @@ if [[ ! $(git config --global --get user.name) || ! $(git config --global --get
     gits populate
     gits fetch --all
     gits reset --hard origin/develop
+    cd ~/rcasoftware/s2016/
+    gits populate
+    gits fetch --all
+    gits reset --hard origin/develop
     echo
 
     # update subversion

diff --git a/script/repositories.sh b/script/repositories.sh
@@ -21,14 +21,15 @@ if [[ -n "$RCA_USER" ]]; then
 	echo 'Cloning last seasons software repositories...'
 	gits clone https://$RCA_USER:$RCA_PASSWORD@$RCA_SERVER/git/software.git -b season2013 ~/rcasoftware/s2013
 	gits clone https://$RCA_SERVER/git/software.git -b season2014 ~/rcasoftware/s2014
+	gits clone https://$RCA_SERVER/git/software.git -b season2015 ~/rcasoftware/s2015
 
 	echo
 	echo 'Cloning the current software repositories...'
-	gits clone https://$RCA_SERVER/git/software.git -b develop ~/rcasoftware/s2015
+	gits clone https://$RCA_SERVER/git/software.git -b develop ~/rcasoftware/s2016
 
 	echo
 	echo 'Setting up git-flow...'
-	cd ~/rcasoftware/s2015/
+	cd ~/rcasoftware/s2016/
 	gits exec git branch --track master origin/master
 	gits exec git flow init -d
 
@@ -40,6 +41,8 @@ if [[ -n "$RCA_USER" ]]; then
 	cp -R . ~/rcasoftware/s2014/
 	cd ~/rcasoftware/s2015/.rca/eclipse/
 	cp -R . ~/rcasoftware/s2015/
+	cd ~/rcasoftware/s2016/.rca/eclipse/
+	cp -R . ~/rcasoftware/s2016/
 
 	cd
 	# symlink to desktop for easier access
@@ -54,9 +57,11 @@ if [[ -n "$RCA_USER" ]]; then
 	chmod a+x ~/Season2013
 	chmod a+x ~/Season2014
 	chmod a+x ~/Season2015
+	chmod a+x ~/Season2016
 	mv ~/Season2013 ~/Desktop
 	mv ~/Season2014 ~/Desktop
 	mv ~/Season2015 ~/Desktop
+	mv ~/Season2016 ~/Desktop
 	# move the init script to the right place
 	mv ~/ReadMe.html ~/Desktop
 
@@ -106,6 +111,14 @@ if [[ -n "$RCA_USER" ]]; then
 	svn update 2015_hal --set-depth immediates
 	svn update 2015_hal/et --set-depth infinity
 
+	# season 2016
+	svn update 2016_common --set-depth immediates
+	svn update 2016_common/et --set-depth infinity
+	svn update 2016_Phobos --set-depth immediates
+	svn update 2016_Phobos/et --set-depth infinity
+	svn update 2016_hal --set-depth immediates
+	svn update 2016_hal/et --set-depth infinity
+
 	# remove all authentication credentials
 	rm -rf ~/.subversion/auth
 
@@ -116,4 +129,5 @@ else
 	rm ~/Season2013
 	rm ~/Season2014
 	rm ~/Season2015
+	rm ~/Season2016
 fi