Commit Graph

41 Commits (5f70cc011cd131acb5cd29783fa6744059841aee)

Author SHA1 Message Date
Martin Matuska dedc1ee7fe Merge remote-tracking branch 'upstream/master'
Remove hide ActionBar preference

Conflicts:
	AndroidManifest.xml
	build.xml
	project.properties
	res/values/notrans.xml
	src/org/connectbot/service/TerminalKeyListener.java
	src/sk/vx/connectbot/util/PreferenceConstants.java
2012-11-23 09:37:59 +01:00
Torne (Richard Coles) c86b65112c Handle git version differently to fix Eclipse builds.
Unfortunately Eclipse appears to be too dumb to generate the version and
build it correctly (even using an external build step it fails to
rebuild resources afterward), so go back to having a dummy version
checked into the repository. Run git update-index --assume-unchanged on
the file before updating the version, so that git doesn't consider the
file to have changed, instead.
2012-10-28 10:11:21 +00:00
Torne (Richard Coles) 9ed7b4fd29 Fix broken git version generation.
The regex to edit res/values/notrans.xml no longer matched, so the
version number wasn't being edited. Generate the version number into a
separate resource file that isn't checked in instead, as this is neater.
2012-10-27 21:51:30 +01:00
Kenny Root ceba6acbac Remove target for clean since tests will clean tested project 2012-10-24 12:46:09 -07:00
Kenny Root 0b7eafa0fd Add targets for lint output 2012-10-21 22:42:55 -07:00
Kenny Root 570dda3042 Move custom build stuff after SDK include statement 2012-10-21 22:42:36 -07:00
Kenny Root 549c087c18 Add vim modeline for my sanity 2012-10-21 22:39:48 -07:00
Martin Matuska e398b3e8e3 Merge upstream commit 'a1894f46e614'
Conflicts:
	AndroidManifest.xml
2011-12-27 12:15:35 +01:00
Kenny Root a1894f46e6 Add support for Google TV devices 2011-12-19 18:09:11 -06:00
Martin Matuska 15c1df5dca Change project name in build.xml 2011-12-06 21:22:54 +01:00
Kenny Root 65128e6746 Fix translations layout arguments 2011-10-20 10:20:39 -07:00
Kenny Root 4476f11494 Update build script to new tools 2011-10-19 01:03:51 -07:00
Kenny Root 3811f3274a Fix the tests subdir clean target 2011-10-15 14:21:46 -07:00
Kenny Root 94fd73f990 Remove custom ProGuard targets for SDK way 2011-08-14 23:27:45 -07:00
Kenny Root c5a270ca26 Add Ant commands to import and export translations 2010-10-27 12:18:06 -05:00
Kenny Root 7a35c56565 Restore update-version ant task 2010-09-19 03:25:11 -05:00
Kenny Root ecdaa414a6 Do elaborate dance to allow toggling Proguard to work 2010-09-19 03:13:12 -05:00
Kenny Root eedcd8b18f Update build.xml to use the SDK tools r7 format
* Remove all the copied setup tasks and replace it with the
  "-post-compile" hook added in the SDK tools r7 template.

