Merge pull request androidannotations#367 from excilys/360_manifest_file

pyricau · pyricau · commit c64d8aebf516 · 2012-10-30T01:12:34.000-07:00
androidManifestFile pointing to AndroidManifest.xml. Fixes androidannotations#360
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AndroidManifestFinder.java b/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/AndroidManifestFinder.java
@@ -40,7 +40,7 @@
 
 public class AndroidManifestFinder {
 
-	private static final String ANDROID_MANIFEST_FILE = "androidManifestFile";
+	private static final String ANDROID_MANIFEST_FILE_OPTION = "androidManifestFile";
 
 	private static final int MAX_PARENTS_FROM_SOURCE_FOLDER = 10;
 
@@ -87,16 +87,16 @@ private AndroidManifest extractAndroidManifestThrowing() throws Exception {
 	}
 
 	private File findManifestFileThrowing() throws Exception {
-		if (processingEnv.getOptions().containsKey(ANDROID_MANIFEST_FILE)) {
+		if (processingEnv.getOptions().containsKey(ANDROID_MANIFEST_FILE_OPTION)) {
 			return findManifestInSpecifiedPath();
 		} else {
 			return findManifestInParentsDirectories();
 		}
 	}
 
 	private File findManifestInSpecifiedPath() {
-		String path = processingEnv.getOptions().get(ANDROID_MANIFEST_FILE);
-		File androidManifestFile = new File(path, "AndroidManifest.xml");
+		String path = processingEnv.getOptions().get(ANDROID_MANIFEST_FILE_OPTION);
+		File androidManifestFile = new File(path);
 		Messager messager = processingEnv.getMessager();
 		if (!androidManifestFile.exists()) {
 			throw new IllegalStateException("Could not find the AndroidManifest.xml file in specified path : " + path);
diff --git a/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/AAProcessorTestHelper.java b/AndroidAnnotations/androidannotations/src/test/java/com/googlecode/androidannotations/utils/AAProcessorTestHelper.java
@@ -8,8 +8,7 @@ public class AAProcessorTestHelper extends ProcessorTestHelper {
 
 	public void addManifestProcessorParameter(Class<?> classOfPackagingContainingManifest) {
 		String manifestPath = classOfPackagingContainingManifest.getResource("AndroidManifest.xml").getPath();
-		String manifestPackagePath = manifestPath.substring(0, manifestPath.lastIndexOf("/"));
-		addProcessorParameter("androidManifestFile", manifestPackagePath);
+		addProcessorParameter("androidManifestFile", manifestPath);
 	}
 
 	public File toGeneratedFile(Class<?> compiledClass) {

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@ public class AAProcessorTestHelper extends ProcessorTestHelper {`
`8`	`8`
`9`	`9`	`public void addManifestProcessorParameter(Class<?> classOfPackagingContainingManifest) {`
`10`	`10`	`String manifestPath = classOfPackagingContainingManifest.getResource("AndroidManifest.xml").getPath();`
`11`		`- String manifestPackagePath = manifestPath.substring(0, manifestPath.lastIndexOf("/"));`
`12`		`- addProcessorParameter("androidManifestFile", manifestPackagePath);`
	`11`	`+ addProcessorParameter("androidManifestFile", manifestPath);`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`public File toGeneratedFile(Class<?> compiledClass) {`