Changeset 2893

Timestamp:

01/13/09 08:47:18 (4 years ago)

Author:

wwalc

Message:

Added error handling when PHP is missing

Location:

CKReleaser/trunk

Files:

• ckreleaser.js (modified) (1 diff)
• includes/ckreleaser.js (modified) (1 diff)
• includes/releaser.js (modified) (2 diffs)

CKReleaser/trunk/ckreleaser.js

@@ -5 +5 @@
 
 importPackage( org.mozilla.javascript );
-importClass( java.lang.System );
 importClass( java.io.File );
 

CKReleaser/trunk/includes/ckreleaser.js

@@ -5 +5 @@
 
 importClass( java.lang.Integer );
+importClass( java.lang.System );
 
 var CKRELEASER = {
         verbose : 0,
+        os : System.getProperty( "os.name" ).substring(0,3).toLowerCase(),
 
         timestamp :( function()

CKReleaser/trunk/includes/releaser.js

@@ -82 +82 @@
         }
 
-         function minifyFiles( file )
+        function minifyFiles( file )
         {
                 if ( file.isDirectory() )
@@ -291 +291 @@
                                 };
 
-                                runCommand( "php", "tools/fixlineends/fixlineends.php", "--eolstripwhite", "--eofnewline", "--eofstripwhite", "--nohidden",
-                                                "--nosystem", CKRELEASER.releaseDir, o );
+                                try
+                                {
+                                        runCommand( "php", "tools/fixlineends/fixlineends.php", "--eolstripwhite", "--eofnewline", "--eofstripwhite",
+                                                        "--nohidden", "--nosystem", CKRELEASER.releaseDir, o );
+                                }
+                                catch ( e )
+                                {
+                                        if ( CKRELEASER.os == 'win' )
+                                        {
+                                                throw "php is not recognized as an internal or external command. Make sure that PHP is installed in your system and the 'Path' environment variable in your environment is pointing to it."
+                                        }
+                                        else
+                                        {
+                                                throw "php: command not found. Make sure that PHP is installed in your system and the PATH variable in your environment is pointing to it."
+                                        }
+                                }
 
                                 if ( CKRELEASER.verbose )