Keep package clean, do not include PHPunit in build. rm -rf piwik/vendor/sebastian/

1 files changed, 156 insertions, 155 deletions

diff --git a/misc/package/build.sh b/misc/package/build.sh
index ac7e449454..33190ce814 100755
--- a/misc/package/build.sh
+++ b/misc/package/build.sh
@@ -17,151 +17,152 @@ WWW_SCP_LATEST=piwik@localhost:/home/piwik/www/
 
 # report error and exit
 function die() {
-	echo -e "$0: $1"
-	exit 2
+    echo -e "$0: $1"
+    exit 2
 }
 
 # clean up the workspace
 function cleanupWorkspace() {
-	rm -rf piwik
-	rm -f *.html
-	rm -f *.xml
-	rm -f *.sql
-	rm -f *.md
-	rm -f *.html.*
+    rm -rf piwik
+    rm -f *.html
+    rm -f *.xml
+    rm -f *.sql
+    rm -f *.md
+    rm -f *.html.*
 }
 
 # organize files for packaging
 function organizePackage() {
 #        cd piwik/
-	#ls -la
-	curl -sS https://getcomposer.org/installer | php
+    #ls -la
+    curl -sS https://getcomposer.org/installer | php
 #        php composer.phar install #REMOVED
     php composer.phar install
     cd ../
     rm -rf piwik/composer.phar
-	rm -rf piwik/vendor/twig/twig/test/
+    rm -rf piwik/vendor/twig/twig/test/
     rm -rf piwik/vendor/twig/twig/doc/
-	rm -rf piwik/vendor/symfony/console/Symfony/Component/Console/Tests
+    rm -rf piwik/vendor/symfony/console/Symfony/Component/Console/Tests
     rm -rf piwik/vendor/symfony/console/Symfony/Component/Console/Resources/bin
-	rm -rf piwik/vendor/phpunit/
-
-	rm -rf piwik/libs/PhpDocumentor-1.3.2/
-	rm -rf piwik/libs/FirePHPCore/
-	rm -f piwik/libs/open-flash-chart/php-ofc-library/ofc_upload_image.php
-
-	rm -rf piwik/tmp/*
-	rm -rf piwik/tmp/.gitkeep
-	rm -f piwik/misc/updateLanguageFiles.sh
-	rm -f piwik/misc/others/db-schema*
-	rm -f piwik/misc/others/diagram_general_request*
-	rm -f piwik/.travis*
-
-	# delete submodules empty dirs
-	for path_to_delete in `cat piwik/.gitmodules  | grep "path = " | sed "s/.*path = //"` ; do rmdir piwik/$path_to_delete; done
-	rm -rf piwik/.git*
-
-	cp piwik/tests/README.md .
-	find piwik -name 'tests' -type d -prune -exec rm -rf {} \;
-	mkdir piwik/tests
-	mv README.md piwik/tests/
-
-	cp piwik/misc/How\ to\ install\ Piwik.html .
-	if [ -e piwik/misc/package ]; then
-		cp piwik/misc/package/WebAppGallery/*.* .
-		rm -rf piwik/misc/package/
-	else
-		if [ -e piwik/misc/WebAppGallery ]; then
-			cp piwik/misc/WebAppGallery/*.* .
-			rm -rf piwik/misc/WebAppGallery
-		fi
-	fi
-
-	find piwik -type f -printf '%s ' -exec md5sum {} \; | grep -v "user/.htaccess" | egrep -v 'manifest.inc.php|autoload.php|autoload_real.php' | sed '1,$ s/\([0-9]*\) \([a-z0-9]*\) *piwik\/\(.*\)/\t\t"\3" => array("\1", "\2"),/;' | sort | sed '1 s/^/<?php\n\/\/ This file is automatically generated during the Piwik build process\nnamespace Piwik;\nclass Manifest {\n\tstatic $files=array(\n/; $ s/$/\n\t);\n}/' > piwik/config/manifest.inc.php 
+    rm -rf piwik/vendor/phpunit/
+    rm -rf piwik/vendor/sebastian/
+
+    rm -rf piwik/libs/PhpDocumentor-1.3.2/
+    rm -rf piwik/libs/FirePHPCore/
+    rm -f piwik/libs/open-flash-chart/php-ofc-library/ofc_upload_image.php
+
+    rm -rf piwik/tmp/*
+    rm -rf piwik/tmp/.gitkeep
+    rm -f piwik/misc/updateLanguageFiles.sh
+    rm -f piwik/misc/others/db-schema*
+    rm -f piwik/misc/others/diagram_general_request*
+    rm -f piwik/.travis*
+
+    # delete submodules empty dirs
+    for path_to_delete in `cat piwik/.gitmodules  | grep "path = " | sed "s/.*path = //"` ; do rmdir piwik/$path_to_delete; done
+    rm -rf piwik/.git*
+
+    cp piwik/tests/README.md .
+    find piwik -name 'tests' -type d -prune -exec rm -rf {} \;
+    mkdir piwik/tests
+    mv README.md piwik/tests/
+
+    cp piwik/misc/How\ to\ install\ Piwik.html .
+    if [ -e piwik/misc/package ]; then
+        cp piwik/misc/package/WebAppGallery/*.* .
+        rm -rf piwik/misc/package/
+    else
+        if [ -e piwik/misc/WebAppGallery ]; then
+            cp piwik/misc/WebAppGallery/*.* .
+            rm -rf piwik/misc/WebAppGallery
+        fi
+    fi
+
+	find piwik -type f -printf '%s ' -exec md5sum {} \; | grep -v "user/.htaccess" | egrep -v 'manifest.inc.php|autoload.php|autoload_real.php' | sed '1,$ s/\([0-9]*\) \([a-z0-9]*\) *piwik\/\(.*\)/\t\t"\3" => array("\1", "\2"),/;' | sort | sed '1 s/^/<?php\n\/\/ This file is automatically generated during the Piwik build process\nnamespace Piwik;\nclass Manifest {\n\tstatic $files=array(\n/; $ s/$/\n\t);\n}/' > piwik/config/manifest.inc.php
 
 }
 
 if [ -z "$VERSION" ]; then
-	die "Expected a version number, 'nightly', or 'webtest' as a parameter"
+    die "Expected a version number, 'nightly', or 'webtest' as a parameter"
 fi
 
 case "$VERSION" in
-	"nightly" )
-		if [ ! -e "${WORKSPACE}/trunk" ]; then
-			die "Piwik trunk not present!"
-		fi
+    "nightly" )
+        if [ ! -e "${WORKSPACE}/trunk" ]; then
+            die "Piwik trunk not present!"
+        fi
 
-		cleanupWorkspace
-		rm -f latest.zip
+        cleanupWorkspace
+        rm -f latest.zip
 
-		cp -R trunk piwik
-		find piwik -name '.git' -type d -prune -exec rm -rf {} \;
+        cp -R trunk piwik
+        find piwik -name '.git' -type d -prune -exec rm -rf {} \;
 
-		organizePackage
+        organizePackage
 
-		zip -q -r latest.zip piwik How\ to\ install\ Piwik.html *.xml *.sql > /dev/null 2> /dev/null
-		;;
-	"webtest" )
-		if [ ! -e "${WORKSPACE}/build/core/Version.php" ]; then
-			die "Piwik source files not present!"
-		fi
+        zip -q -r latest.zip piwik How\ to\ install\ Piwik.html *.xml *.sql > /dev/null 2> /dev/null
+        ;;
+    "webtest" )
+        if [ ! -e "${WORKSPACE}/build/core/Version.php" ]; then
+            die "Piwik source files not present!"
+        fi
 
-		cleanupWorkspace
-		rm -rf 1.0
-		rm -f latest.zip
+        cleanupWorkspace
+        rm -rf 1.0
+        rm -f latest.zip
 
-		cp -R build piwik
-		find piwik -name '.git' -type d -prune -exec rm -rf {} \;
+        cp -R build piwik
+        find piwik -name '.git' -type d -prune -exec rm -rf {} \;
 
-		organizePackage
+        organizePackage
 
-		zip -q -r latest.zip piwik > /dev/null 2> /dev/null
+        zip -q -r latest.zip piwik > /dev/null 2> /dev/null
 
-		# Set-up infrastructure proxies for testing
-		LATESTVERSION=`fgrep VERSION build/core/Version.php  | sed -e "s/\tconst VERSION = '//" | sed -e "s/'.*//"`
-		mkdir 1.0
-		mkdir 1.0/getLatestVersion
-		cat >1.0/getLatestVersion/index.php <<GET_LATEST_VERSION
+        # Set-up infrastructure proxies for testing
+        LATESTVERSION=`fgrep VERSION build/core/Version.php  | sed -e "s/\tconst VERSION = '//" | sed -e "s/'.*//"`
+        mkdir 1.0
+        mkdir 1.0/getLatestVersion
+        cat >1.0/getLatestVersion/index.php <<GET_LATEST_VERSION
 <?php
-	echo "${LATESTVERSION}";
+    echo "${LATESTVERSION}";
 GET_LATEST_VERSION
 
-		mkdir 1.0/subscribeNewsletter
-		cat >1.0/subscribeNewsletter/index.php <<SUBSCRIBE_NEWSLETTER
+        mkdir 1.0/subscribeNewsletter
+        cat >1.0/subscribeNewsletter/index.php <<SUBSCRIBE_NEWSLETTER
 <?php
-	echo "ok";
+    echo "ok";
 SUBSCRIBE_NEWSLETTER
-		;;
+        ;;
 
 # BUILDING RELEASE
-	* )
+    * )
         # Setting umask so it works for most users, see http://dev.piwik.org/trac/ticket/3869
         UMASK=`umask`
         umask 0022
 
-		if [ ! -e $DEST_PATH ] ; then
-			echo "Destination directory does not exist... Creating it!";
-			mkdir -p $DEST_PATH;
-		fi
+        if [ ! -e $DEST_PATH ] ; then
+            echo "Destination directory does not exist... Creating it!";
+            mkdir -p $DEST_PATH;
+        fi
 
-		cd $DEST_PATH
-		cleanupWorkspace
+        cd $DEST_PATH
+        cleanupWorkspace
 
         if [ ! -e $DEST_PATH/piwik_last_version ] ; then
-			git clone -- $URL_REPO $DEST_PATH/piwik_last_version 
-		fi 
-		echo "checkout repository for tag $VERSION..."
-		cd $DEST_PATH/piwik_last_version
-		git pull
+            git clone -- $URL_REPO $DEST_PATH/piwik_last_version 
+        fi 
+        echo "checkout repository for tag $VERSION..."
+        cd $DEST_PATH/piwik_last_version
+        git pull
         git checkout tags/$VERSION
 
-		echo "copying files to a new directory..."
-		cd ..
-		rm -Rf piwik
-		cp -R piwik_last_version piwik
-		cd piwik
-		git checkout master
-		git pull
+        echo "copying files to a new directory..."
+        cd ..
+        rm -Rf piwik
+        cp -R piwik_last_version piwik
+        cd piwik
+        git checkout master
+        git pull
 
         if [ `git describe --exact-match --tags HEAD` != "$VERSION" ]
         then
