changeset 3694:c2f5dcdcce55

iOS: optimized incremental builds, native code is not recompiled
author David Pulkrabek <david.pulkrabek@oracle.com>
date Tue, 28 May 2013 09:51:46 +0200
parents 223392e7cdf1
children 73fd2a2b376a
files glass/build-closed.xml javafx-iio/build-common.xml javafx-iio/build-ios.xml prism-common/build-common.xml prism-common/build-ios.xml prism-es2/build-common.xml prism-es2/build-ios.xml
diffstat 7 files changed, 20 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/glass/build-closed.xml	Mon May 27 13:36:54 2013 -0400
+++ b/glass/build-closed.xml	Tue May 28 09:51:46 2013 +0200
@@ -27,7 +27,7 @@
     <target name="copy-sdk-binaries-ios" if="isIOS">
       <copy todir="${jfx.sdk.desktop.dir}" flatten="true">
         <fileset dir="${basedir}">
-          <include name="glass-lib-ios/dist/*"/>
+          <include name="glass-lib-ios/dist/libglass.a"/>
         </fileset>
       </copy>
     </target>
--- a/javafx-iio/build-common.xml	Mon May 27 13:36:54 2013 -0400
+++ b/javafx-iio/build-common.xml	Tue May 28 09:51:46 2013 +0200
@@ -26,10 +26,13 @@
   <target name="get-libname-android" if="isAndroid">
     <property name="native.lib.file" value="libjavafx-iio.so"/>
   </target>
+  <target name="get-libname-ios" if="isIOS">
+    <property name="native.lib.file" value="libjavafx-iio.a"/>
+  </target>
 
-  <target name="get-libname" depends="get-libname-macosx,get-libname-linux,get-libname-solaris,get-libname-windows, get-libname-android"/>
+  <target name="get-libname" depends="get-libname-macosx,get-libname-linux,get-libname-solaris,get-libname-windows, get-libname-android,get-libname-ios"/>
 
-  <target name="-pre-init" depends="get-libname"/>
+  <target name="-local-pre-init" depends="get-libname"/>
 
   <target name="check-native">
     <uptodate property="native.uptodate" targetfile="${native.dist.dir}/${native.lib.file}" >
@@ -50,7 +53,7 @@
          includes="${native.lib.file}"/>
   </target>
 
-  <target name="jar" depends="init">
+  <target name="jar" depends="-local-pre-init,init">
     <build-project/>
     <antcall target="compile-native"/>
     <available property="native.lib.file.exists" file="${native.dist.dir}/${native.lib.file}"/>
--- a/javafx-iio/build-ios.xml	Mon May 27 13:36:54 2013 -0400
+++ b/javafx-iio/build-ios.xml	Tue May 28 09:51:46 2013 +0200
@@ -4,7 +4,7 @@
   <target name="compile-native">
     <exec executable="make" dir="../javafx-iio-native" failonerror="true">
       <arg value="DIST_DIR=${native.dist.dir}"/>
-      <arg value="BUILD_DIR=${native.build.dir}"/>
+      <arg value="BUILD_DIR=${native.build.dir}/armv7"/>
       <arg value="JFXIIO_CP=${jfxiio.classes.dir}"/>
       <arg value="JDK_HOME=${platform.home}"/>
       <arg value="IS_IOS=true"/>
@@ -17,7 +17,7 @@
 
     <exec executable="make" dir="../javafx-iio-native" failonerror="true">
       <arg value="DIST_DIR=${native.dist.dir}"/>
-      <arg value="BUILD_DIR=${native.build.dir}"/>
+      <arg value="BUILD_DIR=${native.build.dir}/i386"/>
       <arg value="JFXIIO_CP=${jfxiio.classes.dir}"/>
       <arg value="JDK_HOME=${platform.home}"/>
       <arg value="IS_IOS=true"/>
--- a/prism-common/build-common.xml	Mon May 27 13:36:54 2013 -0400
+++ b/prism-common/build-common.xml	Tue May 28 09:51:46 2013 +0200
@@ -26,7 +26,10 @@
   <target name="get-libname-windows" if="isWindows">
     <property name="native.lib.file" value="prism-common.dll"/>
   </target>
