Improved generating new realease versions

igrek51 · Oct 7, 2016 · bde7c69 · bde7c69
1 parent 8c7fada
commit bde7c69
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,3 @@
 .DS_Store
 /build
 /captures
-release/GuitarDB/
diff --git a/app/src/main/java/igrek/songbook/logic/app/App.java b/app/src/main/java/igrek/songbook/logic/app/App.java
@@ -213,7 +213,6 @@ private void restoreScrollPosition(String path) {
 
     private void showUIHelp() {
         AlertDialog.Builder dlgAlert = new AlertDialog.Builder(activity);
-        //TODO tłumaczenie na angielski
         dlgAlert.setMessage(userInfo.resString(R.string.ui_help_content));
         dlgAlert.setTitle(userInfo.resString(R.string.ui_help));
         dlgAlert.setPositiveButton(userInfo.resString(R.string.action_info_ok), new DialogInterface.OnClickListener() {

diff --git a/git-merge-lang.py b/git-merge-lang.py
diff --git a/make-release.py b/make-release.py
@@ -64,8 +64,7 @@ def readline(self):
 # aktualizacja zmian z bazy źródłowej
 print 'updating ' + guitarDBDir + '...'
 os.chdir(guitarDBDir)
-shellExec('git pull origin master')
-shellExec('git merge master')
+shellExec('git pull origin release-en')
 os.chdir('..')
 
 shellExec('cp ' + apkSrc + ' ' + apkOutputFile)

diff --git a/release/guitarDB b/release/guitarDB