Fix builder

build.xml

@@ -1,11 +1,10 @@
 <project name="juimage" default="dist" basedir=".">
 
-    <property name="VERSION" value="4.3"/>
+    <property name="VERSION" value="4.3.1"/>
     <property name="build" value="build"/>
     <property name="temp" value="temp"/>
     <property name="dist" value="dist"/>
     <property name="filename" value="pkg_juimage_v${VERSION}.zip"/>
-
     <property name="MIN_JOOMLA_VERSION" value="3.9"/>
 
     <tstamp>
@@ -16,22 +15,33 @@
 
     <target name="init" depends="clean">
         <mkdir dir="${build}"/>
+        <mkdir dir="${build}/packages"/>
         <mkdir dir="${temp}"/>
         <mkdir dir="${dist}"/>
     </target>
 
     <target name="temp">
-
         <copy todir="${temp}">
             <fileset dir="packages">
                 <include name="**"/>
             </fileset>
         </copy>
-
+        <copy todir="${temp}/lib_juimage/src">
+            <fileset dir="src">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy todir="${temp}/lib_juimage/vendor">
+            <fileset dir="vendor">
+                <include name="**" />
+            </fileset>
+        </copy>
+        <copy file="blank.png" todir="${temp}/lib_juimage" />
+        <copy file="JUImage.php" todir="${temp}/lib_juimage" />
+        <copy file="noimage.png" todir="${temp}/lib_juimage" />
     </target>
 
     <target name="replace">
-
         <copy file="pkg_juimage.xml" todir="${build}">
             <filterchain>
                 <replacetokens>
@@ -41,10 +51,7 @@
                 </replacetokens>
             </filterchain>
         </copy>
-
-        <!---->
-
-        <copy file="packages/lib_juimage/juimage.xml" todir="${temp}/temp/lib_juimage">
+         <copy file="packages/lib_juimage/juimage.xml" todir="${temp}/lib_juimage">
             <filterchain>
                 <replacetokens>
                     <token key="version" value="${VERSION}"/>
@@ -53,13 +60,7 @@
                 </replacetokens>
             </filterchain>
         </copy>
-
-        <copy file="${temp}/temp/lib_juimage/juimage.xml" todir="${temp}/lib_juimage"/>
-
-        <!---->
-
-        <copy file="packages/plg_system_juimage/juimage.xml"
-              todir="${temp}/temp/plg_system_juimage/">
+        <copy file="packages/plg_system_juimage/juimage.xml" todir="${temp}/plg_system_juimage/">
             <filterchain>
                 <replacetokens>
                     <token key="version" value="${VERSION}"/>
@@ -68,65 +69,34 @@
                 </replacetokens>
             </filterchain>
         </copy>
-
-        <delete file="${temp}/plg_system_juimage/juimage.xml"/>
-        <copy file="${temp}/temp/plg_system_juimage/juimage.xml" todir="${temp}/plg_system_juimage"/>
-
     </target>
 
     <target name="pack-plugins">
-
-        <mkdir dir="${build}/packages"/>
-
-        <copy todir="${temp}/lib_juimage/src">
-            <fileset dir="src">
-                <include name="**" />
-            </fileset>
-        </copy>
-
-        <copy todir="${temp}/lib_juimage/vendor">
-            <fileset dir="vendor">
-                <include name="**" />
-            </fileset>
-        </copy>
-
-        <copy file="blank.png" todir="${temp}/lib_juimage" />
-        <copy file="JUImage.php" todir="${temp}/lib_juimage" />
-        <copy file="noimage.png" todir="${temp}/lib_juimage" />
-
         <zip destfile="${build}/packages/lib_juimage.zip" description="lib_juimage">
             <fileset dir="${temp}/lib_juimage"/>
         </zip>
-
         <zip destfile="${build}/packages/plg_system_juimage.zip" description="plg_system_juimage">
             <fileset dir="${temp}/plg_system_juimage"/>
         </zip>
-
-        <copy file="pkg_juimage.xml" todir="${build}"/>
-
         <copy file="script.php" todir="${build}"/>
-
     </target>
 
-    <target name="dist" depends="init, temp, replace, pack-plugins">
-
+    <target name="dist" depends="init, replace, temp, pack-plugins">
         <zip destfile="${dist}/${filename}">
             <fileset dir="${build}/">
                 <include name="**/**"/>
             </fileset>
         </zip>
 
         <echo msg="Removing old files..."/>
+
         <delete dir="${build}"/>
         <delete dir="${temp}"/>
-
     </target>
 
     <target name="clean" description="clean up">
-
         <delete dir="${build}"/>
         <delete dir="${temp}"/>
-
     </target>
 
 </project>