[androidsdk-tools] 41/51: Download orig version 22, update scripts and paths
Tony Mancill
tmancill at moszumanska.debian.org
Sun Nov 23 23:37:59 GMT 2014
This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository androidsdk-tools.
commit 4184c59b3a9fb2df9ded7453510a91b40e47c7ae
Author: Jakub Adam <jakub.adam at tieto.com>
Date: Mon Apr 22 08:51:56 2013 +0200
Download orig version 22, update scripts and paths
---
debian/changelog | 2 +-
debian/javabuild | 8 ++++----
debian/orig-tar.sh | 27 +++++++++++++++++++--------
debian/rules | 18 ++++++++++--------
4 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b0a909f..702d392 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-androidsdk-tools (21.1+git20130308~3b5a15e-1) UNRELEASED; urgency=low
+androidsdk-tools (22+git20130416~f55ffbb-1) UNRELEASED; urgency=low
* Initial release (Closes: #687057).
diff --git a/debian/javabuild b/debian/javabuild
index b7cb83b..8ad27d5 100644
--- a/debian/javabuild
+++ b/debian/javabuild
@@ -1,11 +1,11 @@
androidsdk-common.jar common/src
-androidsdk-sdklib.jar sdkmanager/libs/sdklib/src
+androidsdk-sdklib.jar sdklib/src
androidsdk-sdkstats.jar sdkstats/src
androidsdk-swtmenubar.jar swtmenubar/src
-androidsdk-ddmlib.jar ddms/libs/ddmlib/src
-androidsdk-ddmuilib.jar ddms/libs/ddmuilib/src
+androidsdk-ddmlib.jar ddmlib/src
+androidsdk-ddmuilib.jar ddms/ddmuilib/src
androidsdk-ddms.jar ddms/app/src
-androidsdk-hierarchyviewerlib.jar hierarchyviewer2/libs/hierarchyviewerlib/src
+androidsdk-hierarchyviewerlib.jar hierarchyviewer2/hierarchyviewer2lib/src
androidsdk-hierarchyviewer.jar hierarchyviewer2/app/src
androidsdk-traceview.jar traceview/src
androidsdk-uiautomatorviewer.jar uiautomatorviewer/src
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 901b529..fb786c3 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -11,21 +11,31 @@ then
exit
fi
-REVISION=21.1
+REVISION=22
+
+git clone -b tools_r$REVISION https://android.googlesource.com/platform/tools/swt androidsdk-tools
+git clone -b tools_r$REVISION https://android.googlesource.com/platform/tools/base androidsdk-base
+
+# Merge sources into a single directory
+mv androidsdk-base/common androidsdk-base/sdklib androidsdk-base/ddmlib androidsdk-tools
+rm -fr androidsdk-base
-git clone -b tools_r$REVISION https://android.googlesource.com/platform/sdk androidsdk-tools
VERSION=`git --git-dir=androidsdk-tools/.git log -1 --format=%cd~%h --date=short | sed s/-//g`
echo "Version "$VERSION
echo "Deleting not needed files ..."
-rm -fr `find androidsdk-tools -maxdepth 1 -type d ! -name androidsdk-tools ! -name common ! -name sdkmanager ! -name sdkstats ! -name swtmenubar ! -name ddms ! -name hierarchyviewer2 ! -name traceview ! -name uiautomatorviewer`
+rm -fr `find androidsdk-tools -maxdepth 1 -type d ! -name androidsdk-tools ! -name common ! -name sdklib ! -name sdkmanager ! -name sdkstats ! -name swtmenubar ! -name ddms ! -name ddmlib ! -name hierarchyviewer2 ! -name traceview ! -name uiautomatorviewer`
rm -fr androidsdk-tools/common/src/test
-rm -fr androidsdk-tools/sdkmanager/libs/sdklib/src/test
+rm -fr androidsdk-tools/sdklib/src/test
+rm -fr androidsdk-tools/sdkstats/src/test
+rm -fr androidsdk-tools/ddms/src/test
+rm -fr androidsdk-tools/ddmlib/src/test
rm -fr androidsdk-tools/sdkmanager/app
rm -fr androidsdk-tools/sdkmanager/libs/sdkuilib
-rm -fr androidsdk-tools/ddms/libs/ddmlib/src/test androidsdk-tools/ddms/libs/ddmuilib/tests
-rm -fr `find androidsdk-tools/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib -maxdepth 1 ! -name sdklib ! -name build ! -name util ! -name internal ! -name SdkConstants.java ! -name ISdkLog.java`
-rm -fr `find androidsdk-tools/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal -type d ! -name internal ! -name build`
-rm -fr androidsdk-tools/sdkmanager/libs/sdklib/src/main/java/com/android/sdklib/internal/build/MakeIdentity.java
+rm -fr androidsdk-tools/ddms/ddmuilib/src/test
+rm -fr `find androidsdk-tools/sdklib/src/main/java/com/android/sdklib -maxdepth 1 ! -name sdklib ! -name build ! -name util ! -name internal`
+rm -fr `find androidsdk-tools/sdklib/src/main/java/com/android/sdklib/internal -type d ! -name internal ! -name build`
+rm -fr androidsdk-tools/sdklib/src/main/java/com/android/sdklib/build
+rm -fr androidsdk-tools/sdklib/src/main/java/com/android/sdklib/internal/build
# rm -fr `find androidsdk-tools -name ".*"` # this might be too strict in some later versions
rm -fr androidsdk-tools/sdkmanager/.gitignore
rm -fr androidsdk-tools/sdkmanager/libs/sdklib/.settings
@@ -36,6 +46,7 @@ rm -fr androidsdk-tools/common/.project
rm -fr androidsdk-tools/common/.settings
rm -fr androidsdk-tools/common/.gitignore
rm -fr androidsdk-tools/.gitignore
+find androidsdk-tools -type f -name *gradle* -delete
echo "Packaging archive into ../android-sdk-tools_$REVISION+git$VERSION.orig.tar.xz ..."
tar -cJf ../androidsdk-tools_$REVISION+git$VERSION.orig.tar.xz androidsdk-tools
diff --git a/debian/rules b/debian/rules
index 88239b0..184c174 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,30 +10,32 @@ common-post-build-indep::
bnd wrap -properties $$BNDFILE -output $$JARNAME $$JARNAME; \
done
- jar uf androidsdk-ddmuilib.jar -C ddms/libs/ddmuilib/src images
+ jar uf androidsdk-ddmuilib.jar -C ddms/ddmuilib/src/main/java images
- jar uf androidsdk-ddms.jar -C ddms/app/src images
+ jar uf androidsdk-ddms.jar -C ddms/app/src/main/resources images
jh_manifest -m com.android.ddms.Main androidsdk-ddms.jar
- jar uf androidsdk-hierarchyviewerlib.jar -C hierarchyviewer2/libs/hierarchyviewerlib/src images
+ jar uf androidsdk-hierarchyviewerlib.jar -C hierarchyviewer2/hierarchyviewer2lib/src/main/java images
jh_manifest -m com.android.hierarchyviewer.HierarchyViewerApplication androidsdk-hierarchyviewer.jar
- jar uf androidsdk-traceview.jar -C traceview/src/resources icons
+ jar uf androidsdk-traceview.jar -C traceview/src/main/resources icons
jh_manifest -m com.android.traceview.MainWindow androidsdk-traceview.jar
- jar uf androidsdk-uiautomatorviewer.jar -C uiautomatorviewer/src images
+ jar uf androidsdk-uiautomatorviewer.jar -C uiautomatorviewer/src/main/java images
jh_manifest -m com.android.uiautomator.UiAutomatorViewer androidsdk-uiautomatorviewer.jar
install/androidsdk-ddms::
mkdir -p debian/androidsdk-ddms/usr/share/icons/hicolor/128x128/apps
- cp ddms/app/src/images/ddms-128.png debian/androidsdk-ddms/usr/share/icons/hicolor/128x128/apps/ddms.png
+ cp ddms/app/src/main/resources/images/ddms-128.png \
+ debian/androidsdk-ddms/usr/share/icons/hicolor/128x128/apps/ddms.png
+install/androidsdk-hierarchyviewer::
mkdir -p debian/androidsdk-hierarchyviewer/usr/share/icons/hicolor/128x128/apps
- cp hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-128.png \
+ cp hierarchyviewer2/hierarchyviewer2lib/src/main/java/images/sdk-hierarchyviewer-128.png \
debian/androidsdk-hierarchyviewer/usr/share/icons/hicolor/128x128/apps/hierarchyviewer.png
mkdir -p debian/androidsdk-hierarchyviewer/usr/share/icons/hicolor/16x16/apps
- cp hierarchyviewer2/libs/hierarchyviewerlib/src/images/sdk-hierarchyviewer-16.png \
+ cp hierarchyviewer2/hierarchyviewer2lib/src/main/java/images/sdk-hierarchyviewer-16.png \
debian/androidsdk-hierarchyviewer/usr/share/icons/hicolor/16x16/apps/hierarchyviewer.png
chmod 644 debian/androidsdk-hierarchyviewer/usr/share/icons/hicolor/16x16/apps/hierarchyviewer.png
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/androidsdk-tools.git
More information about the pkg-java-commits
mailing list