diff --git a/Makefile b/Makefile index 0a0bb955f5..db8f5517c0 100644 --- a/Makefile +++ b/Makefile @@ -242,12 +242,10 @@ ci: make package zip -rq -9 ZenTaoPMS.$(VERSION).zip zentaopms - #make deb; make rpm; make en rm -fr zentaopms zentaoxx zentaoxx.*.zip make en rm -fr zentaopms zentaoxx zentaoxx.*.zip php tools/mergezentaopms.php $(VERSION) - rm zentaobiz*.zip zentaomax*.zip + rm 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) - rm -f $(RELEASE_PATH)/*.deb $(RELEASE_PATH)/*.rpm mv *.zip *.deb *.rpm $(RELEASE_PATH) diff --git a/tools/mergezentaopms.php b/tools/mergezentaopms.php index 355d8c6346..f252c29ffa 100755 --- a/tools/mergezentaopms.php +++ b/tools/mergezentaopms.php @@ -34,6 +34,7 @@ foreach(array('zh-cn', 'en') as $langType) foreach(array('5.3_5.6', '7.0', '7.1', '7.2_7.4') as $phpVersion) { + echo "zip $packPrefix.{$version}.php{$phpVersion}.zip\n"; `unzip $packPrefix.{$version}.zip`; `unzip zentaobiz.php{$phpVersion}.zip`; `unzip zentaomax.php{$phpVersion}.zip`; @@ -52,6 +53,7 @@ foreach(array('zh-cn', 'en') as $langType) // // foreach(array('5.3_5.6', '7.0', '7.1', '7.2_7.4') as $phpVersion) // { +// echo "dpkg {$packPrefix}_{$version}_{$phpVersion}_1_all.deb\n"; // `mkdir buildroot`; // `cp -r build/debian/DEBIAN buildroot`; // `sed -i '/^Version/cVersion: $version' buildroot/DEBIAN/control`; @@ -74,6 +76,7 @@ foreach(array('zh-cn', 'en') as $langType) // // foreach(array('5.3_5.6', '7.0', '7.1', '7.2_7.4') as $phpVersion) // { +// echo "rpmbuild {$dirName}-{$version}-php{$phpVersion}-1.noarch.rpm\n"; // `mkdir ~/rpmbuild/SPECS -p`; // `mkdir ~/rpmbuild/SOURCES`; // `mkdir ~/rpmbuild/SOURCES/etc/httpd/conf.d/ -p`;