Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133

automerge: f68260f

* commit 'f68260f91fe2eee6687d6108eaff2d8f9319937d':
  monitor: Move from sdk/ to sdk/eclipse

4 files changed, 188 insertions, 0 deletions

diff --git a/eclipse/monitor/build.gradle b/eclipse/monitor/build.gradle
new file mode 100644
index 0000000..03cd8fd
--- /dev/null
+++ b/eclipse/monitor/build.gradle
@@ -0,0 +1,111 @@
+apply plugin: 'sdk-files'
+
+def basePath = "../../../out/host/maven/bundles-23.0.3-SNAPSHOT/products/"
+
+sdk {
+    linux {
+        item('monitor') {
+            notice null
+            executable true
+        }
+        item(basePath + 'lin64/monitor') {
+            into 'lib/monitor-x86_64'
+            notice null
+            builtBy 'unzipLinux64'
+        }
+        item(basePath + 'lin/monitor') {
+            into 'lib/monitor-x86'
+            notice null
+            builtBy 'unzipLinux'
+        }
+    }
+
+    mac {
+        item('monitor') {
+            notice null
+            executable true
+        }
+        item(basePath + 'mac64/monitor') {
+            into 'lib/monitor-x86_64'
+            notice null
+            builtBy 'unzipMac64'
+        }
+    }
+
+
+    windows {
+        item('monitor.bat') {
+            notice null
+            executable true
+        }
+        item(basePath + 'win64/monitor') {
+            into 'lib/monitor-x86_64'
+            notice null
+            builtBy 'unzipWin64'
+        }
+        item(basePath + 'win/monitor') {
+            into 'lib/monitor-x86'
+            notice null
+            builtBy 'unzipWin'
+        }
+    }
+}
+
+// Using PDE build, the size of monitor was 43M
+// With Tycho, we are at close to 75M. Until we figure out the proper way
+// to exclude unnecessary content, we just remove these plugins from the final build.
+def pluginsToRemove = [
+    'org.eclipse.platform.doc.user_4.2.2.v20130121-200410.jar',
+    'org.eclipse.debug.ui_3.8.2.v20130130-171415.ja',
+    'org.apache.jasper.glassfish_2.2.2.v201205150955.jar',
+    'org.eclipse.team.ui_3.6.201.v20130125-135424.jar',
+    'org.apache.lucene.core_2.9.1.v201101211721.jar',
+    'org.eclipse.help.webapp_3.6.101.v20130116-182509.jar',
+    'org.eclipse.help.ui_3.5.201.v20130108-092756.jar',
+    'org.eclipse.help.base_3.6.101.v201302041200.jar',
+    'org.eclipse.team.core_3.6.100.v20120524-0627.jar',
+    'org.eclipse.jetty.server_8.1.3.v20120522.jar',
+    'org.eclipse.ui.intro_3.4.200.v20120521-2344.jar',
+    'org.eclipse.ui.cheatsheets_3.4.200.v20120521-2344.jar',
+    'org.apache.ant_1.8.3.v201301120609/**'
+]
+
+task unzipLinux64(type: Copy) {
+    from zipTree(file(basePath + 'monitorproduct-linux.gtk.x86_64.zip'))
+    into file(basePath + 'lin64/')
+    pluginsToRemove.each {
+        exclude "**/$it"
+    }
+}
+
+task unzipLinux(type: Copy) {
+    from zipTree(file(basePath + 'monitorproduct-linux.gtk.x86.zip'))
+    into file(basePath + 'lin/')
+    pluginsToRemove.each {
+        exclude "**/$it"
+    }
+}
+
+task unzipMac64(type: Copy) {
+    from zipTree(file(basePath + 'monitorproduct-macosx.cocoa.x86_64.zip'))
+    into file(basePath + 'mac64/')
+    pluginsToRemove.each {
+        exclude "**/$it"
+    }
+}
+
+task unzipWin64(type: Copy) {
+    from zipTree(file(basePath + 'monitorproduct-win32.win32.x86_64.zip'))
+    into file(basePath + 'win64/')
+    pluginsToRemove.each {
+        exclude "**/$it"
+    }
+}
+
+task unzipWin(type: Copy) {
+    from zipTree(file(basePath + 'monitorproduct-win32.win32.x86.zip'))
+    into file(basePath + 'win/')
+    pluginsToRemove.each {
+        exclude "**/$it"
+    }
+}
diff --git a/eclipse/monitor/monitor b/eclipse/monitor/monitor
new file mode 100755
index 0000000..53a2bb5
--- /dev/null
+++ b/eclipse/monitor/monitor
@@ -0,0 +1,44 @@
+#!/bin/bash
+# Copyright 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.
+
+# Set up prog to be the path of this script, including following symlinks,
+# and set up progdir to be the fully-qualified pathname of its directory.
+prog="$0"
+while [ -h "${prog}" ]; do
+    newProg=`/bin/ls -ld "${prog}"`
+    newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
+    if expr "x${newProg}" : 'x/' >/dev/null; then
+        prog="${newProg}"
+    else
+        progdir=`dirname "${prog}"`
+        prog="${progdir}/${newProg}"
+    fi
+done
+oldwd=`pwd`
+progdir=`dirname "${prog}"`
+cd "${progdir}"
+
+javaCmd="java"
+
+vmarch=`${javaCmd} -jar lib/archquery.jar`
+
+app=lib/monitor-${vmarch}/monitor
+if [[ "Darwin" == `uname` ]]; then
+  app=${app}.app/Contents/MacOS/monitor
+fi
+
+
+exec $app
+
diff --git a/eclipse/monitor/monitor.bat b/eclipse/monitor/monitor.bat
new file mode 100755
index 0000000..aab18ae
--- /dev/null
+++ b/eclipse/monitor/monitor.bat
@@ -0,0 +1,32 @@
+@echo off

+rem Copyright (C) 2012 The Android Open Source Project

+rem

+rem Licensed under the Apache License, Version 2.0 (the "License");

+rem you may not use this file except in compliance with the License.

+rem You may obtain a copy of the License at

+rem

+rem      http://www.apache.org/licenses/LICENSE-2.0

+rem

+rem Unless required by applicable law or agreed to in writing, software

+rem distributed under the License is distributed on an "AS IS" BASIS,

+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+rem See the License for the specific language governing permissions and

+rem limitations under the License.

+

+rem don't modify the caller's environment

+setlocal

+

+rem Change current directory and drive to where the script is, to avoid

+rem issues with directories containing whitespaces.

+cd /d %~dp0

+

+rem Check we have a valid Java.exe in the path.

+set java_exe=

+call lib\find_java.bat

+if not defined java_exe goto :EOF

+

+:QueryArch

+for /f "delims=" %%a in ('"%java_exe%" -jar lib\archquery.jar') do set vmarch=%%a

+

+start lib\monitor-%vmarch%\monitor

+

diff --git a/eclipse/scripts/update_version.sh b/eclipse/scripts/update_version.sh
index d3b71b1..228be97 100755
--- a/eclipse/scripts/update_version.sh
+++ b/eclipse/scripts/update_version.sh
@@ -56,6 +56,7 @@ done
 SED_OLD="${OLD//./\.}"
 SED_NEW="${NEW//./\.}"
 for i in artifacts/*/pom.xml \
+         monitor/build.gradle \
          plugins/com.android.ide.eclipse.adt.package/ide.product   \
          plugins/com.android.ide.eclipse.monitor/monitor.product   \
          plugins/com.android.ide.eclipse.monitor/plugin.properties \