sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1677899 - in /sis/branches/Android: application/ application/sis-android/ ide-project/NetBeans/nbproject/
Date Tue, 05 May 2015 22:29:56 GMT
Author: desruisseaux
Date: Tue May  5 22:29:56 2015
New Revision: 1677899

URL: http://svn.apache.org/r1677899
Log:
Removed the experimental sis-android module (it will probably be easier to develop an Android
application in a separated project using Google tools).
The SIS Android branch will be about the library only.

Removed:
    sis/branches/Android/application/sis-android/
Modified:
    sis/branches/Android/application/pom.xml
    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/application/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Android/application/pom.xml?rev=1677899&r1=1677898&r2=1677899&view=diff
==============================================================================
--- sis/branches/Android/application/pom.xml (original)
+++ sis/branches/Android/application/pom.xml Tue May  5 22:29:56 2015
@@ -114,7 +114,6 @@
            Sub-modules included in the build in dependency order
        =========================================================== -->
   <modules>
-    <!-- module>sis-android</module -->
     <module>sis-console</module>
   </modules>
 

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=1677899&r1=1677898&r2=1677899&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/Android/ide-project/NetBeans/nbproject/build-impl.xml Tue May  5 22:29:56
2015
@@ -136,9 +136,6 @@ 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.console.dir}"/>
                 <available file="${src.netcdf.dir}"/>
                 <available file="${src.shapefile.dir}"/>
@@ -244,9 +241,6 @@ 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.console.dir">Must set src.console.dir</fail>
         <fail unless="src.netcdf.dir">Must set src.netcdf.dir</fail>
         <fail unless="src.shapefile.dir">Must set src.shapefile.dir</fail>
@@ -285,7 +279,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.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"
name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -326,7 +320,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.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"
name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -359,7 +353,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.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"
name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -1029,15 +1023,12 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.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.console.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${src.netcdf.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${src.shapefile.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
@@ -1067,7 +1058,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.android.dir}:${src.android.gen}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"
sourcepath="${src.local-src.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -1336,15 +1327,6 @@ is divided into following sections:
             <fileset dir="${src.local-src.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.android.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.android.gen}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.webapp.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
             <fileset dir="${src.console.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -1382,15 +1364,6 @@ 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>
             <fileset dir="${src.console.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>

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=1677899&r1=1677898&r2=1677899&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] Tue
May  5 22:29:56 2015
@@ -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=c4eed276
-nbproject/build-impl.xml.script.CRC32=ff03d076
+nbproject/build-impl.xml.data.CRC32=091d7854
+nbproject/build-impl.xml.script.CRC32=b0893fa5
 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48

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=1677899&r1=1677898&r2=1677899&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] Tue
May  5 22:29:56 2015
@@ -45,9 +45,6 @@ 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.console.dir      = ${project.root}/application/sis-console/src/main/java
 test.console.dir     = ${project.root}/application/sis-console/src/test/java
 src.netcdf.dir       = ${project.root}/storage/sis-netcdf/src/main/java

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=1677899&r1=1677898&r2=1677899&view=diff
==============================================================================
--- sis/branches/Android/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/Android/ide-project/NetBeans/nbproject/project.xml Tue May  5 22:29:56 2015
@@ -24,9 +24,6 @@
             <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.console.dir" name="Console"/>
                 <root id="src.netcdf.dir" name="NetCDF"/>
                 <root id="src.shapefile.dir" name="Shapefile"/>



Mime
View raw message