diff --git a/Makefile b/Makefile index fd0e6b30f1..f0ecb33a77 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,9 @@ XUANPATH = $(shell head -n 1 XUANPATH) XUANVERSION = $(shell head -n 1 XUANVERSION) XVERSION = $(shell head -n 1 XVERSION) +BUILD_PATH := $(if $(ZENTAO_BUILD_PATH), $(ZENTAO_BUILD_PATH), $(shell pwd)) +RELEASE_PATH := $(if $(ZENTAO_RELEASE_PATH), $(ZENTAO_RELEASE_PATH), $(shell pwd)) + all: pms clean: rm -fr zentaopms @@ -13,6 +16,8 @@ clean: rm -fr *.zip rm -fr build/linux/lampp rm -fr lampp + rm -fr zentaoxx + rm -fr xuanxuan/www/data/xuanxuan/web/ common: mkdir zentaopms cp -fr api zentaopms/ @@ -23,8 +28,9 @@ common: cp -fr framework zentaopms/ cp -fr lib zentaopms/ cp -fr module zentaopms/ + cp -fr extension zentaopms/ cp -fr sdk zentaopms/ - cp -fr www zentaopms && rm -fr zentaopms/www/data/ && mkdir -p zentaopms/www/data/upload + cp -fr www zentaopms && rm -fr zentaopms/www/data/ && mkdir -p zentaopms/www/data/upload && mkdir zentaopms/www/data/course mkdir zentaopms/tmp mkdir zentaopms/tmp/cache/ mkdir zentaopms/tmp/extension/ @@ -48,13 +54,14 @@ common: mkdir zentaopms/www/data/notify/ zentaoxx: #xuanxuan + cp -rf ~/packageTest/web/ xuanxuan/www/data/xuanxuan/ mkdir -p zentaoxx/config/ext mkdir -p zentaoxx/lib - mkdir -p zentaoxx/module + mkdir -p zentaoxx/extension/xuan mkdir -p zentaoxx/framework mkdir -p zentaoxx/db mkdir -p zentaoxx/www - mkdir -p zentaoxx/module/common/ext/model/ + mkdir -p zentaoxx/extension/xuan/common/ext/model/ cd $(XUANPATH); git archive --format=zip --prefix=xuan/ $(XUANVERSION) > xuan.zip mv $(XUANPATH)/xuan.zip . unzip xuan.zip @@ -62,25 +69,25 @@ zentaoxx: cp -r xuan/xxb/lib/phpaes zentaoxx/lib/ cp -r xuan/xxb/framework/xuanxuan.class.php zentaoxx/framework/ cp -r xuan/xxb/db/*.sql zentaoxx/db/ - cp -r xuan/xxb/module/im zentaoxx/module/ - cp -r xuan/xxb/module/client zentaoxx/module/ - cp -r xuan/xxb/module/license zentaoxx/module/ - cp -r xuan/xxb/module/owt zentaoxx/module/ - mkdir -p zentaoxx/module/common/view - cp -r xuan/xxb/module/common/view/header.modal.html.php zentaoxx/module/common/view - cp -r xuan/xxb/module/common/view/marked.html.php zentaoxx/module/common/view - cp -r xuan/xxb/module/common/view/footer.modal.html.php zentaoxx/module/common/view - cp -r xuan/xxb/module/common/view/version.html.php zentaoxx/module/common/view - cp -r xuan/xxb/module/license zentaoxx/module/ + 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/ + 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 + cp -r xuan/xxb/module/common/view/footer.modal.html.php zentaoxx/extension/xuan/common/view + cp -r xuan/xxb/module/common/view/version.html.php zentaoxx/extension/xuan/common/view + cp -r xuan/xxb/module/license zentaoxx/extension/xuan/ mkdir -p zentaoxx/www/js/ cp -r xuan/xxb/www/js/markedjs zentaoxx/www/js/ cp -r xuan/xxb/www/js/version.js zentaoxx/www/js/ cp -r xuan/xxb/www/x.php zentaoxx/www/ - mkdir zentaoxx/module/action - cp -r xuan/xxb/module/action/ext zentaoxx/module/action + mkdir zentaoxx/extension/xuan/action + cp -r xuan/xxb/module/action/ext zentaoxx/extension/xuan/action cp -r xuan/xxb/config/ext/_1_maps.php zentaoxx/config/ext/ cp -r xuanxuan/config/* zentaoxx/config/ - cp -r xuanxuan/module/* zentaoxx/module/ + cp -r xuanxuan/extension/xuan/* zentaoxx/extension/xuan/ cp -r xuanxuan/www/* zentaoxx/www/ mv zentaoxx/db/ zentaoxx/db_bak mkdir zentaoxx/db/ @@ -88,40 +95,40 @@ zentaoxx: rm -rf zentaoxx/db_bak/ sed -i 's/XXBVERSION/$(XVERSION)/g' zentaoxx/config/ext/_0_xuanxuan.php sed -i "/\$$config->xuanxuan->backend /c\\\$$config->xuanxuan->backend = 'zentao';" zentaoxx/config/ext/_0_xuanxuan.php - sed -i 's/site,//' zentaoxx/module/im/model/user.php - sed -i 's/admin, g/g/' zentaoxx/module/im/model/user.php - sed -i '/password = md5/d' zentaoxx/module/im/model/user.php - sed -i 's/md5(\$$user->password.*$$/\$$user->password;/g' zentaoxx/module/im/model/user.php - sed -i '/getSignedTime/d' zentaoxx/module/im/control.php - sed -i "/loadModel('push')/d" zentaoxx/module/im/control.php - sed -i "/this->push/d" zentaoxx/module/im/control.php - sed -i "s/(int)(microtime/(double)(microtime/" zentaoxx/module/im/control.php - sed -i "s/'yahoo', //g" zentaoxx/module/im/config.php - sed -i "s/'gtalk', //g" zentaoxx/module/im/config.php - sed -i "s/'wangwang', //g" zentaoxx/module/im/config.php - sed -i "s/'site', //g" zentaoxx/module/im/config.php - sed -i "s/'reload'/inlink('browse')/g" zentaoxx/module/client/control.php - sed -i 's/tree/dept/' zentaoxx/module/im/model.php - sed -i 's/tree/dept/' zentaoxx/module/im/control.php + sed -i 's/site,//' zentaoxx/extension/xuan/im/model/user.php + sed -i 's/admin, g/g/' zentaoxx/extension/xuan/im/model/user.php + sed -i '/password = md5/d' zentaoxx/extension/xuan/im/model/user.php + sed -i 's/md5(\$$user->password.*$$/\$$user->password;/g' zentaoxx/extension/xuan/im/model/user.php + sed -i '/getSignedTime/d' zentaoxx/extension/xuan/im/control.php + sed -i "/loadModel('push')/d" zentaoxx/extension/xuan/im/control.php + sed -i "/this->push/d" zentaoxx/extension/xuan/im/control.php + sed -i "s/(int)(microtime/(double)(microtime/" zentaoxx/extension/xuan/im/control.php + sed -i "s/'yahoo', //g" zentaoxx/extension/xuan/im/config.php + sed -i "s/'gtalk', //g" zentaoxx/extension/xuan/im/config.php + sed -i "s/'wangwang', //g" zentaoxx/extension/xuan/im/config.php + sed -i "s/'site', //g" zentaoxx/extension/xuan/im/config.php + sed -i "s/'reload'/inlink('browse')/g" zentaoxx/extension/xuan/client/control.php + sed -i 's/tree/dept/' zentaoxx/extension/xuan/im/model.php + sed -i 's/tree/dept/' zentaoxx/extension/xuan/im/control.php sed -i 's/im_/zt_im_/g' zentaoxx/db/*.sql sed -i 's/xxb_user/zt_user/g' zentaoxx/db/*.sql sed -i 's/xxb_file/zt_file/g' zentaoxx/db/*.sql sed -i '/xxb_entry/d' zentaoxx/db/*.sql sed -i '/deviceToken/d' zentaoxx/db/*.sql sed -i '/deviceType/d' zentaoxx/db/*.sql - sed -i "/fetch('push', 'pushMessage');/d" zentaoxx/module/im/control.php - #sed -i "s/marked\.html\.php';?>/marked\.html\.php';?>\n