diff --git a/Makefile b/Makefile index 081ac8421a..34ad2824da 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VERSION = $(shell head -n 1 VERSION) -XUANVERSION = $(shell head -n 1 extension/xuanxuan/XUANVERSION) -XVERSION = $(shell head -n 1 extension/xuanxuan/XVERSION) +XUANVERSION = $(shell jq -r .pkg.xuanxuan.gitVersion < ci.json) +XVERSION = $(shell jq -r .pkg.xuanxuan.version < ci.json) XHPROF_VERSION = 2.3.9 XUANPATH := $(XUANXUAN_SRC_PATH) @@ -8,6 +8,9 @@ BUILD_PATH := $(if $(ZENTAO_BUILD_PATH),$(ZENTAO_BUILD_PATH),$(shell pwd)) RELEASE_PATH := $(if $(ZENTAO_RELEASE_PATH),$(ZENTAO_RELEASE_PATH),$(shell pwd)) XUAN_WEB_PATH := $(ZENTAO_BUILD_PATH)/web +DOWNGRADE_ENABLED := $(or $(DOWNGRADE_ENABLED),$(shell jq -r .downgrade.enabled < ci.json)) +DOWNGRADE_VERSIONS := $(or $(DOWNGRADE_VERSIONS),$(shell jq -r .downgrade.versions < ci.json)) + all: make clean make ci @@ -97,6 +100,8 @@ zentaoxx: cp -r $(XUAN_WEB_PATH) zentaoxx/www/data/xuanxuan/ mv zentaoxx/db/ zentaoxx/db_bak mkdir zentaoxx/db/ + sed -i "s/datetime NOT NULL DEFAULT '0000-00-00 00:00:00'/datetime NULL/" zentaoxx/db_bak/*.sql + sed -i "/`xxb_user` ADD `clientStatus`/d; /`xxb_user` ADD `clientLang`/d; /`xxb_file` CHANGE `pathname`/d" zentaoxx/db_bak/xuanxuan.sql cp zentaoxx/db_bak/upgradexuanxuan*.sql zentaoxx/db_bak/xuanxuan.sql zentaoxx/db/ rm -rf zentaoxx/db_bak/ sed -i "s/\$$accountAdmin = \$$this->dao->select('account, admin')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch();/\$$accountAdmin = \$$this->dao->select('account')->from(TABLE_USER)->where('id')->eq(\$$userID)->fetch();\n\$$sysAdmins = \$$this->dao->select('admins')->from(TABLE_COMPANY)->where('id')->eq(\$$this->app->company->id)->fetch('admins');\n\$$sysAdminArray = explode(',', \$$sysAdmins);\n\$$accountAdmin->admin = in_array(\$$accountAdmin->account, \$$sysAdminArray) ? 'super' : '';\n/" zentaoxx/extension/xuan/im/model/chat.php @@ -131,6 +136,7 @@ zentaoxx: sed -i '/xxb_entry/d' zentaoxx/db/*.sql sed -i '/deviceToken/d' zentaoxx/db/*.sql sed -i '/deviceType/d' zentaoxx/db/*.sql + sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql sed -i "/fetch('push', 'pushMessage');/d" zentaoxx/extension/xuan/im/control.php #sed -i "s/marked\.html\.php';?>/marked\.html\.php';?>\n