Changeset 220

Timestamp:

08/21/07 00:03:13 (1 year ago)

Author:

hans

Message:

ticket:75 - files excluded by fileset end up in .tgz but not .zip

Files:

• trunk/classes/phing/tasks/ext/TarTask.php (modified) (1 diff)
• trunk/classes/phing/tasks/ext/ZipTask.php (modified) (7 diffs)

trunk/classes/phing/tasks/ext/TarTask.php

@@ -242 +242 @@
-                    for ($i=0, $fcount=count($files); $i < $fcount; $i++) {
-                        $f = new PhingFile($fsBasedir, $files[$i]);
-
+
+
-                    }                    
-                    $tar->addModify($filesToTar, '', $fsBasedir->getAbsolutePath());            

trunk/classes/phing/tasks/ext/ZipTask.php

@@ -37 +37 @@
-class ZipTask extends MatchingTask {
-    
+        /**
+         * @var PhingFile
+         */
-    private $zipFile;
+    
+    /**
+     * @var PhingFile
+     */
-    private $baseDir;
-
+
+
+
+
+
+
-    private $filesets = array();
-    private $fileSetFiles = array();
@@ -48 +60 @@
-     */
-    public function createFileSet() {
-
+Zip
-        $this->filesets[] = $this->fileset;
-        return $this->fileset;
@@ -69 +81 @@
-    }
-
+    /**
+     * Set the include empty dirs flag.
+     * @param  boolean  Flag if empty dirs should be tarred too
+     * @return void
+     * @access public
+     */
+    function setIncludeEmptyDirs($bool) {
+        $this->includeEmpty = (boolean) $bool;
+    }
+    
-    /**
-     * do the work
@@ -116 +138 @@
-            $upToDate = true;
-            foreach($this->filesets as $fs) {
-
-
+
-                if (!$this->archiveIsUpToDate($files, $fs->getDir($this->project))) {
-                    $upToDate = false;
@@ -137 +158 @@
-            $zip = new Archive_Zip($this->zipFile->getAbsolutePath());
-            
-
-
-
-
-
-
-
-
-
+
+
+
+
-                $fsBasedir = (null != $this->baseDir) ? $this->baseDir :
-                                                                        $fs->getDir($this->project);
@@ -152 +168 @@
-                for ($i=0, $fcount=count($files); $i < $fcount; $i++) {
-                    $f = new PhingFile($fsBasedir, $files[$i]);
-
+
+
-                }
-                $zip->add($filesToZip, array('remove_path' => $fsBasedir->getCanonicalPath()));
@@ -180 +197 @@
-   
-}
+
+
+
+
+/**
+ * This is a FileSet with the to specify permissions.
+ * 
+ * Permissions are currently not implemented by PEAR Archive_Tar,
+ * but hopefully they will be in the future.
+ * 
+ */
+class ZipFileSet extends FileSet {
+
+    private $files = null;
+
+    /**
+     *  Get a list of files and directories specified in the fileset.
+     *  @return array a list of file and directory names, relative to
+     *    the baseDir for the project.
+     */
+    public function getFiles(Project $p, $includeEmpty = true) {
+    
+        if ($this->files === null) {
+        
+            $ds = $this->getDirectoryScanner($p);
+            $this->files = $ds->getIncludedFiles();
+            
+            if ($includeEmpty) {
+            
+                    // first any empty directories that will not be implicitly added by any of the files
+                                $implicitDirs = array();
+                                foreach($this->files as $file) {
+                                        $implicitDirs[] = dirname($file);
+                                } 
+                                
+                                $incDirs = $ds->getIncludedDirectories();
+                                
+                                // we'll need to add to that list of implicit dirs any directories
+                                // that contain other *directories* (and not files), since otherwise
+                                // we get duplicate directories in the resulting tar
+                                foreach($incDirs as $dir) {
+                                        foreach($incDirs as $dircheck) {
+                                                if (!empty($dir) && $dir == dirname($dircheck)) {
+                                                        $implicitDirs[] = $dir;
+                                                }
+                                        }
+                                }
+                                
+                                $implicitDirs = array_unique($implicitDirs);
+                                
+                                // Now add any empty dirs (dirs not covered by the implicit dirs)
+                                // to the files array. 
+                                
+                                foreach($incDirs as $dir) { // we cannot simply use array_diff() since we want to disregard empty/. dirs
+                                        if ($dir != "" && $dir != "." && !in_array($dir, $implicitDirs)) {
+                                                // it's an empty dir, so we'll add it.
+                                                $this->files[] = $dir;
+                                        }
+                                }
+                        } // if $includeEmpty
+                        
+        } // if ($this->files===null)
+        
+        return $this->files;
+    }
+
+}