Changeset 1113

Timestamp:

11/11/08 23:06:07 (8 weeks ago)

Author:

douglas

Message:

AAPT Package has upToDate.

Location:

AntTasks

Files:

• build.xml (modified) (1 diff)
• source/net/douglasthrift/anttasks/AAPTPackage.java (modified) (5 diffs)

AntTasks/build.xml

@@ -71 +71 @@
                         make="true"
                         verbose="true"
-                        java="../DeliciousAndroid/build/source"
+                        java="${archives.dir}"
                         manifest="../DeliciousAndroid/AndroidManifest.xml"
                         include="/home/douglas/android-sdk-linux_x86-1.0_r1/android.jar"
                         resource="../DeliciousAndroid/resource"
+                />
+
+                <aaptpackage
+                        force="true"
+                        verbose="true"
+                        manifest="../DeliciousAndroid/AndroidManifest.xml"
+                        include="/home/douglas/android-sdk-linux_x86-1.0_r1/android.jar"
+                        resource="../DeliciousAndroid/resource"
+                        assets="../DeliciousAndroid/assets"
+                        file="${archives.dir}/DeliciousAndroid.zip"
                 />
         </target>

AntTasks/source/net/douglasthrift/anttasks/AAPTPackage.java

@@ -27 +27 @@
 import java.util.Iterator;
 
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.UpToDate;
 import org.apache.tools.ant.types.DirSet;
+import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.resources.FileResource;
+import org.apache.tools.ant.types.resources.Union;
 
 public class AAPTPackage extends CommandTask
@@ -39 +44 @@
         private File manifest_;
         private Path include_;
-        private File assetSources_;
+        private File assets_;
         private File publicDefinitions_;
         private File resource_;
@@ -81 +86 @@
         }
 
-        public void setAssestSources(File assetSources)
-        {
-                assetSources_ = assetSources;
+        public void setAssets(File assets)
+        {
+                assets_ = assets;
         }
 
@@ -142 +147 @@
                                 arguments("-I", iterator.next().toString());
 
-                if (assetSources_ != null && assetSources_.exists())
-                        arguments("-A", assetSources_);
+                if (assets_ != null && assets_.exists())
+                        arguments("-A", assets_);
 
                 if (publicDefinitions_ != null)
@@ -166 +171 @@
         private boolean isUpToDate()
         {
-                return false;
+                Project project = getProject();
+                UpToDate upToDate = (UpToDate)project.createTask("uptodate");
+                Union union = upToDate.createSrcResources();
+
+                if (manifest_ != null)
+                {
+                        FileSet fileSet = (FileSet)project.createDataType("fileset");
+
+                        fileSet.setFile(manifest_);
+                        union.add(fileSet);
+                }
+
+                if (assets_ != null && assets_.exists())
+                {
+                        FileSet fileSet = (FileSet)project.createDataType("fileset");
+
+                        fileSet.setDir(assets_);
+                        union.add(fileSet);
+                }
+
+                if (resource_ != null)
+                {
+                        FileSet fileSet = (FileSet)project.createDataType("fileset");
+
+                        fileSet.setDir(resource_);
+                        union.add(fileSet);
+                }
+
+                union.addAll(dirSets_);
+
+                // TODO: publicDefinitions_
+
+                if (file_ != null)
+                {
+                        upToDate.setTargetFile(file_);
+
+                        if (!upToDate.eval())
+                                return false;
+                }
+
+                if (java_ != null)
+                {
+                        FileSet fileSet = (FileSet)project.createDataType("fileset");
+
+                        fileSet.setDir(java_);
+                        fileSet.setIncludes("**/R.java");
+
+                        if (fileSet.size() == 0)
+                                return false;
+
+                        for (Iterator iterator = fileSet.iterator(); iterator.hasNext();)
+                        {
+                                upToDate.setTargetFile(((FileResource)iterator.next()).getFile());
+
+                                if (!upToDate.eval())
+                                        return false;
+                        }
+                }
+
+                return upToDate.eval();
         }
 }