svn: /phpdoc/doc-base/trunk/ build.chms.bat scripts/build-chms.php

From: Date: Thu, 19 May 2011 14:30:39 +0000
Subject: svn: /phpdoc/doc-base/trunk/ build.chms.bat scripts/build-chms.php
Groups: php.doc.cvs 
Request: Send a blank email to doc-cvs+get-8158@lists.php.net to get a copy of this message
rquadling Thu, 19 May 2011 14:30:39 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=311256 Log: Remove rsync from Windows CHM compilation process. Store log files below CHM files. Minor tidying. Changed paths: U phpdoc/doc-base/trunk/build.chms.bat U phpdoc/doc-base/trunk/scripts/build-chms.php Modified: phpdoc/doc-base/trunk/build.chms.bat =================================================================== --- phpdoc/doc-base/trunk/build.chms.bat 2011-05-19 13:36:29 UTC (rev 311255) +++ phpdoc/doc-base/trunk/build.chms.bat 2011-05-19 14:30:39 UTC (rev 311256) @@ -2,5 +2,5 @@ SET PHP_DOC_BASE_DIR=%~dp0 svn update scripts/build-chms.php > nul REM Make sure all working directories exist. -FOR %%D IN (logs tmp chmfiles) DO IF NOT EXIST "%PHP_DOC_BASE_DIR%\..\%%D" MD "%PHP_DOC_BASE_DIR%\..\%%D" -CALL "C:\php\binaries\PHP_5_3\php.exe" -d memory_limit=-1 "%PHP_DOC_BASE_DIR%\scripts\build-chms.php" %* > "%PHP_DOC_BASE_DIR%\..\logs\%~n0.log" +FOR %%D IN (tmp chmfiles chmfiles\logs) DO IF NOT EXIST "%PHP_DOC_BASE_DIR%\..\%%D" MD "%PHP_DOC_BASE_DIR%\..\%%D" +CALL "C:\php\binaries\PHP_5_3\php.exe" -d memory_limit=-1 "%PHP_DOC_BASE_DIR%\scripts\build-chms.php" %* > "%PHP_DOC_BASE_DIR%\..\chmfiles\logs\%~n0.log" Modified: phpdoc/doc-base/trunk/scripts/build-chms.php =================================================================== --- phpdoc/doc-base/trunk/scripts/build-chms.php 2011-05-19 13:36:29 UTC (rev 311255) +++ phpdoc/doc-base/trunk/scripts/build-chms.php 2011-05-19 14:30:39 UTC (rev 311256) @@ -35,13 +35,13 @@ */ define('PATH_PHP', 'C:\\php\\binaries\\PHP_5_3\\php.exe'); define('PATH_PHD', 'C:\\pear\\phd-trunk\\phd.bat'); - define('PATH_HHC', 'C:\\Program Files (x86)\HTML Help Workshop\hhc.exe'); - define('PATH_SCP', 'C:\\Program Files (x86)\PuTTY\pscp.exe'); + define('PATH_HHC', 'C:\\Program Files (x86)\\HTML Help Workshop\\hhc.exe'); + define('PATH_SCP', 'C:\\Program Files (x86)\\PuTTY\\pscp.exe'); define('PATH_PPK', 'C:\\php-sdk\\keys\\php-doc-host.ppk'); define('PATH_SVN', 'C:\\Program Files\\SlikSvn\\bin\\svn.exe'); define('PATH_PEAR', 'C:\\pear\\pear.bat'); - define('PATH_CHM', 'C:\doc-all\\chmfiles'); - define('PATH_LOG', 'C:\\doc-all\\logs'); + define('PATH_CHM', 'C:\\doc-all\\chmfiles'); + define('PATH_LOG', 'C:\\doc-all\\chmfiles\\logs'); define('PATH_DOC', 'C:\\doc-all'); define('EXTENDED', true); @@ -101,11 +101,6 @@ } /** - * Allow the build to run without rsync. - */ - $allow_rsync = !in_array('--norsync' $argv); - - /** * Hold the results of this build */ $build_history = array(); @@ -188,33 +183,11 @@ } /** - * Update the CHM on the rsync server - */ - if ($allow_rsync) - { - execute_task('- rsync', PATH_SCP, ' -batch -v -i "' . PATH_PPK . '" -l bjori "' . PATH_DOC . '\\chmfiles\\php_manual_' . $lang . '.chm" rsync.php.net:/home/bjori/manual-chms-new/', 'rsync_' . $lang, false); - } - - /** * Check if we are supposed to build the enhanced version */ if(EXTENDED) { - /* ... */ /** - * Run .manual.xml thru PhD (--css reset.css --css theme.css --css doc.css) - */ - /* The PhD rendering is taking place along side the main rendering. Should improve speed. - execute_task('- [Enhanced] PhD', PATH_PHD, '-d "' . PATH_DOC . '\\doc-base\\.manual.xml' . '" -P PHP -f enhancedchm -o "' . PATH_DOC . '\\tmp\\' . $lang . '" --lang=' . $lang, 'phd_enhanced_' . $lang); - - if(!is_file(PATH_DOC . '\\tmp\\' . $lang . '\\php-enhancedchm\\php_manual_' . $lang . '.hhp')) - { - echo(date('r') . ' - Build error: Enhanced: PhD failed' . PHP_EOL); - - goto cleanup; - }*/ - - /** * Run the HTML Help Compiler to generate the actual CHM file */ execute_task('- [Enhanced] HHC', PATH_HHC, '"' . PATH_DOC . '\\tmp\\' . $lang . '\\php-enhancedchm\\php_manual_' . $lang . '.hhp"', 'hhc_enhanced_' . $lang); @@ -250,14 +223,6 @@ */ $build_history[] = array('php_enhanced_' . $lang . '.chm', md5_file($s_CHMFilename), filemtime($s_CHMFilename)); } - - /** - * Update the CHM on the rsync server - */ - if ($allow_rsync) - { - execute_task('- [Enhanced] rsync', PATH_SCP, ' -batch -v -i "' . PATH_PPK . '" -l bjori "' . PATH_DOC . '\\chmfiles\\php_enhanced_' . $lang . '.chm" rsync.php.net:/home/bjori/manual-chms-new/', 'rsync_enhanced_' . $lang, false); - } } /**

« previous php.doc.cvs (#8158) next »