diff --git a/Makefile b/Makefile index 6a335f65f1..5b9871c1d2 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ zentaoxx: mkdir -p zentaoxx/db mkdir -p zentaoxx/www mkdir -p zentaoxx/extension/xuan/common/ext/model/ - cd $(XUANPATH); git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip + cd $(XUANPATH); git pull; git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip mv $(XUANPATH)/xuan.zip . unzip xuan.zip cp xuan/xxb/config/ext/_0_xuanxuan.php zentaoxx/config/ext/ @@ -72,7 +72,7 @@ zentaoxx: cp -r xuan/xxb/module/im zentaoxx/extension/xuan/ cp -r xuan/xxb/module/client zentaoxx/extension/xuan/ cp -r xuan/xxb/module/license zentaoxx/extension/xuan/ - cp -r xuan/xxb/module/owt zentaoxx/extension/xuan/ + cp -r xuan/xxb/module/conference zentaoxx/extension/xuan/ mkdir -p zentaoxx/extension/xuan/common/view cp -r xuan/xxb/module/common/view/header.modal.html.php zentaoxx/extension/xuan/common/view cp -r xuan/xxb/module/common/view/marked.html.php zentaoxx/extension/xuan/common/view diff --git a/xuanxuan/XUANVERSION b/xuanxuan/XUANVERSION index 6882b35112..67617da57e 100644 --- a/xuanxuan/XUANVERSION +++ b/xuanxuan/XUANVERSION @@ -1 +1 @@ -dc75cbfd +v5.3.1 diff --git a/xuanxuan/XVERSION b/xuanxuan/XVERSION index a1ef0cae18..c7cb1311a6 100644 --- a/xuanxuan/XVERSION +++ b/xuanxuan/XVERSION @@ -1 +1 @@ -5.0.2 +5.3.1