Changeset 305

Timestamp:

08/06/08 04:06:42 (4 years ago)

Author:

john

Message:

updating package make

Location:

trunk

Files:

• README (modified) (2 diffs)
• makepkg.php (modified) (1 diff)
• trax/trax.php (modified) (11 diffs)

trunk/README

@@ -29 +29 @@
 From the commandline run the following command:
 php makepkg.php
+(Disregard any warning messages that say "not prefixed with package name "PHPonTrax"")
 After that runs it will make a build folder with the PEAR module called:
 PHPonTrax-<version>.tgz 
@@ -34 +35 @@
 pear install -a PHPonTrax-<version>.tgz
 If you have a previously installed version exists first run:
-pear uninstall PHPonTrax
+pear uninstall trax/PHPonTrax
 
 == Getting Started

trunk/makepkg.php

@@ -61 +61 @@
     'packagedirectory' => '.',
     'filelistgenerator' => 'svn', // generate from svn or file
+    'simpleoutput' => true,
     'dir_roles' => array(
         'doc' => 'doc',

trunk/trax/trax.php

@@ -48 +48 @@
 function trax() {
 
-    global $search, $replace;
+    global $search, $replace, $quiet;
 
     //  Get command line argument, if any
-    if (!array_key_exists('argc',$GLOBALS)
-        || ($GLOBALS['argc'] < 2)) {
-        usage();                // print Usage message and exit
-    }
+    if (!array_key_exists('argc',$GLOBALS) || ($GLOBALS['argc'] < 2)) {
+        usage(); // print Usage message and exit
+    }
+
+    $first_param_is_option = (substr($GLOBALS['argv'][1], 0, 1) == "-") ? true : false;
 
     //  Check for excess arguments
-    if ($GLOBALS['argc'] > 2) {
+    if ($GLOBALS['argc'] > 3 && !$first_param_is_option) {
         echo "unrecognized command argument ".$GLOBALS['argv'][2]."\n";
         usage();
     }
 
-    //  Destination directory on command line
-    $dstdir = $GLOBALS['argv'][1];
+    if($first_param_is_option) {
+        foreach($GLOBALS['argv'] as $arg) {
+            if($arg == '-v' || $arg == '--version') {
+                include(dirname(__FILE__)."/vendor/trax/trax.php");
+                echo "Trax ".Trax::version()."\n";
+                exit;
+            } elseif($arg == '-h' || $arg == '--help') {
+                usage();
+            }
+        }       
+    } else {
+        //  Destination directory on command line
+        $dstdir = $GLOBALS['argv'][1];  
+        if($GLOBALS['argv'][2] == '-q' || $GLOBALS['argv'][2] == '--quiet') {
+            $quiet = true;          
+        }
+    }
 
     //  Guarantee it ends with DIRECTORY_SEPARATOR
@@ -81 +97 @@
     $srcdir = SOURCE_DIR;
     //  copy source directory to destination directory
-    copy_dir($srcdir,$dstdir);
+    copy_dir($srcdir, $dstdir);
 }
 
@@ -93 +109 @@
  *  @return boolean true=>success, false=>failure.
  */
-function copy_dir($src_path,$dst_path) {
+function copy_dir($src_path, $dst_path) {
+    
+    global $quiet;
 
     //  Make sure we have directories as arguments
@@ -135 +153 @@
                     if ($src_content == $dst_content) {
                         //  Source and destination are identical
-                        echo "$dst_path$src_file exists\n";
+                        if(!$quiet) echo "\texists $dst_path$src_file\n";
                         continue;
                     }
@@ -147 +165 @@
                     return false;
                 }
-                echo "renamed $dst_path$src_file to $new_name\n";
+                if(!$quiet) echo "\trenamed $src_file to ".($src_file.'.'.$stat[9])."\n";
             }
 
@@ -165 +183 @@
             }           
 
-            echo  "$dst_path$src_file created\n";
+            if(!$quiet) echo "\tcreate $dst_path$src_file\n";
         } else {
 
@@ -172 +190 @@
                 continue;
             }
+
             //  This directory needs to be copied.
             if (!create_dir( $dst_path . $src_file )) {
@@ -186 +205 @@
     closedir($src_handle);
     return true;
-}                               // function copy_dir()
+}
 
 /**
  *  Create a directory if it doesn't exist
  *  @param string $dst_dir  Path of directory to create
+ *  @param string $perms Chmod permissions (0775)
  *  @return boolean  true=>success, false=>failed
  */
 function create_dir($dst_dir) {
+    
+    global $quiet;
 
     //  Does a directory of this name exist?
@@ -202 +224 @@
 
             //  A destination directory with this name exists.
-            echo "$dst_dir".DIRECTORY_SEPARATOR." exists\n";
+            if(!$quiet) echo "\texists $dst_dir\n";
             return true;
         }
@@ -211 +233 @@
         $stat = stat($dst_dir);
         $new_name = $dst_dir.'.'.$stat[9];
-        if (!rename($dst_dir,$new_name)) {
+        if (!rename($dst_dir, $new_name)) {
             echo "unable to rename $dst_dir to $new_name\n";
             return false;
         }
-        echo "renamed $dst_dir to $new_name\n";
+        if(!$quiet) echo "\trenamed $dst_dir to $new_name\n";
     }
 
     //  Destination directory does not exist.  Create it
-    if (!mkdir($dst_dir,0775,true)) {
-        return false;
-    }
-    echo "$dst_dir".DIRECTORY_SEPARATOR." created\n";
+    if (!mkdir($dst_dir, 0775, true)) {
+        return false;
+    }
+    if(!$quiet) echo "\tcreate ".$dst_dir."\n";
     return true;
 }
@@ -256 +278 @@
     echo "Usage: @BIN-DIR@".DIRECTORY_SEPARATOR."trax"
         ." ".DIRECTORY_SEPARATOR."path".DIRECTORY_SEPARATOR."to"
-        .DIRECTORY_SEPARATOR."your".DIRECTORY_SEPARATOR."app
+        .DIRECTORY_SEPARATOR."your".DIRECTORY_SEPARATOR."app [options]
+
+Options:
+    -q, --quiet         Suppress normal output.
+    -v, --version           Show the Trax version number and quit.
+    -h, --help          Show this help message and quit.
 
 Description: