diff options
author | Siva Velusamy <vsiva@google.com> | 2015-03-20 22:17:02 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 22:17:02 +0000 |
commit | 4c13b4eb0ccac376689aedd558932c1fa0c7fd6c (patch) | |
tree | 685455b8e1907eb54631a6b1305897eb2370ce43 | |
parent | bdce75a8de6881fc34b9ecbc55627aaa2a3c9a8d (diff) | |
parent | 9fb6db257d092cafc7f235fdd2d70f090efd5398 (diff) | |
download | sdk-4c13b4eb0ccac376689aedd558932c1fa0c7fd6c.zip sdk-4c13b4eb0ccac376689aedd558932c1fa0c7fd6c.tar.gz sdk-4c13b4eb0ccac376689aedd558932c1fa0c7fd6c.tar.bz2 |
am 9fb6db25: am 0d29dd07: Merge "Merge commit \'ae461d3\' into mmerge"
* commit '9fb6db257d092cafc7f235fdd2d70f090efd5398':
monitor: Remove old build scripts and instructions
-rw-r--r-- | monitor/Android.mk | 71 | ||||
-rw-r--r-- | monitor/HOWTO-BUILD | 15 | ||||
-rw-r--r-- | monitor/build.properties | 48 | ||||
-rw-r--r-- | monitor/build.xml | 105 |
4 files changed, 0 insertions, 239 deletions
diff --git a/monitor/Android.mk b/monitor/Android.mk deleted file mode 100644 index 8e3f000..0000000 --- a/monitor/Android.mk +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 2012 The Android Open Source Project - -# Temporarily disable building monitor -# The current mechanism for building monitor using PDE build does -# not work with Java7 on Macs. So building monitor is temporarily -# disabled until we figure out how to build monitor using Tycho -# and incorporate it into this build script. -# See b/8992787 -ifeq (0,1) - -# 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 -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=<platform> - -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 @@ -<project name="com.android.eclipse.rcp.build" default="build"> - <!-- Root of Android Source Tree --> - <property name="ANDROID_SRC" location="../../" /> - - <!-- Host Eclipse used for building the RCP --> - <property name="basebuilder" value="${ANDROID_SRC}/external/eclipse-basebuilder/basebuilder-3.6.2/org.eclipse.releng.basebuilder/" /> - - <!-- Source for target prebuilts --> - <property name="targetSrcDir" value="${ANDROID_SRC}/prebuilts/eclipse/" /> - - <!-- Location where build happens and resulting binaries are generated --> - <property name="outDir" value="${ANDROID_SRC}/out/host/eclipse/rcp/" /> - - <!-- Location where the target platform is created --> - <property name="targetDir" value="${outDir}/target" /> - - <!-- Location where the target platform is created --> - <property name="buildDir" value="${outDir}/build" /> - - <!-- Location of the sources --> - <property name="srcDir" value="${ANDROID_SRC}/sdk/eclipse/" /> - - <!-- Identify configurations to build --> - <condition property="buildconfigs" value="linux,gtk,x86 & linux,gtk,x86_64"> - <equals arg1="${buildFor}" arg2="linux" /> - </condition> - <condition property="buildconfigs" value="macosx,cocoa,x86_64"> - <equals arg1="${buildFor}" arg2="darwin" /> - </condition> - <condition property="buildconfigs" value="win32,win32,x86 & win32,win32,x86_64"> - <equals arg1="${buildFor}" arg2="windows" /> - </condition> - - <!-- if no platforms are provided, then build for all platforms --> - <property name="buildconfigs" value="linux,gtk,x86 & linux,gtk,x86_64 & win32,win32,x86 & win32,win32,x86_64 & macosx,cocoa,x86_64" /> - - <!-- locate launcher plugin inside eclipse --> - <path id="equinox.launcher.path"> - <fileset dir="${basebuilder}/plugins"> - <include name="org.eclipse.equinox.launcher_*.jar" /> - </fileset> - </path> - <property name="equinox.launcher" refid="equinox.launcher.path" /> - - <!-- locate pde build plugin inside eclipse --> - <path id="pde.build.dir.path"> - <dirset dir="${basebuilder}/plugins"> - <include name="org.eclipse.pde.build_*" /> - </dirset> - </path> - <property name="pde.build.dir" refid="pde.build.dir.path" /> - - <!-- create the build directory, copy plugins and features into it --> - <target name="copy_srcs"> - <mkdir dir="${buildDir}" /> - <copy todir="${buildDir}" preservelastmodified="true"> - <fileset dir="${srcDir}/"> - <include name="plugins/**" /> - <include name="features/**" /> - <exclude name="plugins/*/bin/**" /> - </fileset> - </copy> - </target> - - <!-- create target platform --> - <target name="create-target"> - <mkdir dir="${targetDir}" /> - <mkdir dir="${targetDir}/deltapack" /> - <mkdir dir="${targetDir}/repos" /> - - <unzip src="${targetSrcDir}/deltapack/eclipse-3.7.2-delta-pack.zip" dest="${targetDir}/deltapack" overwrite="false" /> - <unzip src="${targetSrcDir}/platform/org.eclipse.platform-3.7.2.zip" dest="${targetDir}/repos/platform" overwrite="false" /> - </target> - - <!-- Launch pde build --> - <target name="pde-build" depends="copy_srcs, create-target"> - <java classname="org.eclipse.equinox.launcher.Main" fork="true" failonerror="true"> - <arg value="-application" /> - <arg value="org.eclipse.ant.core.antRunner" /> - <arg value="-buildfile" /> - <arg value="${pde.build.dir}/scripts/productBuild/productBuild.xml" /> - <arg value="-data" /> - <arg value="${buildDir}/workspace" /> - <arg value="-configuration" /> - <arg value="${buildDir}/configuration" /> - <arg value="-Dtimestamp=${timestamp}" /> - <arg value="-DeclipseLocation=${baseBuilder}" /> - <arg value="-DbuildDirectory=${buildDir}" /> - <arg value="-DbaseLocation=${targetDir}/deltapack/eclipse" /> - <arg value="-DrepoBaseLocation=${targetDir}/repos/" /> - <arg value="-DtransformedRepoLocation=${targetDir}/transformedRepos/" /> - <arg value="-Dconfigs=${buildconfigs}" /> - <classpath> - <pathelement location="${equinox.launcher}" /> - </classpath> - </java> - </target> - - <target name="clean"> - <delete dir="${outDir}" /> - <delete dir="${targetDir}" /> - </target> - - <target name="build" depends="pde-build" /> -</project> |