From 28682a5e15dc2fcae4a50da25b6e1f978ce66a2c Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Wed, 8 Jun 2022 14:13:58 +0800
Subject: [PATCH] * Adjust the makefile for deb and rpm package name.

---
 Makefile          | 19 +++++++++----------
 tools/packDeb.php |  2 +-
 tools/packRpm.php |  4 +---
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 9e8da19a96..e747c93624 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ clean:
 	rm -fr zentaoxx
 	rm -fr tmp/
 	rm -f  *.sh
+	rm -f *.deb *.rpm
 common:
 	mkdir zentaopms
 	cp -fr api zentaopms/
@@ -176,7 +177,7 @@ deb:
 	cp ZenTaoPMS.${VERSION}.zip buildroot/opt
 	cd buildroot/opt; unzip ZenTaoPMS.${VERSION}.zip; mv zentaopms zentao; rm ZenTaoPMS.${VERSION}.zip
 	sed -i 's/index.php/\/zentao\/index.php/' buildroot/opt/zentao/www/.htaccess
-	sudo dpkg -b buildroot/ ZenTaoPMS_${VERSION}_1_all.deb
+	sudo dpkg -b buildroot/ ZenTaoPMS.${VERSION}.1.all.deb
 	rm -rf buildroot
 rpm:
 	mkdir ~/rpmbuild/SPECS -p
@@ -252,6 +253,9 @@ ciCommon:
 	rm -fr zentaopms zentaoxx zentaoxx.*.zip
 	make en
 	rm -fr zentaopms zentaoxx zentaoxx.*.zip
+	rm -f $(BUILD_PATH)/ZenTao*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION).zip $(RELEASE_PATH)/ZenTaoALM.$(VERSION).int.zip
+	cp ZenTaoPMS.$(VERSION).zip $(BUILD_PATH)
+	cp ZenTaoPMS.$(VERSION).zip ZenTaoALM.$(VERSION).int.zip $(RELEASE_PATH)
 ci:
 	make ciCommon
 	php tools/packZip.php $(VERSION)
@@ -263,12 +267,7 @@ ci:
 	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)
+	rm -f zentaobiz*.zip zentaomax*.zip $(RELEASE_PATH)/ZenTaoALM.$(VERSION)*.zip $(RELEASE_PATH)/ZenTaoPMS.$(VERSION)*.zip $(RELEASE_PATH)/*.deb $(RELEASE_PATH)/*.rpm *.sh $(RELEASE_PATH)/pmsPack/*.zip $(RELEASE_PATH)/pmsPack/deb/* $(RELEASE_PATH)/pmsPack/rpm/*
+	mv ZenTaoALM.$(VERSION).int.php*.zip ZenTaoPMS.$(VERSION).php*.zip $(RELEASE_PATH)/pmsPack
+	mv *.deb $(RELEASE_PATH)/pmsPack/deb
+	mv *.rpm $(RELEASE_PATH)/pmsPack/rpm
diff --git a/tools/packDeb.php b/tools/packDeb.php
index b38b578ff3..25545d2555 100644
--- a/tools/packDeb.php
+++ b/tools/packDeb.php
@@ -54,7 +54,7 @@ foreach(array('zh-cn', 'en') as $langType)
 
         $command .= "sed -i 's/index.php/\/zentao\/index.php/' zentao/www/.htaccess\n";
         $command .= "cd ../../\n";
-        $command .= "sudo dpkg -b buildroot/ {$packPrefix}_{$version}_php{$phpVersion}_1_all.deb\n";
+        $command .= "sudo dpkg -b buildroot/ {$packPrefix}.{$version}.php{$phpVersion}.1.all.deb\n";
         $command .= "mv *.deb ../../\n";
 
         $command .= "rm -rf buildroot\n";
diff --git a/tools/packRpm.php b/tools/packRpm.php
index 66d40ceb6f..349b307df6 100644
--- a/tools/packRpm.php
+++ b/tools/packRpm.php
@@ -60,9 +60,7 @@ foreach(array('zh-cn', 'en') as $langType)
 
         $command .= "cd ../../\n";
         $command .= "rpmbuild --define \"_topdir \${PWD}/rpmbuild\" -ba rpmbuild/SPECS/zentaopms.spec\n";
-        $command .= "cp rpmbuild/RPMS/noarch/$dirName-$version-1.noarch.rpm ./{$dirName}-{$version}-php{$phpVersion}-1.noarch.rpm\n";
-
-        $command .= "mv {$dirName}-{$version}-php{$phpVersion}-1.noarch.rpm ../../\n";
+        $command .= "cp rpmbuild/RPMS/noarch/$dirName-$version-1.noarch.rpm ../../{$packPrefix}.{$version}.php{$phpVersion}.1.noarch.rpm\n";
 
         $command .= "rm -rf rpmbuild\n";