diff --git a/Makefile b/Makefile index 6815b70368..db8dfe985b 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ build4sae: # change the logic of merge model file in helper.class.php. sed -e 's/\$$app->getTmpRoot/"saemc:\/\/" . \$$app\-\>getTmpRoot/g' zentaopms/framework/helper.class.php >zentaopms/framework/helper.class.new mv zentaopms/framework/helper.class.new zentaopms/framework/helper.class.php - cp build/sae/my.php zentaopms/config/my.php + cp build/sae/mysae.php zentaopms/config/my.php cp build/sae/sae_app_wizard.xml zentaopms/ # get the extension files. svn export https://svn.cnezsoft.com/easysoft/trunk/zentaoext/sae @@ -108,9 +108,8 @@ build4yunshangdian: rm -fr zentaopms/tmp rm -fr zentaopms/data # copy the my.php - cp build/sae/my.php zentaopms/config/my.php - sed -e 's/PATH_INFO/GET/g' build/sae/my.php > zentaopms/config/my.php mkdir zentaopms/config/ext + cp build/sae/mysyun.php zentaopms/config/ext/syun.php # copy the wizard.xml. grep -v 'Storage' build/sae/sae_app_wizard.xml | grep -v 'Memcache' > zentaopms/sae_app_wizard.xml # get the extension files. diff --git a/build/sae/my.php b/build/sae/mysae.php similarity index 62% rename from build/sae/my.php rename to build/sae/mysae.php index 69aa9c48bd..57ce5069dd 100755 --- a/build/sae/my.php +++ b/build/sae/mysae.php @@ -29,25 +29,3 @@ $saeDB = new saemysql(); $saeSQL = "SELECT COUNT(`id`) FROM `" . $config->db->prefix . "config` WHERE 1 LIMIT 0,10"; if($saeDB->getData($saeSQL)) $config->installed = true; $saeDB->closeDb(); - -$appRoot = dirname(dirname(__FILE__)) . '/' ; -$htaccessFile = $appRoot . 'htaccess'; -if(file_exists($htaccessFile)) rename($htaccessFile, str_replace('htaccess', '.htaccss', $htaccessFile)); - -$tmpRoot = $appRoot . '/tmp/'; -if(!is_dir($tmpRoot)) -{ - mkdir($tmpRoot, 0777); - mkdir($tmpRoot . 'cache', 0777); - mkdir($tmpRoot . 'extension', 0777); - mkdir($tmpRoot . 'log', 0777); - mkdir($tmpRoot . 'model', 0777); - mkdir($tmpRoot . 'svn', 0777); -} - -$dataRoot = $appRoot . 'data/'; -if(!is_dir($dataRoot)) -{ - mkdir($dataRoot, 0777); - mkdir($dataRoot . 'upload', 0777); -} diff --git a/build/sae/mysyun.php b/build/sae/mysyun.php new file mode 100755 index 0000000000..8f5cef105a --- /dev/null +++ b/build/sae/mysyun.php @@ -0,0 +1,28 @@ +webRoot . 'index.php', file_get_contents($sourceHtaccessFile)); + file_put_contents($targetHtaccessFile, $targetHtaccessCode); +} + +$tmpRoot = $appRoot . '/tmp/'; +if(!is_dir($tmpRoot)) +{ + mkdir($tmpRoot, 0777); + mkdir($tmpRoot . 'cache', 0777); + mkdir($tmpRoot . 'extension', 0777); + mkdir($tmpRoot . 'log', 0777); + mkdir($tmpRoot . 'model', 0777); + mkdir($tmpRoot . 'svn', 0777); +} + +$dataRoot = $appRoot . 'data/'; +if(!is_dir($dataRoot)) +{ + mkdir($dataRoot, 0777); + mkdir($dataRoot . 'upload', 0777); +}