Update mmaret-geny conf

This commit is contained in:
Mathieu Maret 2014-07-18 23:21:55 +02:00 committed by Mathieu Maret
parent dcd5714093
commit bed97190a3
4 changed files with 29 additions and 11 deletions

View File

@ -32,8 +32,21 @@ Host vbox
StrictHostKeyChecking no StrictHostKeyChecking no
UserKnownHostsFile /dev/null UserKnownHostsFile /dev/null
LogLevel QUIET LogLevel QUIET
Host builder
User builder
Host equestria
User genymobile
Host babypi
User pi
Host orange_gw Host orange_gw
HostName orbuilder.no-ip.biz # HostName 109.218.105.79
HostName 80.14.86.137
# HostName 80.11.75.123
# HostName orbuilder.no-ip.biz
User genymobile User genymobile
Host orange_tg Host orange_tg
@ -41,3 +54,6 @@ Host orange_tg
User builder User builder
ProxyCommand ssh orange_gw -W %h:%p ProxyCommand ssh orange_gw -W %h:%p
Host geny_wiki
HostName 94.23.204.164
User root

2
.vimrc
View File

@ -183,7 +183,7 @@ set mat=5
" % match if/then/else/... " % match if/then/else/...
runtime macros/matchit.vim runtime macros/matchit.vim
" search word and list lines to jump with F3 " search word and list lines to jump with F3
map <F3> [I:let nr = input("Which one: ") <Bar>execute "normal " . nr ."[\t"<CR> " map <F3> [I:let nr = input("Which one: ") <Bar>execute "normal " . nr ."[\t"<CR>
" go to declaration with F5 " go to declaration with F5
" map <silent> <F5> gd:nohlsearch<CR> " map <silent> <F5> gd:nohlsearch<CR>
" imap <F5> <ESC><F5>i " imap <F5> <ESC><F5>i

View File

@ -1,12 +1,13 @@
export ECLIPSE_HOME= export ECLIPSE_HOME=
export ANDROID_HOME=/home/mmaret/local/adt-bundle-linux-x86_64-20130514/sdk export ANDROID_HOME=$HOME/local/adt/sdk
export NDK_HOME=/home/mmaret/Android/android-ndk-r9b/ export NDK_HOME=$HOME/Android/android-ndk-r9b/
export MY_PROJECT=/home/mmaret/Projects/orange/orange_4.3 export MY_PROJECT=$HOME/Projects/genymotion
export MY_PROJECT_TOOLCHAIN=$MY_PROJECT/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7/bin export MY_PROJECT_TOOLCHAIN=$MY_PROJECT/src/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7/bin
export JAVA_HOME=/home/mmaret/local/jdk1.7.0_21 export JAVA_HOME=$HOME/local/jdk1.7.0_21
export GENYMOTION_HOME=$HOME/local/genymotion
export DEBEMAIL=mmaret@genymobile.com export DEBEMAIL=mmaret@genymobile.com
export DEBFULLNAME=Mathieu Maret export DEBFULLNAME=Mathieu Maret
export PATH=:$JAVA_HOME/bin/:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools/:$ANDROID_HOME/build-tools/android-4.2.2:$NDK_HOME:$PATH:$MY_PROJECT_TOOLCHAIN export PATH=:$JAVA_HOME/bin/:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools/:$ANDROID_HOME/build-tools/android-4.2.2:$NDK_HOME:$GENYMOTION_HOME:$PATH:$MY_PROJECT_TOOLCHAIN

View File

@ -1,11 +1,12 @@
export VERSION=qualif_1.3m export VERSION=qualif_1.3o
croot croot
repo forall -c "pwd; git co orange_4.3.1_r1" ;alert repo forall -c "pwd; git co orange_4.3.1_r1" ;alert
repo forall -c "pwd; git pull aosp orange_4.3.1_r1";alert repo forall -c "pwd; git pull aosp orange_4.3.1_r1";alert
repo forall -c "pwd; git tag $VERSION; git push aosp $VERSION"; alert
repo forall -c "pwd; git push orange $VERSION"; alert
#Push the current branch as well ? #Push the current branch as well ?
#repo forall -c "pwd; git push orange orange_4.3.1_r1";alert #repo forall -c "pwd; git push orange orange_4.3.1_r1";alert
repo forall -c "pwd; git tag $VERSION; git push aosp $VERSION"; alert
repo forall -c "pwd; git push orange $VERSION"; alert
croot croot
cd .repo/manifests cd .repo/manifests