From 839e73afd564900da8aaff1818cb5697f4e647e1 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 23 Mar 2022 15:23:07 +0800 Subject: [PATCH] * Modify the makefile for multiple concurrency. --- Makefile | 29 +++++++++-- build/rpm/zentaopms.spec | 2 + tools/mergezentaopms.php | 110 --------------------------------------- tools/packDeb.php | 76 +++++++++++++++++++++++++++ tools/packRpm.php | 83 +++++++++++++++++++++++++++++ tools/packZip.php | 82 +++++++++++++++++++++++++++++ 6 files changed, 268 insertions(+), 114 deletions(-) delete mode 100755 tools/mergezentaopms.php create mode 100644 tools/packDeb.php create mode 100644 tools/packRpm.php create mode 100644 tools/packZip.php diff --git a/Makefile b/Makefile index 2435ae32e8..37e49e72e6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ VERSION = $(shell head -n 1 VERSION) +LITEVERSION = $(shell head -n 1 extension/lite/LITEVERSION) XUANVERSION = $(shell head -n 1 xuanxuan/XUANVERSION) XVERSION = $(shell head -n 1 xuanxuan/XVERSION) @@ -20,6 +21,8 @@ clean: rm -rf buildroot/ rm -fr lampp rm -fr zentaoxx + rm -fr tmp/ + rm -f *.sh common: mkdir zentaopms cp -fr api zentaopms/ @@ -133,6 +136,8 @@ zentaoxx: sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql sed -i "s#\$this->app->getModuleRoot() . 'im/apischeme.json'#\$this->app->getExtensionRoot() . 'xuan/im/apischeme.json'#g" zentaoxx/extension/xuan/im/model.php sed -i "/getModuleExtPath(/ r tools/fixxuan" zentaoxx/framework/xuanxuan.class.php + sed -i "s/'..\/..\/common\/view\/header.html.php'/\$$app->getModuleRoot() . 'common\/view\/header.html.php'/g" zentaoxx/extension/xuan/conference/view/admin.html.php + sed -i "s/'..\/..\/common\/view\/footer.html.php'/\$$app->getModuleRoot() . 'common\/view\/footer.html.php'/g" zentaoxx/extension/xuan/conference/view/admin.html.php echo "ALTER TABLE \`zt_user\` ADD \`pinyin\` varchar(255) NOT NULL DEFAULT '' AFTER \`realname\`;" >> zentaoxx/db/xuanxuan.sql mkdir zentaoxx/tools; cp tools/cn2tw.php zentaoxx/tools; cd zentaoxx/tools; php cn2tw.php cp tools/en2de.php zentaoxx/tools; cd zentaoxx/tools; php en2de.php ../ @@ -232,7 +237,7 @@ enrpm: rpmbuild -ba ~/rpmbuild/SPECS/zentaopms.spec cp ~/rpmbuild/RPMS/noarch/zentaoalm-${VERSION}-1.noarch.rpm ./ rm -rf ~/rpmbuild -ci: +ciCommon: git pull make common @@ -247,7 +252,23 @@ ci: rm -fr zentaopms zentaoxx zentaoxx.*.zip make en rm -fr zentaopms zentaoxx zentaoxx.*.zip - php tools/mergezentaopms.php $(VERSION) - rm -f zentaobiz*.zip zentaomax*.zip $(BUILD_PATH)/ZenTaoPMS.$(VERSION).zip $(RELEASE_PATH)/ZenTaoALM.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION)*.zip $(RELEASE_PATH)/*.deb $(RELEASE_PATH)/*.rpm - cp ZenTaoPMS.$(VERSION).zip $(BUILD_PATH) +ci: + make ciCommon + php tools/packZip.php $(VERSION) + sh zip.sh + rm -rf tmp/ + php tools/packDeb.php $(VERSION) + sh deb.sh + rm -rf tmp/ + php tools/packRpm.php $(VERSION) + sh rpm.sh + rm -rf tmp/ + rm -f zentaobiz*.zip zentaomax*.zip $(BUILD_PATH)/ZenTaoPMS.$(VERSION).zip $(RELEASE_PATH)/ZenTaoALM.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION)*.zip $(RELEASE_PATH)/*.deb $(RELEASE_PATH)/*.rpm *.sh + cp ZenTaoPMS.$(VERSION).zip $(BUILD_PATH) mv *.zip *.deb *.rpm $(RELEASE_PATH) +lite: + make ciCommon + php tools/packZip.php $(VERSION) $(LITEVERSION) + rm -f zentaobiz*.zip zentaomax*.zip $(BUILD_PATH)/ZenTaoPMS.$(VERSION).zip $(RELEASE_PATH)/ZenTaoALM.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoALM.$(LITEVERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(LITEVERSION)*.zip *.sh + cp ZenTaoPMS.$(VERSION).zip $(BUILD_PATH) + mv *.zip $(RELEASE_PATH) diff --git a/build/rpm/zentaopms.spec b/build/rpm/zentaopms.spec index f85ca245ed..aa3380fd29 100644 --- a/build/rpm/zentaopms.spec +++ b/build/rpm/zentaopms.spec @@ -1,3 +1,5 @@ +%define __os_install_post %{nil} + Name:zentaopms Version:7.1.stable Release:1 diff --git a/tools/mergezentaopms.php b/tools/mergezentaopms.php deleted file mode 100755 index f252c29ffa..0000000000 --- a/tools/mergezentaopms.php +++ /dev/null @@ -1,110 +0,0 @@ -visions = \",lite,\";' > visions.php\n"; + $command .= "echo $liteVersionAB > $dirName/VERSION\n"; + $command .= "zip -r ../../$packPrefix.{$liteVersionAB}.php{$phpVersion}.zip $dirName\n"; + } + + $command .= "rm -rf $dirName/\n"; + + file_put_contents($shellName, $command); + + $shellList[] = $shellName; + } +} + +/* Execute the shells. */ +$lines = ''; +foreach($shellList as $shellName) +{ + echo $shellName . "\n"; + $lines .= "sh $shellName &\n"; +} +$lines .= "wait\necho 'Zip packages has done.'"; +file_put_contents('zip.sh', $lines);