You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2007/11/27 10:42:40 UTC
svn commit: r598571 - in /maven/sandbox/trunk/plugins/maven-android: ./
maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/
maven-adb-plugin/src/main/java/org/apache/maven/plugin/adb/
maven-dx-plugin/src/main/java/org/apache/maven/plugin/android/
Author: sisbell
Date: Tue Nov 27 01:42:39 2007
New Revision: 598571
URL: http://svn.apache.org/viewvc?rev=598571&view=rev
Log:
Fixed problem with multimodule builds not working.
Modified:
maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptCompilerMojo.java
maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptPackagerMojo.java
maven/sandbox/trunk/plugins/maven-android/maven-adb-plugin/src/main/java/org/apache/maven/plugin/adb/DeviceInstallerMojo.java
maven/sandbox/trunk/plugins/maven-android/maven-android.iml
maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/java/org/apache/maven/plugin/android/DxMojo.java
Modified: maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptCompilerMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptCompilerMojo.java?rev=598571&r1=598570&r2=598571&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptCompilerMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptCompilerMojo.java Tue Nov 27 01:42:39 2007
@@ -71,7 +71,8 @@
CommandExecutor executor = CommandExecutor.Factory.createDefaultCommmandExecutor();
executor.setLogger(this.getLog());
- File resourceDirectory = new File("res");
+
+ File resourceDirectory = new File(project.getBasedir(), "res");
Artifact artifact = artifactFactory.createArtifact("android", "android", androidVersion, "jar", "jar");
ArtifactRepositoryLayout defaultLayout = new DefaultRepositoryLayout();
@@ -82,10 +83,10 @@
commands.add("compile");
commands.add("-m");
commands.add("-J");
- commands.add("src");
+ commands.add(project.getBasedir().getAbsolutePath() + File.separatorChar + "src");
commands.add("-M");
- commands.add("AndroidManifest.xml");
+ commands.add(project.getBasedir().getAbsolutePath() + File.separatorChar + "AndroidManifest.xml");
if (resourceDirectory.exists()) {
commands.add("-S");
commands.add(resourceDirectory.getAbsolutePath());
@@ -94,7 +95,7 @@
commands.add(androidJar.getAbsolutePath());
getLog().info("aapt " + commands.toString());
try {
- executor.executeCommand("aapt", commands);
+ executor.executeCommand("aapt", commands, project.getBasedir(), false);
} catch (ExecutionException e) {
throw new MojoExecutionException("", e);
}
Modified: maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptPackagerMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptPackagerMojo.java?rev=598571&r1=598570&r2=598571&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptPackagerMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-android/maven-aapt-plugin/src/main/java/org/maven/maven/plugin/aapt/AaptPackagerMojo.java Tue Nov 27 01:42:39 2007
@@ -88,15 +88,16 @@
File androidJar = new File(localRepository, defaultLayout.pathOf(artifact));
tmpOutputFile.deleteOnExit();
- File outputFile = new File("target/" + project.getArtifactId() + "-" + project.getVersion() + ".apk");
- File resourceDirectory = new File("res");
+ File outputFile = new File(project.getBasedir(), "target" + File.separator + project.getArtifactId() + "-"
+ + project.getVersion() + ".apk");
+ File resourceDirectory = new File(project.getBasedir(), "res");
List<String> commands = new ArrayList<String>();
commands.add("package");
commands.add("-f");
commands.add("-c");
commands.add("-M");
- commands.add("AndroidManifest.xml");
+ commands.add(project.getBasedir().getAbsolutePath() + File.separatorChar + "AndroidManifest.xml");
if (resourceDirectory.exists()) {
commands.add("-S");
commands.add(resourceDirectory.getAbsolutePath());
@@ -106,7 +107,7 @@
commands.add(tmpOutputFile.getAbsolutePath());
getLog().info("aapt " + commands.toString());
try {
- executor.executeCommand("aapt", commands);
+ executor.executeCommand("aapt", commands, project.getBasedir(), false);
} catch (ExecutionException e) {
throw new MojoExecutionException("", e);
}
@@ -128,7 +129,7 @@
is.close();
}
os.putNextEntry(new ZipEntry("classes.dex"));
- is = new FileInputStream("target/classes.dex");
+ is = new FileInputStream(project.getBasedir().getAbsolutePath() + File.separatorChar + "target/classes.dex");
byte[] buffer = new byte[1024];
int i;
while ((i = is.read(buffer)) > 0) {
Modified: maven/sandbox/trunk/plugins/maven-android/maven-adb-plugin/src/main/java/org/apache/maven/plugin/adb/DeviceInstallerMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-adb-plugin/src/main/java/org/apache/maven/plugin/adb/DeviceInstallerMojo.java?rev=598571&r1=598570&r2=598571&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/maven-adb-plugin/src/main/java/org/apache/maven/plugin/adb/DeviceInstallerMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-android/maven-adb-plugin/src/main/java/org/apache/maven/plugin/adb/DeviceInstallerMojo.java Tue Nov 27 01:42:39 2007
@@ -49,7 +49,8 @@
public void execute() throws MojoExecutionException, MojoFailureException {
CommandExecutor executor = CommandExecutor.Factory.createDefaultCommmandExecutor();
executor.setLogger(this.getLog());
- File inputFile = new File("target/" + project.getArtifactId() + "-" + project.getVersion() + ".apk");
+ File inputFile = new File(project.getBasedir(), "target/" + project.getArtifactId() + "-"
+ + project.getVersion() + ".apk");
List<String> commands = new ArrayList<String>();
commands.add("install");
Modified: maven/sandbox/trunk/plugins/maven-android/maven-android.iml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-android.iml?rev=598571&r1=598570&r2=598571&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/maven-android.iml (original)
+++ maven/sandbox/trunk/plugins/maven-android/maven-android.iml Tue Nov 27 01:42:39 2007
@@ -9,6 +9,7 @@
<sourceFolder url="file://$MODULE_DIR$/maven-adb-plugin/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/maven-android-core/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/maven-dx-plugin/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/maven-location-plugin/src/main/java" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/java/org/apache/maven/plugin/android/DxMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/java/org/apache/maven/plugin/android/DxMojo.java?rev=598571&r1=598570&r2=598571&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/java/org/apache/maven/plugin/android/DxMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-android/maven-dx-plugin/src/main/java/org/apache/maven/plugin/android/DxMojo.java Tue Nov 27 01:42:39 2007
@@ -51,8 +51,9 @@
CommandExecutor executor = CommandExecutor.Factory.createDefaultCommmandExecutor();
executor.setLogger(this.getLog());
- File outputFile = new File("target/classes.dex");
- File inputFile = new File("target/" + project.getArtifactId() + "-" + project.getVersion() + ".jar");
+ File outputFile = new File(project.getBasedir(), "target" + File.separator + "classes.dex");
+ File inputFile = new File(project.getBasedir(), "target" + File.separator + project.getArtifactId() + "-"
+ + project.getVersion() + ".jar");
List<String> commands = new ArrayList<String>();
commands.add("--dex");
@@ -60,7 +61,7 @@
commands.add(inputFile.getAbsolutePath());
getLog().info("dx " + commands.toString());
try {
- executor.executeCommand("dx", commands);
+ executor.executeCommand("dx", commands, project.getBasedir(), false);
} catch (ExecutionException e) {
throw new MojoExecutionException("", e);
}