From 25827fbd45d2e21bd1eec4de9ee1eb654541d133 Mon Sep 17 00:00:00 2001
From: pxb1988 <none@none>
Date: Wed, 9 Feb 2011 01:25:03 +0800
Subject: [PATCH] =?UTF-8?q?1.maven=E6=89=93=E5=8C=85=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : 0.0.7
---
 pom.xml                                       | 18 ++++++++++
 src/main/assemble/package.xml                 | 36 +++++++++++++++++++
 src/main/{resources => bin}/dex2jar-dump.bat  |  0
 src/main/{resources => bin}/dex2jar-dump.sh   |  0
 src/main/{resources => bin}/dex2jar.bat       |  0
 src/main/{resources => bin}/dex2jar.sh        |  0
 src/main/{resources => bin}/setclasspath.bat  |  0
 .../dex2jar/v3/V3MethodAdapter.java           |  2 +-
 8 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 src/main/assemble/package.xml
 rename src/main/{resources => bin}/dex2jar-dump.bat (100%)
 rename src/main/{resources => bin}/dex2jar-dump.sh (100%)
 rename src/main/{resources => bin}/dex2jar.bat (100%)
 rename src/main/{resources => bin}/dex2jar.sh (100%)
 rename src/main/{resources => bin}/setclasspath.bat (100%)

diff --git a/pom.xml b/pom.xml
index b10ba468..e4e8c1b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,24 @@
 					</excludes>
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<appendAssemblyId>false</appendAssemblyId>
+					<descriptors>
+						<descriptor>src/main/assemble/package.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<properties>
diff --git a/src/main/assemble/package.xml b/src/main/assemble/package.xml
new file mode 100644
index 00000000..2642397a
--- /dev/null
+++ b/src/main/assemble/package.xml
@@ -0,0 +1,36 @@
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+	<id>distribution</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+
+	<fileSets>
+		<fileSet>
+			<directory>src/main/bin/</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+	</fileSets>
+	<files>
+		<file>
+			<source>src/main/resources/META-INF/LICENSE.txt</source>
+			<outputDirectory>/</outputDirectory>
+		</file>
+		<file>
+			<source>src/main/resources/META-INF/NOTICE.txt</source>
+			<outputDirectory>/</outputDirectory>
+		</file>
+	</files>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>/lib</outputDirectory>
+			<scope>runtime</scope>
+		</dependencySet>
+		<dependencySet>
+			<outputDirectory>/lib</outputDirectory>
+			<scope>provided</scope>
+		</dependencySet>
+	</dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/src/main/resources/dex2jar-dump.bat b/src/main/bin/dex2jar-dump.bat
similarity index 100%
rename from src/main/resources/dex2jar-dump.bat
rename to src/main/bin/dex2jar-dump.bat
diff --git a/src/main/resources/dex2jar-dump.sh b/src/main/bin/dex2jar-dump.sh
similarity index 100%
rename from src/main/resources/dex2jar-dump.sh
rename to src/main/bin/dex2jar-dump.sh
diff --git a/src/main/resources/dex2jar.bat b/src/main/bin/dex2jar.bat
similarity index 100%
rename from src/main/resources/dex2jar.bat
rename to src/main/bin/dex2jar.bat
diff --git a/src/main/resources/dex2jar.sh b/src/main/bin/dex2jar.sh
similarity index 100%
rename from src/main/resources/dex2jar.sh
rename to src/main/bin/dex2jar.sh
diff --git a/src/main/resources/setclasspath.bat b/src/main/bin/setclasspath.bat
similarity index 100%
rename from src/main/resources/setclasspath.bat
rename to src/main/bin/setclasspath.bat
diff --git a/src/main/java/com/googlecode/dex2jar/v3/V3MethodAdapter.java b/src/main/java/com/googlecode/dex2jar/v3/V3MethodAdapter.java
index dc4b418d..ebcec8a5 100755
--- a/src/main/java/com/googlecode/dex2jar/v3/V3MethodAdapter.java
+++ b/src/main/java/com/googlecode/dex2jar/v3/V3MethodAdapter.java
@@ -55,7 +55,7 @@ public class V3MethodAdapter implements DexMethodVisitor, Opcodes {
 
     static {
         log.debug("InsnList.check=false");
-        // Optmize Tree Analyzer
+        // Optimize Tree Analyzer
         InsnList.check = false;
     }