cvs: peardoc /scripts pearwebbuild.php

cweiske		Sun Feb 22 12:53:37 2009 UTC

  Modified files:              
    /peardoc/scripts	pearwebbuild.php 
  Log:
  This should make everything ready to generate chms during our normal build
  process
  
  
http://cvs.php.net/viewvc.cgi/peardoc/scripts/pearwebbuild.php?r1=1.17&r2=1.18&diff_format=u
Index: peardoc/scripts/pearwebbuild.php
diff -u peardoc/scripts/pearwebbuild.php:1.17 peardoc/scripts/pearwebbuild.php:1.18
--- peardoc/scripts/pearwebbuild.php:1.17	Sun Feb 22 11:57:52 2009
+++ peardoc/scripts/pearwebbuild.php	Sun Feb 22 12:53:37 2009
@@ -22,7 +22,7 @@
 require_once 'Console/CommandLine.php';
 $parser = new Console_CommandLine();
 $parser->description = 'Builds the full manual';
-$parser->version = '$Id: pearwebbuild.php,v 1.17 2009/02/22 11:57:52 cweiske Exp $';
+$parser->version = '$Id: pearwebbuild.php,v 1.18 2009/02/22 12:53:37 cweiske Exp $';
 $parser->addOption('updatecvs', array(
     'long_name'   => '--updatecvs',
     'description' => 'Update peardoc from CVS',
@@ -96,6 +96,8 @@
     if ($return == 0) {
         logAndEcho("Now running phd for $lang");
 
+        $extracopyfiles = '';
+
         //bightml
         logAndEcho(' Rendering all pear themes');
         shell_exec("$phd_executable -L $lang -f xhtml -t pear -o build/$lang -d .manual.xml" . $tobuildlog);
@@ -177,13 +179,23 @@
         }
 
         if ($cmdline->options['hhc']) {
+            // we need to chmod the chm dir since the html help compiler
+            // is being run as an own user
             logAndEcho(' Compiling chm manual');
             passthru(
+                "chmod og+w build/$lang/chm && "
                 "cd build/$lang/chm && "
                 . $cmdline->options['hhc']
                 . ' pear_manual_' . $lang . '.hhp'
                 . $tobuildlog
             );
+            $chmfile = "build/$lang/chm/pear_manual_$lang.chm";
+            if (file_exists($chmfile)) {
+                $extracopyfiles .= ' ' . escapeshellarg($chmfile);
+            } else {
+                logAndEcho('Tried to compile chm, but chm file does not exist.');
+                logAndEcho($chmfile);
+            }
         }
 
         // move compressed downloadable files to downloaddir
@@ -198,6 +210,7 @@
                     . ' ' . escapeshellarg("build/$lang/pear_manual_$lang.tar.bz2")
                     . ' ' . escapeshellarg("build/$lang/pear_manual_$lang.tar.gz")
                     . ' ' . escapeshellarg("build/$lang/pear_manual_$lang.zip")
+                    . ' ' . $extracopyfiles
                     . ' ' . escapeshellarg($cmdline->options['downloaddir'])
                     . $tobuildlog
                 );