[Joomla-commits] r22963 - development/trunk/build

[githu...@jcode001.directrouter.com]

Author: github_bot
Date: 2012-03-29 13:46:25 -0500 (Thu, 29 Mar 2012)
New Revision: 22963

Modified:
development/trunk/build/build.php
Log:
Merge branch 'master' of github.com:joomla/joomla-cms

Modified: development/trunk/build/build.php
===================================================================
--- development/trunk/build/build.php 2012-03-29 17:46:25 UTC (rev 22962)
+++ development/trunk/build/build.php 2012-03-29 18:46:25 UTC (rev 22963)
@@ -29,7 +29,7 @@

// Set release for each build
// Release is third digit (like '0', '1', or '2')
-$release = '1';
+$release = '4';

// Path to local git repository (parent folder of build folder)
$repo = dirname(dirname(__FILE__));
@@ -75,7 +75,7 @@

// Here we get a list of all files that have changed between the two tags ($previousTag and $full) and save in diffdocs
$previousTag = $version . '.' . $num;
- $command = '/usr/local/git/bin/git diff tags/'. $full . ' tags/' . $previousTag . ' --name-only > diffdocs/'.$version.'.'.$num;
+ $command = '/usr/local/git/bin/git diff tags/'. $previousTag . ' tags/' . $full . ' --name-status > diffdocs/'.$version.'.'.$num;
system($command);

// $newfile will hold the array of files to include in diff package
@@ -85,9 +85,9 @@
// Loop through and add all files except: tests, installation, build, .git, or docs
foreach($files AS $file)
{
- if(substr($file, 0, 5) != 'tests' && substr($file, 0, 12) != 'installation' && substr($rawfile,0,5) != 'build'
- && substr($file, 0, 4) != '.git' && substr($file, 0, 4) != 'docs') {
- $newfile[] = $file;
+ if(substr($file, 2, 5) != 'tests' && substr($file, 2, 12) != 'installation' && substr($rawfile,2,5) != 'build'
+ && substr($file, 2, 4) != '.git' && substr($file, 2, 4) != 'docs' && substr($file, 0, 1) != 'D') {
+ $newfile[] = substr($file, 2);
}
}

_______________________________________________
Joomla-commits mailing list
Joomla-...@joomlacode.org
http://joomlacode.org/mailman/listinfo/joomla-commits