sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1480760 - in /sis/branches/Android/ide-project/NetBeans/nbproject: build-impl.xml build-impl.xml~ genfiles.properties project.properties project.xml
Date Thu, 09 May 2013 20:26:10 GMT
Author: desruisseaux
Date: Thu May  9 20:26:10 2013
New Revision: 1480760

URL: http://svn.apache.org/r1480760
Log:
NetBeans configuration.

Added:
    sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml~
      - copied unchanged from r1480751, sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml
Modified:
    sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml
    sis/branches/Android/ide-project/NetBeans/nbproject/genfiles.properties
    sis/branches/Android/ide-project/NetBeans/nbproject/project.properties
    sis/branches/Android/ide-project/NetBeans/nbproject/project.xml

Modified: sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml?rev=1480760&r1=1480759&r2=1480760&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml Thu May  9 20:26:10
2013
@@ -19,7 +19,7 @@ is divided into following sections:
   - cleanup
 
         -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3"
xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default"
name="Apache_SIS_on_GeoAPI_3.0-impl">
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3"
xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default"
name="Apache_SIS_on_Android-impl">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>
@@ -144,6 +144,8 @@ is divided into following sections:
         <condition property="have.sources">
             <or>
                 <available file="${src.local-src.dir}"/>
+                <available file="${src.android.dir}"/>
+                <available file="${src.android.gen}"/>
                 <available file="${src.webapp.dir}"/>
                 <available file="${src.app.dir}"/>
                 <available file="${src.netcdf.dir}"/>
@@ -238,6 +240,8 @@ is divided into following sections:
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
         <fail unless="src.local-src.dir">Must set src.local-src.dir</fail>
+        <fail unless="src.android.dir">Must set src.android.dir</fail>
+        <fail unless="src.android.gen">Must set src.android.gen</fail>
         <fail unless="src.webapp.dir">Must set src.webapp.dir</fail>
         <fail unless="src.app.dir">Must set src.app.dir</fail>
         <fail unless="src.netcdf.dir">Must set src.netcdf.dir</fail>
@@ -268,7 +272,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -308,7 +312,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors"
unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -340,7 +344,7 @@ is divided into following sections:
     </target>
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors"
name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -482,7 +486,7 @@ is divided into following sections:
                     </fileset>
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}"
name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}"
mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Apache_SIS_on_GeoAPI_3.0"
testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}"
mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Apache_SIS_on_Android"
testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -642,7 +646,7 @@ is divided into following sections:
                 <condition else="-testclass @{testClass}" property="test.class.or.method"
value="-methods @{testClass}.@{testMethod}">
                     <isset property="test.method"/>
                 </condition>
-                <condition else="-suitename Apache_SIS_on_GeoAPI_3.0 -testname @{testClass}
${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                <condition else="-suitename Apache_SIS_on_Android -testname @{testClass}
${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
                     <matches pattern=".*\.xml" string="@{testClass}"/>
                 </condition>
                 <delete dir="${build.test.results.dir}" quiet="true"/>
@@ -934,7 +938,7 @@ is divided into following sections:
         <delete file="${built-jar.properties}" quiet="true"/>
     </target>
     <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
-        <echo level="warn" message="Cycle detected: Apache SIS on GeoAPI 3.0 was already
built"/>
+        <echo level="warn" message="Cycle detected: Apache SIS on Android was already
built"/>
     </target>
     <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
         <mkdir dir="${build.dir}"/>
@@ -965,12 +969,14 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend"
if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.classes.dir}">
             <fileset dir="${src.local-src.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
+            <fileset dir="${src.android.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
+            <fileset dir="${src.android.gen}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${src.webapp.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${src.app.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${src.netcdf.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
@@ -997,7 +1003,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"
sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"
sourcepath="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -1261,6 +1267,12 @@ is divided into following sections:
             <fileset dir="${src.local-src.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
+            <fileset dir="${src.android.dir}" excludes="*.java,${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${src.android.gen}" excludes="*.java,${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${src.webapp.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -1289,6 +1301,12 @@ is divided into following sections:
             <fileset dir="${src.local-src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
+            <fileset dir="${src.android.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
+            <fileset dir="${src.android.gen}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
             <fileset dir="${src.webapp.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
@@ -1462,7 +1480,7 @@ is divided into following sections:
         <delete file="${built-clean.properties}" quiet="true"/>
     </target>
     <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
-        <echo level="warn" message="Cycle detected: Apache SIS on GeoAPI 3.0 was already
built"/>
+        <echo level="warn" message="Cycle detected: Apache SIS on Android was already
built"/>
     </target>
     <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
         <mkdir dir="${build.dir}"/>

Modified: sis/branches/Android/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/NetBeans/nbproject/genfiles.properties?rev=1480760&r1=1480759&r2=1480760&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] (original)
+++ sis/branches/Android/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] Thu
May  9 20:26:10 2013
@@ -3,6 +3,6 @@
 build.xml.data.CRC32=58e6b21c
 build.xml.script.CRC32=462eaba0
 build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=08945aac