* Move Proguard flags out to a separate file.
2010-09-19 02:23:41 -05:00
Kenny Root 0c8ce5d611 Only match tags that start with v[0-9]*
Also ignore notrans.xml because it only contains our version
information.
2010-09-18 21:20:34 -05:00
Kenny Root 5457d8c910 Update build.xml to use dirty git descriptions 2010-09-17 19:25:39 -05:00
Kenny Root d100aed83a Update build.xml for Git 2010-08-21 16:10:38 -07:00
Kenny Root b995547c3a More build.xml cleanups
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@447 df292f66-193f-0410-a5fc-6d59da041ff2
2009-12-18 20:04:17 +00:00
Kenny Root bada2a32d3 Update README and build.xml for Eclair
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@446 df292f66-193f-0410-a5fc-6d59da041ff2
2009-12-18 19:43:15 +00:00
Kenny Root dc44bd9a71 Update translations
Split out things that shouldn't be translated into a separate file.
Update the build.xml to change the version string in notrans.xml
instead. Add Finnish and Vietnamese. Update other languages.

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@384 df292f66-193f-0410-a5fc-6d59da041ff2
2009-08-11 05:49:54 +00:00
Kenny Root d9ff9718e7 Rollback proguard optimization settings
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@364 df292f66-193f-0410-a5fc-6d59da041ff2
2009-07-09 17:24:27 +00:00
Kenny Root ffd51b54f7 Go faster
* Remove checkBounds from vt320 which masks bugs
* Inline markLine since we have no JIT to forklift it

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@362 df292f66-193f-0410-a5fc-6d59da041ff2
2009-07-09 15:09:40 +00:00
Kenny Root 08dfa5bea3 Fix JTA author names in source file to be UTF-8 again, dump proguard stats to bin/proguard.usage, remove SoftFont since CB does not use it
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@344 df292f66-193f-0410-a5fc-6d59da041ff2
2009-06-27 21:00:44 +00:00
Kenny Root def81724c1 fix ProGuard syntax error in build.xml
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@343 df292f66-193f-0410-a5fc-6d59da041ff2
2009-06-27 20:55:30 +00:00
Kenny Root 434de6974c Keep all ConnectBot classes when building with ProGuard
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@340 df292f66-193f-0410-a5fc-6d59da041ff2
2009-06-27 17:00:13 +00:00
Kenny Root 9184616dc5 Do not let ProGuard break compression
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@338 df292f66-193f-0410-a5fc-6d59da041ff2
2009-06-27 02:50:07 +00:00
Kenny Root 2c91e296b9 Add proguard to build.xml
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@337 df292f66-193f-0410-a5fc-6d59da041ff2
2009-06-27 02:04:06 +00:00
Kenny Root fa1d8fa6dc Fix tab issue in build.xml
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@263 df292f66-193f-0410-a5fc-6d59da041ff2
2009-06-02 22:42:40 +00:00
Kenny Root 8d37fc2a94 Add "clean" and "tests" ant tasks into build.xml
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@262 df292f66-193f-0410-a5fc-6d59da041ff2
2009-06-02 17:33:36 +00:00
Kenny Root 9160ff61e2 Add in SDK 1.5 generated tests subdir
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@218 df292f66-193f-0410-a5fc-6d59da041ff2
2009-05-05 19:37:27 +00:00
Kenny Root 8f9c8b169a Tweak build.xml for new variable names and to quelch complaints about UTF-8 comments
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@216 df292f66-193f-0410-a5fc-6d59da041ff2
2009-05-05 19:11:18 +00:00
Kenny Root dd2564469d Update Ant build system for SDK 1.5
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@215 df292f66-193f-0410-a5fc-6d59da041ff2
2009-05-05 18:02:17 +00:00
Kenny Root deca64c525 Bug scrub
* Try to be better about unsynchronized accesses
* Don't expose references to arrays in our beans
* Make sure we don't dereference null pointers
* Update version string before calling aapt
2009-01-20 22:46:48 +00:00
Kenny Root 839269b701 Get rid of ant-contrib.jar 2009-01-19 13:42:29 +00:00
Jeffrey Sharkey c23b3f8ff1 oops, disabled the build.xml update-version for my local build but was caught in last submit, reverting 2008-12-29 23:46:02 +00:00
Jeffrey Sharkey 25e660d37f * Added "bumpy arrows" so that arrow keys trigger vibration, useful for laggy connections. Also added preference to turn off if desired.
* Created windowNoTitle style to prevent brief flashing of title bar on ConsoleActivity, instead of requesting programatically.
* Slight padding change to EULA screen.
2008-12-29 23:43:42 +00:00
Kenny Root 34a2c4a660 * Added automatic version number insertion via Ant
* Removed unused cruft
* Changed Class to Object in PromptHelper.java
2008-10-30 21:35:05 +00:00