exclude .git files via build.xml

diff --git a/build.xml b/build.xml
index 932336f..96905b8 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -75,37 +75,37 @@
     <include name="**/**"/>
     <exclude name="**/.DS_Store"/>
     <exclude name="**/.empty"/>
-    <exclude name="**/.svn"/>
+    <exclude name="**/.git*"/>
   </fileset>
   <fileset dir="${project.src.datadir}" id="datafiles">
     <include name="**/**"/>
     <exclude name="**/.DS_Store"/>
     <exclude name="**/.empty"/>
-    <exclude name="**/.svn"/>
+    <exclude name="**/.git*"/>
   </fileset>
   <fileset dir="${project.src.phpdir}" id="phpfiles">
     <include name="**/**"/>
     <exclude name="**/.DS_Store"/>
     <exclude name="**/.empty"/>
-    <exclude name="**/.svn"/>
+    <exclude name="**/.git*"/>
   </fileset>
   <fileset dir="${project.src.testunitdir}/php" id="testfiles">
     <include name="**/**"/>
     <exclude name="**/.DS_Store"/>
     <exclude name="**/.empty"/>
-    <exclude name="**/.svn"/>
+    <exclude name="**/.git*"/>
   </fileset>
   <fileset dir="${project.src.wwwdir}" id="wwwfiles">
     <include name="**/**" />
     <exclude name="**/.DS_Store"/>
     <exclude name="**/.empty"/>
-    <exclude name="**/.svn"/>
+    <exclude name="**/.git*"/>
   </fileset>
   <fileset dir="${project.src.docdir}" id="docfiles">
     <include name="**/**" />
     <exclude name="**/.DS_Store"/>
     <exclude name="**/.empty"/>
-    <exclude name="**/.svn"/>
+    <exclude name="**/.git*"/>
   </fileset>
   <fileset dir="${project.basedir}" id="topleveldocfiles">
     <include name="*.txt" />

diff --git a/utils/pear-build b/utils/pear-build
index c4e4047..d7ce29d 100755 (executable)
--- a/utils/pear-build
+++ b/utils/pear-build
@@ -5,20 +5,10 @@ set -ex
 # create bunch of directories that phing complains about
 mkdir -p docs data www tests/unit-tests/php 
 
-# temporarily move the .git dir, because phing is stupid
-git_dir=php/php-cli-tools/.git
-if [ -f $git_dir ]; then
-       mv $git_dir /tmp/php-cli-tools-git
-fi
-
 # generate package
 find -name '*~' -delete
 phing pear-package
 
-if [ ! -d $git_dir ]; then
-       mv /tmp/php-cli-tools-git $git_dir 
-fi
-
 version=$(cat dist/lastBuilt)
 version="${version/*wpcli-/}"
 version="${version/.tgz/}"