-nbproject/build-impl.xml.script.CRC32=3e302f66
+nbproject/build-impl.xml.data.CRC32=b391602f
+nbproject/build-impl.xml.script.CRC32=34e9591f
 nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46

Modified: sis/branches/Android/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/NetBeans/nbproject/project.properties?rev=1480760&r1=1480759&r2=1480760&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/Android/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Thu
May  9 20:26:10 2013
@@ -26,6 +26,8 @@ junit.forkmode       = once
 #
 project.root         = ../..
 src.local-src.dir    = ../local-src
+src.android.gen      = ${project.root}/application/sis-android/target/generated-sources/r
+src.android.dir      = ${project.root}/application/sis-android/src/main/java
 src.webapp.dir       = ${project.root}/application/sis-webapp/src/main/java
 src.app.dir          = ${project.root}/application/sis-app/src/main/java
 src.netcdf.dir       = ${project.root}/storage/sis-netcdf/src/main/java
@@ -42,6 +44,7 @@ test.utility.dir     = ${project.root}/c
 # Those dependencies must exist in the local Maven repository.
 # Those numbers should match the ones declared in the pom.xml files.
 #
+android.version      = 4.1.1.4
 geoapi.version       = 3.0.0
 unit-api.version     = 0.6.1
 jsr275.version       = 0.9.3
@@ -62,6 +65,7 @@ junit.version        = 4.10
 maven.repository   = ${user.home}/.m2/repository
 endorsed.classpath=
 javac.classpath=\
+    ${maven.repository}/com/google/android/android/${android.version}/android-${android.version}.jar:\
     ${maven.repository}/org/opengis/geoapi/${geoapi.version}/geoapi-${geoapi.version}.jar:\
     ${maven.repository}/org/unitsofmeasurement/unit-api/${unit-api.version}/unit-api-${unit-api.version}.jar:\
     ${maven.repository}/javax/measure/jsr-275/${jsr275.version}/jsr-275-${jsr275.version}.jar:\

Modified: sis/branches/Android/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/ide-project/NetBeans/nbproject/project.xml?rev=1480760&r1=1480759&r2=1480760&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/Android/ide-project/NetBeans/nbproject/project.xml Thu May  9 20:26:10 2013
@@ -3,9 +3,11 @@
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>Apache SIS on GeoAPI 3.0</name>
+            <name>Apache SIS on Android</name>
             <source-roots>
                 <root id="src.local-src.dir" name="Local sources (unversioned)"/>
+                <root id="src.android.dir" name="Android application"/>
+                <root id="src.android.gen" name="Android generated resources"/>
                 <root id="src.webapp.dir" name="Web application"/>
                 <root id="src.app.dir" name="Application"/>
                 <root id="src.netcdf.dir" name="NetCDF"/>



Mime
View raw message