-  <target name="get-libname" depends="get-libname-macosx,get-libname-android,get-libname-linux,get-libname-solaris,get-libname-windows"/>
+  <target name="get-libname-ios" if="isIOS">
+    <property name="native.lib.file" value="prism-common.a"/>
+  </target>
+  <target name="get-libname" depends="get-libname-macosx,get-libname-android,get-libname-linux,get-libname-solaris,get-libname-windows,get-libname-ios"/>
 
   <target name="-local-pre-init" depends="get-libname"/>
 
--- a/prism-common/build-ios.xml	Mon May 27 13:36:54 2013 -0400
+++ b/prism-common/build-ios.xml	Tue May 28 09:51:46 2013 +0200
@@ -2,11 +2,9 @@
 <project name="prism-common" default="all" basedir=".">
 
   <target name="compile-native">
-    <delete dir="${native.build.dir}"/>
-    
     <exec executable="make" dir="../prism-common-native" failonerror="true">
       <arg value="DIST_DIR=${native.dist.dir}"/>
-      <arg value="BUILD_DIR=${native.build.dir}"/>
+      <arg value="BUILD_DIR=${native.build.dir}/armv7"/>
       <arg value="PRISM_COM_CP=${prismcom.classes.dir}"/>
       <arg value="JDK_HOME=${platform.home}"/>
       <arg value="IS_IOS=true"/>
@@ -16,12 +14,10 @@
       <arg value="CONF=${build.conf}"/>
       <arg value="all"/>
     </exec>
-    
-    <delete dir="${native.build.dir}"/>
-    
+
     <exec executable="make" dir="../prism-common-native" failonerror="true">
       <arg value="DIST_DIR=${native.dist.dir}"/>
-      <arg value="BUILD_DIR=${native.build.dir}"/>
+      <arg value="BUILD_DIR=${native.build.dir}/i386"/>
       <arg value="PRISM_COM_CP=${prismcom.classes.dir}"/>
       <arg value="JDK_HOME=${platform.home}"/>
       <arg value="IS_IOS=true"/>
--- a/prism-es2/build-common.xml	Mon May 27 13:36:54 2013 -0400
+++ b/prism-es2/build-common.xml	Tue May 28 09:51:46 2013 +0200
@@ -29,7 +29,7 @@
   </target>
   <target name="get-libname" depends="get-libname-macosx,get-libname-android,get-libname-ios,get-libname-linux,get-libname-solaris,get-libname-windows"/>
 
-  <target name="-pre-init" depends="get-libname">
+  <target name="-local-pre-init" depends="get-libname">
     <mkdir dir="build/gensrc"/>
   </target>
 
@@ -64,7 +64,7 @@
         </build-project>
   </target>
 
-  <target name="build-native" depends="init">
+  <target name="build-native" depends="-local-pre-init,init">
         <antcall target="compile-native"/>
         <jar destfile="${dist.dir}/prism-es2-native.jar"
            basedir="${native.dist.dir}"
--- a/prism-es2/build-ios.xml	Mon May 27 13:36:54 2013 -0400
+++ b/prism-es2/build-ios.xml	Tue May 28 09:51:46 2013 +0200
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="prism-es2" default="all" basedir=".">
 
-  <condition property="ios.version" value="5.1">
-    <not>
-      <isset property="${ios.version}"/>
-    </not>
-  </condition>
-
   <target name="compile-native">
     <exec executable="make" dir="../prism-es2-native" failonerror="true">
       <arg value="DIST_DIR=${native.dist.dir}"/>
-      <arg value="BUILD_DIR=${native.build.dir}"/>
+      <arg value="BUILD_DIR=${native.build.dir}/armv7"/>
       <arg value="PRISM-ES2_CP=${prism-es2.classes.dir}"/>
       <arg value="JDK_HOME=${platform.home}"/>
       <arg value="IS_IOS=true"/>
@@ -23,7 +17,7 @@
 
     <exec executable="make" dir="../prism-es2-native" failonerror="true">
       <arg value="DIST_DIR=${native.dist.dir}"/>
-      <arg value="BUILD_DIR=${native.build.dir}"/>
+      <arg value="BUILD_DIR=${native.build.dir}/i386"/>
       <arg value="PRISM-ES2_CP=${prism-es2.classes.dir}"/>
       <arg value="JDK_HOME=${platform.home}"/>
       <arg value="IS_IOS=true"/>