Blob Blame History Raw
diff --git a/build/build.xml b/build/build.xml
index 9e955d9..34d5972 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -162,7 +162,7 @@
 
     <mkdir dir="${target.path}/reference"/>
 
-    <!-- Unzip documentation -->
+    <!-- Unzip documentation>
     <antcall target="unzip">
       <param name="archive_file" value="shared/reference-1.6.6-3.zip" />
       <param name="archive_url" value="http://downloads.arduino.cc/reference-1.6.6-3.zip" />
@@ -180,7 +180,7 @@
       <param name="archive_url" value="http://downloads.arduino.cc/Edison_help_files-1.6.2.zip" />
       <param name="final_folder" value="${target.path}/reference/Edison_help_files" />
       <param name="dest_folder" value="${target.path}/reference/" />
-    </antcall>
+    </antcall-->
 
     <!-- Write the revision file! -->
     <echo file="${target.path}/lib/version.txt" message="${version}" />
@@ -573,7 +573,7 @@
         <fileset dir="linux/work" includes="**/*.sh" />
     </chmod>
 
-    <antcall target="unzip">
+    <!--antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.1.zip" />
       <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
@@ -584,7 +584,7 @@
 
     <antcall target="portable-${portable}">
       <param name="parentdir" value="linux/work" />
-    </antcall>
+    </antcall!-->
   </target>
 
   <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
@@ -592,7 +592,7 @@
       <param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
     </antcall>
 
-    <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
+    <!--delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
     <mkdir dir="${staging_folder}/arduino-builder-linux32"/>
     <antcall target="untar">
       <param name="archive_file" value="./arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
@@ -606,15 +606,15 @@
     <copy todir="linux/work/hardware" overwrite="true">
       <fileset dir="${staging_folder}/arduino-builder-linux32/hardware" includes="*.txt"/>
     </copy>
-    <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
+    <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"-->
 
-    <antcall target="avr-toolchain-bundle">
+    <!--antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
       <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
       <param name="gcc_version" value="4.8.1-arduino5"/>
       <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
       <param name="avrdude_version" value="6.0.1-arduino5"/>
-    </antcall>
+    </antcall-->
 
     <antcall target="package-library-index-json-bundle"/>
   </target>
@@ -624,7 +624,7 @@
       <param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
     </antcall>
 
-    <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
+    <!--delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
     <mkdir dir="${staging_folder}/arduino-builder-linux64"/>
     <antcall target="untar">
       <param name="archive_file" value="./arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
@@ -638,15 +638,15 @@
     <copy todir="linux/work/hardware" overwrite="true">
       <fileset dir="${staging_folder}/arduino-builder-linux64/hardware" includes="*.txt"/>
     </copy>
-    <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
+    <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/-->
 
-    <antcall target="avr-toolchain-bundle">
+    <!--antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
       <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
       <param name="gcc_version" value="4.8.1-arduino5"/>
       <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
       <param name="avrdude_version" value="6.0.1-arduino5"/>
-    </antcall>
+    </antcall-->
 
     <antcall target="package-library-index-json-bundle"/>
   </target>
@@ -685,7 +685,10 @@
 
   <!-- Retrieve tool -->
   <target name="untar-unzip-download" depends="untar-unzip-check" unless="${archive_file}_available">
-    <get src="${archive_url}" dest="${archive_file}" verbose="true" ignoreerrors="true" />
+      <fail>Network access not allowed.
+      Build system tried to download file ${archive_file}.
+      Please add it to RPM spec Sources instead
+    </fail>
   </target>
 
   <target name="untar-unzip-checksum" depends="untar-unzip-download">
@@ -1022,15 +1025,18 @@
   <target name="package-library-index-json-bundle">
     <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/../dist/"/>
 
-    <get src="http://downloads.arduino.cc/packages/package_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/" verbose="true" skipexisting="false" />
-    <gunzip src="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/"/>
-    <delete file="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json.gz"/>
-
-    <get src="http://downloads.arduino.cc/packages/package_index.json.sig" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/" verbose="true" skipexisting="false" />
-
-    <get src="http://downloads.arduino.cc/libraries/library_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/" verbose="true" skipexisting="false" />
-    <gunzip src="${staging_folder}/work/${staging_hardware_folder}/../dist/library_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/"/>
-    <delete file="${staging_folder}/work/${staging_hardware_folder}/../dist/library_index.json.gz"/>
+    <exec executable="cp" failonerror="true">
+      <arg value="../package_index.json" />
+      <arg value="${staging_folder}/work/${staging_hardware_folder}/../dist/" />
+    </exec>
+    <exec executable="cp" failonerror="true">
+      <arg value="../package_index.json.sig" />
+      <arg value="${staging_folder}/work/${staging_hardware_folder}/../dist/" />
+    </exec>
+    <exec executable="cp" failonerror="true">
+      <arg value="../library_index.json" />
+      <arg value="${staging_folder}/work/${staging_hardware_folder}/../dist/" />
+    </exec>
 
     <delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
   </target>