Pull request #9: fix 打包失败

Merge in PG/plugin-decision-batch-role from release/10.0 to persist/10.0

* commit 'acc3f7552f045bd4516ffed5e4a5b2fb16b30298':
  fix 打包报错
  fix 打包失败

build.xml

@@ -2,10 +2,8 @@
 <project basedir="." default="jar" name="plugin">
     <!-- JDK路径，根据自己机器上实际位置修改-->
     <property name="jdk.home" value="/Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home"/>
-
-    <property name="libs" value="${basedir}/lib/report"/>
+    <property name="libs" value="${basedir}/lib"/>
     <property name="publicLibs" value=""/>
-    <property name="reportLibs" value="${basedir}/../env/webroot/WEB-INF/lib"/>
     <property name="destLoc" value="."/>
     <property name="classes" value="classes"/>
     <xmlproperty file="${basedir}/plugin.xml"/>
@@ -21,16 +19,13 @@
         <delete dir="${classes}"/>
         <delete dir="fr-plugin-${plugin-name}-${plugin-version}"/>
         <xmlproperty file="${basedir}/plugin.xml"/>
-        <delete dir="${destLoc}/${plugin.name}"/>
+        <delete dir="${destLoc}/${plugin-name}"/>
     </target>
     <path id="compile.classpath">
         <fileset dir="${libs}">
             <include name="**/*.jar"/>
         </fileset>
         <fileset dir="${publicLibs}">
-            <include name="**/*.class"/>
-        </fileset>
-        <fileset dir="${reportLibs}">
             <include name="**/*.jar"/>
         </fileset>
     </path>
@@ -59,12 +54,10 @@
     </target>
     <target name="compile_javas">
         <echo message="编译${compile_files}下的Java文件"/>
-        <javac destdir="${classes}" debug="false" optimize="on" source="${source_jdk_version}"
-               target="${target_jdk_version}"
-               fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}"
-               executable="${compile_jdk_version}/bin/javac">
+        <javac destdir="${classes}" debug="false" optimize="on" includeantruntime="false" source="${source_jdk_version}" target="${target_jdk_version}" fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}" executable="${compile_jdk_version}/bin/javac">
             <src path="${basedir}/src/main/java"/>
             <exclude name="**/.svn/**"/>
+            <exclude name="**/.git/**"/>
             <compilerarg line="-encoding UTF8 "/>
             <classpath refid="compile.classpath"/>
         </javac>
@@ -88,8 +81,8 @@
             <param name="resources_from" value="${basedir}"/>
         </antcall>
         <antcall target="compile_javas">
-            <param name="source_jdk_version" value="1.6"/>
-            <param name="target_jdk_version" value="1.6"/>
+            <param name="source_jdk_version" value="1.7"/>
+            <param name="target_jdk_version" value="1.7"/>
             <param name="compile_jdk_version" value="${jdk.home}"/>
             <param name="compile_files" value="${basedir}/src"/>
         </antcall>
@@ -99,7 +92,6 @@
             <param name="jar_name" value="${plugin-jar}"/>
         </antcall>
         <delete dir="${classes}"/>
-
     </target>
 
     <target name="jar" depends="super_jar">
@@ -116,15 +108,13 @@
                 <include name="plugin.xml"/>
             </fileset>
             <fileset dir="${libs}">
-                <include name="*.jar"/>
-                <include name="*.dll"/>
+                <include name="*"/>
             </fileset>
         </copy>
         <zip destfile="${basedir}/${plugin-folder}.zip" basedir=".">
             <include name="${plugin-folder}/*.jar"/>
-            <include name="${plugin-folder}/*.dll"/>
             <include name="${plugin-folder}/plugin.xml"/>
         </zip>
-        <move file="${plugin-folder}.zip" todir="${destLoc}/install"/>
+        <move file="${plugin-folder}.zip" todir="${destLoc}/${plugin.name}"/>
     </target>
 </project>