@@ -169,63 +170,63 @@ SUBSCRIBE_NEWSLETTER
             exit 1
         fi
 
-		cd $DEST_PATH/piwik
+        cd $DEST_PATH/piwik
         git checkout tags/$VERSION
 
-		echo "preparing release $VERSION"
-
-		echo `grep "'$VERSION'" core/Version.php`
-		if [ `grep "'$VERSION'" core/Version.php | wc -l` -ne 1 ]; then
-			echo "version $VERSION does not match core/Version.php";
-			exit
-		fi
-
-		echo "organizing files and writing manifest file..."
-		organizePackage
-
-		echo "packaging release..."
-		zip -r piwik-$VERSION.zip piwik How\ to\ install\ Piwik.html > /dev/null
-		tar -czf piwik-$VERSION.tar.gz piwik How\ to\ install\ Piwik.html
-		mv piwik-$VERSION.{zip,tar.gz} $HTTP_PATH
-
-		zip -r piwik-$VERSION-WAG.zip piwik *.xml *.sql > /dev/null 2> /dev/null
-		mkdir $HTTP_PATH/WebAppGallery 2> /dev/null
-		mv piwik-$VERSION-WAG.zip $HTTP_PATH/WebAppGallery/piwik-$VERSION.zip
-
-		# setting back umask
-		umask $UMASK
-
-		if [ `echo $VERSION | grep -E 'rc|b|a|alpha|beta|dev' -i | wc -l` -eq 1 ]; then
-			if [ `echo $VERSION | grep -E 'rc|b|beta' -i | wc -l` -eq 1 ]; then
-				echo "Beta or RC release";
-				echo $VERSION > $HTTP_PATH/LATEST_BETA
-			fi
-			echo "build finished! http://builds.piwik.org/piwik-$VERSION.zip"
-		else
-			echo "Stable release";
-
-			#hard linking piwik.org/latest.zip to the newly created build
-			for i in zip tar.gz; do
-				ln -sf $HTTP_PATH/piwik-$VERSION.$i $HTTP_PATH/latest.$i
+        echo "preparing release $VERSION"
+
+        echo `grep "'$VERSION'" core/Version.php`
+        if [ `grep "'$VERSION'" core/Version.php | wc -l` -ne 1 ]; then
+            echo "version $VERSION does not match core/Version.php";
+            exit
+        fi
+
+        echo "organizing files and writing manifest file..."
+        organizePackage
+
+        echo "packaging release..."
+        zip -r piwik-$VERSION.zip piwik How\ to\ install\ Piwik.html > /dev/null
+        tar -czf piwik-$VERSION.tar.gz piwik How\ to\ install\ Piwik.html
+        mv piwik-$VERSION.{zip,tar.gz} $HTTP_PATH
+
+        zip -r piwik-$VERSION-WAG.zip piwik *.xml *.sql > /dev/null 2> /dev/null
+        mkdir $HTTP_PATH/WebAppGallery 2> /dev/null
+        mv piwik-$VERSION-WAG.zip $HTTP_PATH/WebAppGallery/piwik-$VERSION.zip
+
+        # setting back umask
+        umask $UMASK
+
+        if [ `echo $VERSION | grep -E 'rc|b|a|alpha|beta|dev' -i | wc -l` -eq 1 ]; then
+            if [ `echo $VERSION | grep -E 'rc|b|beta' -i | wc -l` -eq 1 ]; then
+                echo "Beta or RC release";
+                echo $VERSION > $HTTP_PATH/LATEST_BETA
+            fi
+            echo "build finished! http://builds.piwik.org/piwik-$VERSION.zip"
+        else
+            echo "Stable release";
+
+            #hard linking piwik.org/latest.zip to the newly created build
+            for i in zip tar.gz; do
+                ln -sf $HTTP_PATH/piwik-$VERSION.$i $HTTP_PATH/latest.$i
                 ln -sf $HTTP_PATH/piwik-$VERSION.$i $HTTP_PATH/piwik-latest.$i
