Skip to content
This repository has been archived by the owner on Nov 23, 2018. It is now read-only.

Commit

Permalink
Don't copy empty directories to publish dir.
Browse files Browse the repository at this point in the history
  • Loading branch information
@rikkert
rikkert committed Apr 29, 2012
1 parent ff45c0b commit f82bcc9
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions build.xml
View file
Expand Up @@ -438,15 +438,11 @@


<mkdir dir="${dir.intermediate}"/> <mkdir dir="${dir.intermediate}"/>
<copy todir="${dir.intermediate}" includeEmptyDirs="true"> <copy todir="${dir.intermediate}" includeEmptyDirs="true">
<fileset dir="${dir.source}/" excludes="${file.default.exclude}, ${file.exclude}"> <dirset dir="${dir.source}/" excludes="${file.default.exclude}, ${file.exclude}"/>
<type type="dir"/>
</fileset>
</copy> </copy>
<mkdir dir="${dir.publish}"/> <mkdir dir="${dir.publish}"/>
<copy todir="${dir.publish}" includeEmptyDirs="true"> <copy todir="${dir.publish}" includeEmptyDirs="true">
<fileset dir="${dir.source}/" excludes="${file.default.exclude}, ${file.exclude}"> <dirset dir="${dir.source}/" excludes="${file.default.exclude}, ${file.exclude}" includes="*"/>

This comment has been minimized.

Sign in to view

Copy link
@DarkR

DarkR May 13, 2012

includes="*" param gives

BUILD FAILED
/build/build.xml:143: The following error occurred while executing this line:
/build/build.xml:929: Directory does not exist: /publish/static/img

Only remove of that fixs that problem.
<type type="dir"/>
</fileset>
</copy> </copy>
</else> </else>
</if> </if>
Expand All @@ -456,7 +452,7 @@
<!-- This is a private target --> <!-- This is a private target -->


<echo message="Copying over new files..."/> <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}"> <fileset dir="${dir.source}/" excludes="${file.default.exclude}, ${file.exclude}">
<!-- exclude files that are superseded by optimized versions with different names --> <!-- 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 --> <!-- this is not strictly necessary, but it avoids putting unreferenced files into your server -->
Expand Down

0 comments on commit f82bcc9

Please sign in to comment.