GenCode - Cleanup

diff --git a/CRM/Core/CodeGen/Util/File.php b/CRM/Core/CodeGen/Util/File.php
index 630e07026e3267f7e27ae13d653f250f755054c8..cb5f4f2c2dc8ce22734c4511ee93b215db22fab6 100644 (file)
--- a/CRM/Core/CodeGen/Util/File.php
+++ b/CRM/Core/CodeGen/Util/File.php
@@ -48,9 +48,9 @@ class CRM_Core_CodeGen_Util_File {
   }
 
   /**
-   * Find the paths to all key files involved in the gen-code process
+   * Find the path to the main Civi source tree
    *
-   * @return array
+   * @return string
    * @throws RuntimeException
    */
   static function findCoreSourceDir() {
@@ -65,7 +65,6 @@ class CRM_Core_CodeGen_Util_File {
   /**
    * Find files in several directories using several filename patterns
    *
-   *
    * @param array $pairs each item is an array(0 => $searchBaseDir, 1 => $filePattern)
    * @return array of file paths
    */

diff --git a/xml/GenCode.php b/xml/GenCode.php
index 797bad14340da319795535257695a34d85fbdcef..285582a9c07b7d519f4c34274b6790086bd5803f 100644 (file)
--- a/xml/GenCode.php
+++ b/xml/GenCode.php
@@ -22,14 +22,14 @@ CRM_Core_ClassLoader::singleton()->register();
 
 # TODO: pull these settings from configuration
 $genCode = new CRM_Core_CodeGen_Main(
-  '../CRM/Core/DAO/',                                                 // $CoreDAOCodePath
-  '../sql/',                                                          // $sqlCodePath
-  '../',                                                              // $phpCodePath
-  '../templates/',                                                    // $tplCodePath
-  array('../packages/Smarty/plugins', '../CRM/Core/Smarty/plugins'),  // smarty plugin dirs
-  @$argv[3],                                                          // cms
-  empty($argv[2]) ? NULL : $argv[2],                                  // db version
-  empty($argv[1]) ? 'schema/Schema.xml' : $argv[1],                    // schem afile
-  getenv('CIVICRM_GENCODE_DIGEST') ? getenv('CIVICRM_GENCODE_DIGEST') : NULL
+  '../CRM/Core/DAO/',                                                         // $CoreDAOCodePath
+  '../sql/',                                                                  // $sqlCodePath
+  '../',                                                                      // $phpCodePath
+  '../templates/',                                                            // $tplCodePath
+  array('../packages/Smarty/plugins', '../CRM/Core/Smarty/plugins'),          // smarty plugin dirs
+  @$argv[3],                                                                  // cms
+  empty($argv[2]) ? NULL : $argv[2],                                          // db version
+  empty($argv[1]) ? 'schema/Schema.xml' : $argv[1],                           // schema file
+  getenv('CIVICRM_GENCODE_DIGEST') ? getenv('CIVICRM_GENCODE_DIGEST') : NULL  // path to digest file
 );
 $genCode->main();