From 9a2ae0665e7b6519fb977115217d01e4eaa50cdf Mon Sep 17 00:00:00 2001
From: 7u83 <7u83@mail.ru>
Date: Sun, 14 Jan 2018 22:52:26 +0100
Subject: [PATCH] integrated Ivy install

---
 build.xml                      | 33 +++++++++++++++++++++++++++++++++
 nbproject/jnlp-impl.xml        |  4 ++--
 nbproject/jnlp-impl_backup.xml |  4 ++--
 nbproject/project.properties   |  2 +-
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 5e7db6f..17d82f4 100644
--- a/build.xml
+++ b/build.xml
@@ -129,5 +129,38 @@
     </zip>
     <delete file="${store.dir}/temp_final.jar"/>
 </target>    
+
+    <property name="ivy.install.version" value="2.1.0-rc2" />
+    <condition property="ivy.home" value="${env.IVY_HOME}">
+      <isset property="env.IVY_HOME" />
+    </condition>
+    <property name="ivy.home" value="${user.home}/.ant" />
+    <property name="ivy.jar.dir" value="${ivy.home}/lib" />
+    <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar" />
+
+    <target name="download-ivy" unless="offline">
+
+        <mkdir dir="${ivy.jar.dir}"/>
+        <!-- download Ivy from web site so that it can be used even without any special installation -->
+        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" 
+             dest="${ivy.jar.file}" usetimestamp="true"/>
+    </target>
+
+    <target name="init-ivy" depends="download-ivy">
+      <!-- try to load ivy here from ivy home, in case the user has not already dropped
+              it into ant's lib dir (note that the latter copy will always take precedence).
+              We will not fail as long as local lib dir exists (it may be empty) and
+              ivy is in at least one of ant's lib dir or the local lib dir. -->
+        <path id="ivy.lib.path">
+            <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+
+        </path>
+        <taskdef resource="org/apache/ivy/ant/antlib.xml"
+                 uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+    </target>
+
+
+
+
     
 </project>
diff --git a/nbproject/jnlp-impl.xml b/nbproject/jnlp-impl.xml
index 32bd923..b03f371 100644
--- a/nbproject/jnlp-impl.xml
+++ b/nbproject/jnlp-impl.xml
@@ -261,7 +261,7 @@ made subject to such option by the copyright holder.
         <macrodef name="extend-manifest" uri="http://www.netbeans.org/ns/j2se-project/jnlp">
             <element name="customize"/>
             <sequential>
-                <manifest file="${tmp.manifest.file}" mode="update">
+                <manifest file="${tmp.manifest.file}" mode="update" encoding="UTF-8">
                     <customize/>
                 </manifest>
             </sequential>
@@ -306,7 +306,7 @@ made subject to such option by the copyright holder.
 
     <target name="-copy-tmp-manifest" if="manifest.file">
         <property name="tmp.manifest.file" value="${build.dir}/manifest.mf"/>
-        <copy file="${manifest.file}" tofile="${build.dir}/manifest.mf"/>
+        <copy file="${manifest.file}" tofile="${build.dir}/manifest.mf" encoding="${manifest.encoding}" outputencoding="UTF-8"/>
     </target>
 
     <target name="-set-mixed-code-properties" depends="-check-signing-possible" if="jnlp.signed.true+signjars.task.available">
diff --git a/nbproject/jnlp-impl_backup.xml b/nbproject/jnlp-impl_backup.xml
index b03f371..32bd923 100644
--- a/nbproject/jnlp-impl_backup.xml
+++ b/nbproject/jnlp-impl_backup.xml
@@ -261,7 +261,7 @@ made subject to such option by the copyright holder.
         <macrodef name="extend-manifest" uri="http://www.netbeans.org/ns/j2se-project/jnlp">
             <element name="customize"/>
             <sequential>
-                <manifest file="${tmp.manifest.file}" mode="update" encoding="UTF-8">
+                <manifest file="${tmp.manifest.file}" mode="update">
                     <customize/>
                 </manifest>
             </sequential>
@@ -306,7 +306,7 @@ made subject to such option by the copyright holder.
 
     <target name="-copy-tmp-manifest" if="manifest.file">
         <property name="tmp.manifest.file" value="${build.dir}/manifest.mf"/>
-        <copy file="${manifest.file}" tofile="${build.dir}/manifest.mf" encoding="${manifest.encoding}" outputencoding="UTF-8"/>
+        <copy file="${manifest.file}" tofile="${build.dir}/manifest.mf"/>
     </target>
 
     <target name="-set-mixed-code-properties" depends="-check-signing-possible" if="jnlp.signed.true+signjars.task.available">
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 8357980..1ab74f8 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,4 +1,4 @@
-#Wed, 10 Jan 2018 10:18:15 +0100
+#Sun, 14 Jan 2018 22:18:16 +0100
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
 annotation.processing.processors.list=