Commit Graph
222 Commits
Author SHA1 Message Date
Peter Siegmund 46c47cc082 optimize build scripts 2015-07-14 10:51:04 +02:00
Peter Siegmund ec89a57255 Merge branch 'master' into ubilabs--rcapp--master 2015-06-25 20:46:01 +02:00
Peter Siegmund ead9169276 deactivate the Android Emulator Espresso tests - JUnit tests are still running on the local JVM 2015-06-23 13:58:25 +02:00
Peter Siegmund 33123aa3ba deactivate testing while build and moved it to a separate task 2015-06-19 15:30:26 +02:00
Peter Siegmund f72208dd6d Added JUnit tests for Android into build script (rcapp only yet) 2015-06-19 13:17:57 +02:00
Peter Siegmund 38d17f8242 Changed build-script to check correct exit codes (while using "tee" for writing build log) 2015-06-15 15:31:36 +02:00
Peter Siegmund 91851c44c3 Merge branch 'master' into ubilabs--rcapp--develop 2015-05-07 15:39:57 +02:00
Peter Siegmund 2d636dcdb5 unique Android Virtual Device name and it will be created in the current working place 2015-05-07 15:22:15 +02:00
Peter Siegmund 2b82383188 gradle output logging to root/build.log 2015-05-07 11:20:04 +02:00
Peter Siegmund 78dce178e5 Merge branch 'master' into ubilabs--rcapp--develop 2015-05-06 23:53:51 +02:00
Peter Siegmund fcad12919a Gradle: Android testing deactivated due to errors in hudson 2015-05-06 23:41:43 +02:00
Peter Siegmund 186ee9a184 build script ignores with -a the Android part 2015-05-06 14:42:17 +02:00
Peter Siegmund e8feee3df4 Merge branch 'master' into ubilabs--rcapp--develop 2015-05-06 11:32:59 +02:00
Bennet Brunsen 1ccd21186d Fixes build issue on hudson.
Changed sleep time after adb initialization from 10 to 60.
2015-04-23 10:51:20 +02:00
Axel Uhl 584f5350cb removed Hockey dependency; fixed proxy settings in build script for android SDK update 2015-04-22 16:24:10 +02:00
Axel Uhl dbea038349 adjusted finding of "android" tool so that it also works for Windows platform where it's called android.bat 2015-04-22 15:48:12 +02:00
Peter Siegmund 8b4c2d0f94 Gradle: increased waiting time for AmazonAWS for testing 2015-04-10 15:26:52 +02:00
Axel Uhl 75b04d8048 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-30 22:09:02 +02:00
Peter Siegmund 97a62e7ee6 Merge branch 'master' into ubilabs--rcapp--develop 2015-03-25 10:05:19 +01:00
Axel Uhl c72792595d clean up dist/ in release builds before build starts; avoid disk space leak 2015-03-24 23:10:41 +01:00
Peter Siegmund dcea592c33 Gradle: Updated Android Build Tools version 2015-03-22 15:18:53 +01:00
Peter Siegmund ea03e558e0 Update to targetApi 22 2015-03-17 12:31:58 +01:00
Peter Siegmund 61174f1bd2 Cherry Pick 5c85d9363482dab5c20f2caf0cbe1d8415d70044 2015-03-11 17:24:40 +01:00
Peter Siegmund 9b28056122 Gradle: improved build script 2015-03-09 12:32:56 +01:00
Peter Siegmund bc4d3fd08d Gradle: improved build script 2015-03-09 12:04:08 +01:00
Axel Uhl 330a889dd4 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-04 16:46:28 +01:00
Peter Siegmund 68c3957082 Merge branch 'master' into ubilabs--rcapp--develop 2015-03-04 09:20:56 +01:00
Axel Uhl f75c112959 fixed comment in buildAndUpdateProduct.sh 2015-03-04 00:37:56 +01:00
Peter Siegmund 197b4e039e Merge branch 'master' into feature/procedure_wizard 2015-02-16 12:56:03 +01:00
Axel Uhl 39b1c55a88 made compileable after master mergeMerge branch 'master' into ftes-mail-move-to-sse
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sse.security.test/META-INF/MANIFEST.MF
	java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java
	java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java
	java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2015-02-14 21:23:24 +01:00
Peter Siegmund b7de2dff53 Merge branch 'master' into feature/procedure_wizard 2015-02-13 16:30:07 +01:00
Simon Pamies 348fcd64b0 Added parameter to only execute a single testcase 2015-02-13 11:35:05 +01:00
Fredrik Teschke 9c375a3ae4 Merge remote-tracking branch 'origin/master' into android_apps_no_rcapp_changes
Conflicts:
	.gitignore
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	mobile/com.sap.sailing.android.shared/.classpath
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
2015-02-13 11:16:50 +01:00
Fredrik Teschke fa887140c8 Merge branch 'master' into ftes-mail-move-to-sse
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sse.security.ui/Security UI sdm.launch
	java/pom.xml
2015-02-12 18:14:21 +01:00
Axel Uhl d91257c8d6 Merge branch 'master' into ftes-mail-move-to-sse 2015-02-11 10:04:01 +01:00
Axel Uhl b9e3daf224 fixed -x option for gwt worker number setting 2015-02-10 22:31:11 +01:00
Axel Uhl 7ac80d71e3 Merge branch 'master' into ribdashboard; introduced gwt.workers property in maven build
Conflicts:
	configuration/buildAndUpdateProduct.sh
2015-02-10 15:27:01 +01:00
Axel Uhl 6f1d2229a5 preparing for configurable number of GWT workers 2015-02-10 15:03:02 +01:00
Axel Uhl 4e55e61c51 fixed merge problems in launch configs, adding file storage bundle everywhere 2015-02-10 14:37:41 +01:00
Fredrik Teschke e004c433cc pull out mail functionality into own service and bundle
- needs to live outside com.sap.sse due to dependency on replication
- use mail.properties instead of security.properties
- introduced ServiceTrackerFactory, which led to refactorings in SailingServiceImpl and ~Mock
2015-02-09 21:03:50 +01:00
Peter Siegmund 15bcca1b0c Revert "Gradle: don't stop executing the script, if gradle connectedCheck failed"
This reverts commit 36466b2128.
2015-01-28 15:09:56 +01:00
Peter Siegmund 7c7995a411 Revert "Gradle: don't stop executing the script, if gradle connectedCheck failed"
This reverts commit 36466b2128.
2015-01-28 15:09:56 +01:00
Peter Siegmund e5962a4ace Gradle: don't stop executing the script, if gradle connectedCheck failed 2015-01-28 14:05:07 +01:00
Peter Siegmund 36466b2128 Gradle: don't stop executing the script, if gradle connectedCheck failed 2015-01-28 14:05:07 +01:00
Peter Siegmund bb35a5d3c5 Gradle: change emulator to ARM for testing 2015-01-28 12:08:12 +01:00
Peter Siegmund fd09135e89 Gradle: change emulator to ARM for testing 2015-01-28 12:08:12 +01:00
Peter Siegmund 76819656bf Gradle: emulator start within the script and also termination 2015-01-26 13:00:24 +01:00
Peter Siegmund 401cb6b404 Gradle: emulator start within the script and also termination 2015-01-26 13:00:24 +01:00
Peter Siegmund d05e073970 Gradle: disabled Android unit tests within buildAndUpdateProduct 2015-01-26 11:03:37 +01:00
Peter Siegmund dce66e3d6e Gradle: disabled Android unit tests within buildAndUpdateProduct 2015-01-26 11:03:37 +01:00