From 69a157073835bb83d7af27babc0a50e5cfc440b2 Mon Sep 17 00:00:00 2001
From: Elijah <FRymr15161781098>
Date: Wed, 8 Jul 2020 19:31:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E6=89=93=E5=8C=85=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.xml | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/build.xml b/build.xml
index 716f9c5..b6fbd6f 100644
--- a/build.xml
+++ b/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"/>
@@ -28,9 +26,6 @@
             <include name="**/*.jar"/>
         </fileset>
         <fileset dir="${publicLibs}">
-            <include name="**/*.class"/>
-        </fileset>
-        <fileset dir="${reportLibs}">
             <include name="**/*.jar"/>
         </fileset>
     </path>
@@ -48,7 +43,7 @@
         <echo message="从${resources_from}拷贝图片,JS,CSS等资源文件"/>
         <delete dir="tmp"/>
         <copy todir="tmp">
-            <fileset dir="${resources_from}/src/main/resources">
+            <fileset dir="${resources_from}\src">
                 <patternset refid="resources4Jar"/>
             </fileset>
         </copy>
@@ -63,15 +58,11 @@
                target="${target_jdk_version}"
                fork="true" memoryMaximumSize="512m" listfiles="false" srcdir="${basedir}"
                executable="${compile_jdk_version}/bin/javac">
-            <src path="${basedir}/src/main/java"/>
+            <src path="${basedir}/src"/>
             <exclude name="**/.svn/**"/>
             <compilerarg line="-encoding UTF8 "/>
             <classpath refid="compile.classpath"/>
         </javac>
-        <taskdef name="pretreatment" classname="com.fr.plugin.pack.PluginPretreatmentTask">
-            <classpath refid="compile.classpath"/>
-        </taskdef>
-        <pretreatment baseDir="${basedir}"/>
     </target>
 
     <target name="jar_classes">
@@ -101,7 +92,6 @@
         <delete dir="${classes}"/>
 
     </target>
-
     <target name="jar" depends="super_jar">
         <antcall target="zip"/>
     </target>
@@ -115,16 +105,12 @@
                 <include name="${plugin-jar}"/>
                 <include name="plugin.xml"/>
             </fileset>
-            <fileset dir="${libs}">
-                <include name="*.jar"/>
-                <include name="*.dll"/>
-            </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"/>
+        <xmlproperty file="${basedir}/plugin.xml"/>
+        <move file="${plugin-folder}.zip" todir="${destLoc}/${plugin.name}"/>
     </target>
 </project>
\ No newline at end of file

From a4fb3758f8919f60d3bf309ca350b16063faca1f Mon Sep 17 00:00:00 2001
From: Elijah <FRymr15161781098>
Date: Wed, 8 Jul 2020 19:49:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E6=89=93=E5=8C=85=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.xml | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index b6fbd6f..98727fa 100644
--- a/build.xml
+++ b/build.xml
@@ -19,7 +19,7 @@
         <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}">
@@ -43,7 +43,7 @@
         <echo message="从${resources_from}拷贝图片,JS,CSS等资源文件"/>
         <delete dir="tmp"/>
         <copy todir="tmp">
-            <fileset dir="${resources_from}\src">
+            <fileset dir="${resources_from}/src/main/resources">
                 <patternset refid="resources4Jar"/>
             </fileset>
         </copy>
@@ -54,15 +54,17 @@
     </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">
-            <src path="${basedir}/src"/>
+        <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>
+        <taskdef name="pretreatment" classname="com.fr.plugin.pack.PluginPretreatmentTask">
+            <classpath refid="compile.classpath"/>
+        </taskdef>
+        <pretreatment baseDir="${basedir}"/>
     </target>
 
     <target name="jar_classes">
@@ -79,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>
@@ -90,8 +92,8 @@
             <param name="jar_name" value="${plugin-jar}"/>
         </antcall>
         <delete dir="${classes}"/>
-
     </target>
+
     <target name="jar" depends="super_jar">
         <antcall target="zip"/>
     </target>
@@ -105,12 +107,14 @@
                 <include name="${plugin-jar}"/>
                 <include name="plugin.xml"/>
             </fileset>
+            <fileset dir="${libs}">
+                <include name="*"/>
+            </fileset>
         </copy>
         <zip destfile="${basedir}/${plugin-folder}.zip" basedir=".">
             <include name="${plugin-folder}/*.jar"/>
             <include name="${plugin-folder}/plugin.xml"/>
         </zip>
-        <xmlproperty file="${basedir}/plugin.xml"/>
         <move file="${plugin-folder}.zip" todir="${destLoc}/${plugin.name}"/>
     </target>
 </project>
\ No newline at end of file