This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository androidsdk-tools.
commit d53daf99de51bb5946fe436c3f11ce7ddd6e6bf1 Author: Jakub Adam <[email protected]> Date: Thu Oct 4 18:55:54 2012 +0200 Use javahelper for build Avoids repetitive code in d/rules and takes care of all cleanup. --- debian/classpath | 4 ++++ debian/control | 5 +++-- debian/javabuild | 4 ++++ debian/rules | 30 ++---------------------------- 4 files changed, 13 insertions(+), 30 deletions(-) diff --git a/debian/classpath b/debian/classpath new file mode 100644 index 0000000..f36e5ab --- /dev/null +++ b/debian/classpath @@ -0,0 +1,4 @@ +androidsdk-common.jar . +androidsdk-androidprefs.jar . +androidsdk-sdklib.jar /usr/share/java/androidsdk-common.jar /usr/share/java/androidsdk-androidprefs.jar +androidsdk-sdkstats.jar /usr/share/java/androidsdk-androidprefs.jar /usr/share/java/swt.jar diff --git a/debian/control b/debian/control index b333e7c..ff2c5df 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: devel Priority: extra Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Stefan Handschuh <[email protected]> -Build-Depends: debhelper (>=9), default-jdk, cdbs, libswt-gtk-3-java, eclipse-rcp +Build-Depends: debhelper (>=9), javahelper, default-jdk, cdbs, libswt-gtk-3-java, + eclipse-rcp Standards-Version: 3.9.3 Homepage: http://developer.android.com/tools/help/index.html Vcs-Git: git://anonscm.debian.org/git/pkg-java/androidsdk-tools.git @@ -26,7 +27,7 @@ Description: Android preferences library Package: libandroidsdk-sdklib-java Section: java Architecture: all -Depends: ${misc:Depends}, libandroidsdk-common-java, libandroidsdk-androidprefs-java +Depends: ${java:Depends}, ${misc:Depends}, libandroidsdk-common-java, libandroidsdk-androidprefs-java Description: Android sdklib The android sdklib contains the resource assembler that compiles the static resource files of an android project. diff --git a/debian/javabuild b/debian/javabuild new file mode 100644 index 0000000..2c53885 --- /dev/null +++ b/debian/javabuild @@ -0,0 +1,4 @@ +androidsdk-common.jar common/src +androidsdk-androidprefs.jar androidprefs/src +androidsdk-sdklib.jar sdkmanager/libs/sdklib/src +androidsdk-sdkstats.jar sdkstats/src diff --git a/debian/rules b/debian/rules index aaf0865..3452c4f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,34 +1,8 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/javahelper.mk ECLIPSE_JFACE_JAR := $(shell find /usr/lib/eclipse/plugins/org.eclipse.jface_*.jar) ECLIPSE_COMMANDS_JAR := $(shell find /usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar) -SDKSTATS_CLASSPATH := androidsdk-androidprefs.jar:/usr/share/java/swt.jar:$(ECLIPSE_JFACE_JAR):$(ECLIPSE_COMMANDS_JAR) - -build: - mkdir -p common/bin - javac -d common/bin $(shell find common/src -name *.java) - jar cf androidsdk-common.jar -C common/bin . - - mkdir -p androidprefs/bin - javac -d androidprefs/bin $(shell find androidprefs/src -name *.java) - jar cf androidsdk-androidprefs.jar -C androidprefs/bin . - - mkdir -p sdkmanager/libs/sdklib/bin - javac -cp androidsdk-common.jar:androidsdk-androidprefs.jar -d sdkmanager/libs/sdklib/bin $(shell find sdkmanager/libs/sdklib/src -name *.java) - jar cf androidsdk-sdklib.jar -C sdkmanager/libs/sdklib/bin . - - mkdir -p sdkstats/bin - javac -cp $(SDKSTATS_CLASSPATH) -d sdkstats/bin $(shell find sdkstats/src -name *.java) - jar cf androidsdk-sdkstats.jar -C sdkstats/bin . - -clean:: - rm -fr common/bin - rm -fr androidprefs/bin - rm -fr sdkmanager/libs/sdklib/bin - rm -fr androidsdk-common.jar - rm -fr androidsdk-androidprefs.jar - rm -fr androidsdk-sdklib.jar - rm -fr androidsdk-sdkstats.jar +export CLASSPATH := androidsdk-common.jar:androidsdk-androidprefs.jar:/usr/share/java/swt.jar:$(ECLIPSE_JFACE_JAR):$(ECLIPSE_COMMANDS_JAR) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/androidsdk-tools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
