From cdaea483174bb7fdcca864de23f9ede7d6d45a5b Mon Sep 17 00:00:00 2001 From: Siva Velusamy Date: Wed, 23 Jul 2014 11:46:10 -0700 Subject: monitor: Remove old build scripts and instructions Change-Id: Ieff81be1ef4ecf73de2c4946e7c21988bcac768d --- monitor/Android.mk | 62 ---------------------------- monitor/HOWTO-BUILD | 15 ------- monitor/build.properties | 48 ---------------------- monitor/build.xml | 105 ----------------------------------------------- 4 files changed, 230 deletions(-) delete mode 100644 monitor/Android.mk delete mode 100644 monitor/HOWTO-BUILD delete mode 100644 monitor/build.properties delete mode 100644 monitor/build.xml diff --git a/monitor/Android.mk b/monitor/Android.mk deleted file mode 100644 index 60e4966..0000000 --- a/monitor/Android.mk +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2012 The Android Open Source Project - -# Expose the Monitor RCP only for the SDK builds. -ifneq (,$(is_sdk_build)$(filter sdk sdk_x86 sdk_mips,$(TARGET_PRODUCT))) - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := monitor -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -LOCAL_IS_HOST_MODULE := true -include $(BUILD_SYSTEM)/base_rules.mk - -RCP_LOG_FILE := out/host/eclipse/rcp/build/monitor.log -RCP_MONITOR_DIR := $(TOPDIR)out/host/eclipse/rcp/build/I.RcpBuild - -define mk-rcp-monitor-atree-file - srczip=$(RCP_MONITOR_DIR)/RcpBuild-$(1).$(2).zip && \ - dstdir=$(HOST_OUT)/eclipse/monitor-$(1).$(2) && \ - rm -rf $(V) $$dstdir && \ - mkdir -p $$dstdir && \ - unzip -q $$srczip -d $$dstdir -endef - -MONITOR_DEP_LIBRARIES := $(shell $(TOPDIR)sdk/eclipse/scripts/create_all_symlinks.sh -d) -MONITOR_DEPS := $(foreach m,$(MONITOR_DEP_LIBRARIES),$(HOST_OUT_JAVA_LIBRARIES)/$(m).jar) - -# The RCP monitor. It is referenced by build/target/products/sdk.mk -$(LOCAL_BUILT_MODULE) : $(TOPDIR)sdk/monitor/monitor \ - $(TOPDIR)sdk/monitor/build.xml \ - $(TOPDIR)sdk/monitor/build.properties \ - $(MONITOR_DEPS) - @mkdir -p $(dir $@) - $(hide) $(TOPDIR)sdk/eclipse/scripts/create_all_symlinks.sh -c - $(hide)cd $(TOPDIR)sdk/monitor && \ - rm -f ../../$(RCP_LOG_FILE) && mkdir -p ../../$(dir $(RCP_LOG_FILE)) && \ - ( java -jar ../../external/eclipse-basebuilder/basebuilder-3.6.2/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar \ - org.eclipse.equinox.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -configuration ../../out/host/eclipse/rcp/build/configuration \ - -DbuildFor=$(HOST_OS) 2>&1 && \ - mv -f ../../$(RCP_LOG_FILE) ../../$(RCP_LOG_FILE).1 ) \ - | tee ../../$(RCP_LOG_FILE) \ - | sed -E '/\[java\]/!d; /SUCCESSFUL/d ; s/^ +\[java\] //; /^ *$$/d; /:$$/d; /\[javac\] [^C]/d; s/^/monitor: /'; \ - if [[ -f ../../$(RCP_LOG_FILE) ]]; then \ - echo "Monitor failed. Full log:" ; \ - cat ../../$(RCP_LOG_FILE) ; \ - exit 1 ; \ - fi - $(hide)if [[ $(HOST_OS) == "linux" ]]; then \ - $(call mk-rcp-monitor-atree-file,linux.gtk,x86) ; \ - $(call mk-rcp-monitor-atree-file,linux.gtk,x86_64) ; \ - elif [[ $(HOST_OS) == "darwin" ]]; then \ - $(call mk-rcp-monitor-atree-file,macosx.cocoa,x86_64) ; \ - elif [[ $(HOST_OS) == "windows" ]]; then \ - $(call mk-rcp-monitor-atree-file,win32.win32,x86) ; \ - $(call mk-rcp-monitor-atree-file,win32.win32,x86_64) ; \ - fi - $(hide)$(ACP) -fp $(V) $(TOPDIR)sdk/monitor/monitor $@ - -endif diff --git a/monitor/HOWTO-BUILD b/monitor/HOWTO-BUILD deleted file mode 100644 index 38d1c23..0000000 --- a/monitor/HOWTO-BUILD +++ /dev/null @@ -1,15 +0,0 @@ -To build the Monitor RCP based application, do: - -$ lunch sdk-eng -$ ./sdk/eclipse/scripts/create_all_symlinks.sh -$ cd sdk/monitor -$ ant - -This will build the RCP for all the platforms in the folder: -$ANDROID_SRC/out/host/eclipse/rcp/build/I.RcpBuild/ - -To build only a subset of platforms, use: - -ant -DbuildFor= - -where platform is one of linux, darwin or windows. diff --git a/monitor/build.properties b/monitor/build.properties deleted file mode 100644 index b104b77..0000000 --- a/monitor/build.properties +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (C) 2012 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -############# PRODUCT/PACKAGING CONTROL ############# -product=/com.android.ide.eclipse.monitor/monitor.product -runPackager=true -archivePrefix=monitor -collectingFolder=${archivePrefix} -allowBinaryCycles = true -buildType=I -buildId=RcpBuild -buildLabel=${buildType}.${buildId} -timestamp=007 -launcherName=monitor - -############# BASE CONTROL ############# -baseos=linux -basews=gtk -basearch=x86_64 -filteredDependencyCheck=false -resolution.devMode=false -skipBase=true - -############# MAP FILE CONTROL ################ -skipMaps=true - -############ REPOSITORY CONTROL ############### -skipFetch=true - -############# JAVA COMPILER OPTIONS ############## -compilerArg=-warn:none -logExtension=.log -javacDebugInfo=false -javacFailOnError=true -javacVerbose=true -javacSource=1.6 -javacTarget=1.6 diff --git a/monitor/build.xml b/monitor/build.xml deleted file mode 100644 index d3c2d94..0000000 --- a/monitor/build.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.1