Only one patternset in tarfileset. Fixes #519.

jruby · Jan 31, 2013 · b612638 · b612638
1 parent edce49a
commit b612638
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/antlib/dist.xml b/antlib/dist.xml
@@ -185,10 +185,12 @@
             </tarfileset>
             <tarfileset dir="${basedir}" prefix="jruby-${version.jruby}">
                 <patternset refid="dist.src.files"/>
+            </tarfileset>
+            <tarfileset dir="${basedir}" prefix="jruby-${version.jruby}">
                 <patternset refid="dist.nailgun.files"/>
-                <include name="spi/**"/>
             </tarfileset>
             <tarfileset dir="${basedir}" mode="755" prefix="jruby-${version.jruby}">
+                <include name="spi/**"/>
                 <include name="tool/nailgun/configure"/>
                 <include name="test/testapp/testapp"/>
                 <include name="test/testapp/testapp.exe"/>
@@ -204,10 +206,12 @@
             </zipfileset>
             <zipfileset dir="${basedir}" prefix="jruby-${version.jruby}">
                 <patternset refid="dist.src.files"/>
+            </zipfileset>
+            <zipfileset dir="${basedir}" prefix="jruby-${version.jruby}">
                 <patternset refid="dist.nailgun.files"/>
-                <include name="spi/**"/>
             </zipfileset>
             <zipfileset dir="${basedir}" filemode="755" prefix="jruby-${version.jruby}">
+                <include name="spi/**"/>
                 <include name="tool/nailgun/configure"/>
                 <include name="test/testapp/testapp"/>
                 <include name="test/testapp/testapp.exe"/>