From 83c6c5dfd2bdd93387d3f1bc7c1b95685f93ff6e Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 18 Dec 2012 03:05:26 +0000 Subject: [PATCH] * change for upgrade to 4.0.beta2. --- Makefile | 2 ++ VERSION | 2 +- config/config.php | 2 +- module/upgrade/lang/en.php | 1 + module/upgrade/lang/zh-cn.php | 1 + module/upgrade/model.php | 10 ++++++---- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index bd071c77c0..29717ca993 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,8 @@ tgz: mv zentaotest.zip zentaopms/tmp/extension mv zentaostory.zip zentaopms/tmp/extension mv zentaotask.zip zentaopms/tmp/extension + cd ~/zentao/notify && git pull && git archive --format=zip -9 --prefix=notify/ HEAD > ./notify.zip + mv ~/zentao/notify/notify.zip zentaopms/tmp/extension # zip it. zip -r -9 ZenTaoPMS.$(VERSION).zip zentaopms rm -fr zentaopms diff --git a/VERSION b/VERSION index 0052473290..30b4accb6f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.beta1 +4.0.beta2 diff --git a/config/config.php b/config/config.php index 3bfd29f7aa..8e2e48c6fd 100644 --- a/config/config.php +++ b/config/config.php @@ -12,7 +12,7 @@ * @link http://www.zentao.net */ /* Basic settings. */ -$config->version = '4.0.beta1'; // The version of zentaopms. Don't change it. +$config->version = '4.0.beta2'; // The version of zentaopms. Don't change it. $config->encoding = 'UTF-8'; // The encoding of zentaopms. $config->cookieLife = time() + 2592000; // The cookie life time. $config->timezone = 'Asia/Shanghai'; // The time zone setting, for more see http://www.php.net/manual/en/timezones.php diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php index 400a9b1cc1..f0d4f17f5a 100644 --- a/module/upgrade/lang/en.php +++ b/module/upgrade/lang/en.php @@ -65,3 +65,4 @@ $lang->upgrade->fromVersions['3_1'] = '3.1'; $lang->upgrade->fromVersions['3_2'] = '3.2'; $lang->upgrade->fromVersions['3_2_1'] = '3.2.1'; $lang->upgrade->fromVersions['3_3'] = '3.3'; +$lang->upgrade->fromVersions['4_0_beta1'] = '4.0 BETA1'; diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php index d131b91f41..71faa8a275 100644 --- a/module/upgrade/lang/zh-cn.php +++ b/module/upgrade/lang/zh-cn.php @@ -65,3 +65,4 @@ $lang->upgrade->fromVersions['3_1'] = '3.1'; $lang->upgrade->fromVersions['3_2'] = '3.2'; $lang->upgrade->fromVersions['3_2_1'] = '3.2.1'; $lang->upgrade->fromVersions['3_3'] = '3.3'; +$lang->upgrade->fromVersions['4_0_beta1'] = '4.0 BETA1'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 080e14a7a8..93f5d8d255 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -75,6 +75,7 @@ class upgradeModel extends model $this->execSQL($this->getUpgradeFile('3.3')); $this->updateTaskAssignedTo(); $this->loadModel('setting')->setItem('system', 'common', '', 'flow', 'full'); + case '4_0_beta1': $this->execSQL($this->getUpgradeFile('4.0.beta1')); default: if(!$this->isError()) $this->setting->updateVersion($this->config->version); } @@ -116,10 +117,11 @@ class upgradeModel extends model case '3_0_beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('3.0.beta1')); case '3_0_beta2': case '3_0': - case '3_1': $confirmContent .= file_get_contents($this->getUpgradeFile('3.1')); - case '3_2': $confirmContent .= file_get_contents($this->getUpgradeFile('3.2')); - case '3_2_1': $confirmContent .= file_get_contents($this->getUpgradeFile('3.2.1')); - case '3_3': $confirmContent .= file_get_contents($this->getUpgradeFile('3.3')); + case '3_1': $confirmContent .= file_get_contents($this->getUpgradeFile('3.1')); + case '3_2': $confirmContent .= file_get_contents($this->getUpgradeFile('3.2')); + case '3_2_1': $confirmContent .= file_get_contents($this->getUpgradeFile('3.2.1')); + case '3_3': $confirmContent .= file_get_contents($this->getUpgradeFile('3.3')); + case '4.0.beta1': $confirmContent .= file_get_contents($this->getUpgradeFile('4.0.beta1')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); }