Merge pull request h5bp#63 from rikkert/patch-1

Don't copy empty directories to publish dir.
assiotis · Apr 30, 2012 · dd29e8f · dd29e8f
2 parents b4615f5 + f82bcc9
commit dd29e8f
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/build.xml b/build.xml
@@ -438,15 +438,11 @@
 
           <mkdir dir="${dir.intermediate}"/>
           <copy todir="${dir.intermediate}" includeEmptyDirs="true">
-              <fileset dir="${dir.source}/" excludes="${file.default.exclude}, ${file.exclude}">
-                  <type type="dir"/>
-              </fileset>
+              <dirset dir="${dir.source}/" excludes="${file.default.exclude}, ${file.exclude}"/>
           </copy>
             <mkdir dir="${dir.publish}"/>
             <copy todir="${dir.publish}" includeEmptyDirs="true">
-                <fileset dir="${dir.source}/" excludes="${file.default.exclude}, ${file.exclude}">
-                    <type type="dir"/>
-                </fileset>
+                <dirset dir="${dir.source}/" excludes="${file.default.exclude}, ${file.exclude}" includes="*"/>
             </copy>
         </else>
     </if>
@@ -456,7 +452,7 @@
   <!-- This is a private target -->
 
       <echo message="Copying over new files..."/>
-      <copy todir="./${dir.publish}">
+      <copy todir="./${dir.publish}" includeEmptyDirs="false">
           <fileset dir="${dir.source}/" excludes="${file.default.exclude}, ${file.exclude}">
               <!-- exclude files that are superseded by optimized versions with different names -->
               <!-- this is not strictly necessary, but it avoids putting unreferenced files into your server -->