-			done
-				
-			# record filesize in Mb
-			ls -l $HTTP_PATH/piwik-$VERSION.zip | awk '/d|-/{printf("%.3f %s\n",$5/(1024*1024),$9)}' > LATEST_SIZE
-			
-			echo $VERSION > $HTTP_PATH/LATEST
-			echo $VERSION > $HTTP_PATH/LATEST_BETA
-
-			CMD="scp $HTTP_PATH/LATEST $API_SCP_LATEST"
-			echo $CMD
-			$CMD
-
-			CMD="scp $HTTP_PATH/LATEST LATEST_SIZE $WWW_SCP_LATEST"
-			echo $CMD
-			$CMD
-
-			echo -e "Sending email to Microsoft web team \n\n"
-			echo -e "Hello, \n \
+            done
+                
+            # record filesize in Mb
+            ls -l $HTTP_PATH/piwik-$VERSION.zip | awk '/d|-/{printf("%.3f %s\n",$5/(1024*1024),$9)}' > LATEST_SIZE
+            
+            echo $VERSION > $HTTP_PATH/LATEST
+            echo $VERSION > $HTTP_PATH/LATEST_BETA
+
+            CMD="scp $HTTP_PATH/LATEST $API_SCP_LATEST"
+            echo $CMD
+            $CMD
+
+            CMD="scp $HTTP_PATH/LATEST LATEST_SIZE $WWW_SCP_LATEST"
+            echo $CMD
+            $CMD
+
+            echo -e "Sending email to Microsoft web team \n\n"
+            echo -e "Hello, \n \
 We are proud to announce this new release for Piwik. \n \
 Piwik $VERSION can be downloaded at: http://builds.piwik.org/piwik-$VERSION.zip \n \
 For more information, consult the changelog: http://piwik.org/changelog/ \n \
@@ -235,9 +236,9 @@ Thank you,\n \
 Matthieu\n \
 Piwik release manager" | mail -s"New Piwik Version $VERSION" "appgal@microsoft.com,team@piwik.org"
 
-			echo "build finished! http://builds.piwik.org/latest.zip"
-		fi
-	;;
+            echo "build finished! http://builds.piwik.org/latest.zip"
+        fi
+    ;;
 esac
 
 cleanupWorkspace