From 1e880631c2c2ea6d92d004a8b353dd3ba948626f Mon Sep 17 00:00:00 2001 From: Eric Cloninger Date: Thu, 20 Sep 2012 13:29:52 -0500 Subject: Updates to makefiles and sources to support third-party builds These changes remove some unnecessary information from the build files, such as email addresses of recipients when a build finishes. Also removes the RSS plugin dependency since it isn't required for these plugins. Fix a cast that raised an error on strict compilation settings. Removed signing from build.properties. Change-Id: Id824ccd827ddf6558fe673042207910e0b4e4ca5 --- makefile/build.properties | 1 - makefile/build_server_structure.txt | 3 +++ makefile/config.xml | 12 ------------ makefile/eant | 9 +++++---- makefile/studioBuild.properties | 6 +----- makefile/studioBuild.xml | 2 +- .../com/motorola/studio/android/nativeos/NativeUI.java | 2 +- src/plugins/android/plugin.xml | 18 ------------------ 8 files changed, 11 insertions(+), 42 deletions(-) diff --git a/makefile/build.properties b/makefile/build.properties index b7fcb9b..a231eef 100644 --- a/makefile/build.properties +++ b/makefile/build.properties @@ -19,7 +19,6 @@ DDMS_JAR_FILENAME = com.android.ide.eclipse.ddms_20.0.2.v201207191942-407447 STUDIO_ROOT_BINARY = com.motorola.studio.android.android_root SIGNTOOL = ${BASE_DIR}/env/osslsigncode -AUTHENTICODE_KEY = ${INPUT_DIR}/sign/MOTODEV_Studio_Authenticode_USMOTOX214.pvk ##################### # Parameters describing how and where to execute the build. diff --git a/makefile/build_server_structure.txt b/makefile/build_server_structure.txt index 26fc5f1..973603b 100644 --- a/makefile/build_server_structure.txt +++ b/makefile/build_server_structure.txt @@ -3,6 +3,9 @@ .//env .//env/ant-contrib .//env/code +.//env/code/android +.//env/code/android/makefile +.//env/code/android/src .//env/eclipse .//input .//input/repository diff --git a/makefile/config.xml b/makefile/config.xml index 7a7413f..0caa24a 100644 --- a/makefile/config.xml +++ b/makefile/config.xml @@ -45,18 +45,6 @@ - - - - - - diff --git a/makefile/eant b/makefile/eant index d97f35f..141726a 100644 --- a/makefile/eant +++ b/makefile/eant @@ -7,11 +7,12 @@ export BUILD_BASE_PATH=/android/5.0.0 #[2012.03.03] Forcing git to update #Investigate later if bootstraper from config.xml is being used -echo Forcing git to update -chmod 0777 $BUILD_BASE_PATH/env/code/android/makefile/scripts/git_update.sh -$BUILD_BASE_PATH/env/code/android/makefile/scripts/git_update.sh +#echo Forcing git to update +#chmod 0777 $BUILD_BASE_PATH/env/code/android/makefile/scripts/git_update.sh +#$BUILD_BASE_PATH/env/code/android/makefile/scripts/git_update.sh -$BUILD_BASE_PATH/env/eclipse/eclipse -nosplash -application org.eclipse.ant.core.antRunner -data $BUILD_BASE_PATH/env/workspace_product -buildfile $BUILD_BASE_PATH/env/code/android/makefile/studioBuild.xml -logger org.apache.tools.ant.XmlLogger -logfile $BUILD_BASE_PATH/log.xml +$BUILD_BASE_PATH/env/eclipse/eclipse -nosplash -application org.eclipse.ant.core.antRunner -data $BUILD_BASE_PATH/env/workspace_product -buildfile $BUILD_BASE_PATH/env/code/android/makefile/studioBuild.xml -debug +#-logger org.apache.tools.ant.XmlLogger -logfile $BUILD_BASE_PATH/log.xml diff --git a/makefile/studioBuild.properties b/makefile/studioBuild.properties index 77d26a8..9c712dc 100644 --- a/makefile/studioBuild.properties +++ b/makefile/studioBuild.properties @@ -9,11 +9,7 @@ OUTPUT_METADATA_PRODUCT = ${OUTPUT_DIR}/repository_product OUTPUT_METADATA_STUDIO = ${OUTPUT_DIR}/repository_studio OUTPUT_METADATA_STUDIO_BASIC = ${OUTPUT_DIR}/repository_studio_basic OUTPUT_METADATA_STUDIO_FULL = ${OUTPUT_DIR}/repository_full -OUTPUT_UPDATESITE_NDK = ${OUTPUT_DIR}/ndk -OUTPUT_UPDATESITE_ADDITIONS = ${OUTPUT_DIR}/additions -OUTPUT_LANGPACK_INSTALLER = ${LANG_REPOSITORIES_DIR}/REPO_STUDIO_INSTALLER -OUTPUT_LANGPACK_APPVALIDATOR = ${LANG_REPOSITORIES_DIR}/REPO_APPVALIDATOR -OUTPUT_UPDATESITE_LANGPACK = ${LANG_REPOSITORIES_DIR}/REPO_STUDIO_UPDATESITE + SETTINGS_DIR = ${MAKEFILE}/repository_settings diff --git a/makefile/studioBuild.xml b/makefile/studioBuild.xml index 85c8331..5b09735 100644 --- a/makefile/studioBuild.xml +++ b/makefile/studioBuild.xml @@ -29,7 +29,7 @@ - + diff --git a/src/plugins/android.win32.x86/src/com/motorola/studio/android/nativeos/NativeUI.java b/src/plugins/android.win32.x86/src/com/motorola/studio/android/nativeos/NativeUI.java index c70f3a5..f1780b9 100644 --- a/src/plugins/android.win32.x86/src/com/motorola/studio/android/nativeos/NativeUI.java +++ b/src/plugins/android.win32.x86/src/com/motorola/studio/android/nativeos/NativeUI.java @@ -61,7 +61,7 @@ public class NativeUI implements INativeUI public long getWindowHandle(String windowName) { StudioLogger.debug(this, "Get native window handler for: " + windowName); - int windowHandle = 0; + long windowHandle = 0; try { TCHAR className = null; diff --git a/src/plugins/android/plugin.xml b/src/plugins/android/plugin.xml index 17abdc0..b2709ac 100644 --- a/src/plugins/android/plugin.xml +++ b/src/plugins/android/plugin.xml @@ -260,24 +260,6 @@ logFileImpl="com.motorola.studio.android.logger.AppValidatorLogCollector"> - - - - - - - -