From: umorigu <umorigu@gmail.com>
Date: Mon, 22 Nov 2021 15:38:04 +0000 (+0900)
Subject: Integrate creating upgrade patch to pack.sh
X-Git-Url: http://git.osdn.net/view?p=pukiwiki%2Fpukiwiki_devel.git;a=commitdiff_plain;h=632055f4aef00f0124e430ac3c797a9fc56f3bce

Integrate creating upgrade patch to pack.sh
---

diff --git a/pack.sh b/pack.sh
index fac3220..0e1cc4e 100755
--- a/pack.sh
+++ b/pack.sh
@@ -2,9 +2,13 @@
 
 set -exu
 
-# usage: REVISION=xxxxxxx VERSION=1.5.3 SUFFIX=rc2 ./pack.sh
+# usage: REVISION=xxxxxxx PREV=1.5.2 VERSION=1.5.3 SUFFIX=rc2 ./pack.sh
 
 echo REVISION: $REVISION
+: $REVISION
+: $PREV
+: $VERSION
+: $SUFFIX
 
 REV4=${REVISION:0:4}
 echo $REV4
@@ -26,8 +30,10 @@ mkdir $OUTPUT_DIR
   --eucjp --repo git://git.osdn.jp/gitroot/pukiwiki/pukiwiki.git \
   $REVISION
 
-cp -p pukiwiki-${VERSION}_utf8.zip pukiwiki-${VERSION}-${SUFFIX}-${REV4}_utf8.zip
-cp -p pukiwiki-${VERSION}_eucjp.zip pukiwiki-${VERSION}-${SUFFIX}-${REV4}_eucjp.zip
+DIST_UTF8=pukiwiki-${VERSION}-${SUFFIX}-${REV4}_utf8.zip
+DIST_EUCJP=pukiwiki-${VERSION}-${SUFFIX}-${REV4}_eucjp.zip
+cp -p pukiwiki-${VERSION}_utf8.zip $DIST_UTF8
+cp -p pukiwiki-${VERSION}_eucjp.zip $DIST_EUCJP
 
 mv *.zip $OUTPUT_DIR/
 
@@ -35,3 +41,17 @@ DATENOW=$(date +'%Y%m%d_%H%M')
 mv pukiwiki-${VERSION}_utf8 ../tmp/_pukiwiki-${VERSION}_utf8_${DATENOW}
 mv pukiwiki-${VERSION}_eucjp ../tmp/_pukiwiki-${VERSION}_eucjp_${DATENOW}
 
+# Create patch
+PATCH_DIR=../tmp/patch-${VERSION}-${SUFFIX}
+mkdir $PATCH_DIR
+
+cp -p ../releases/pukiwiki-${PREV}_utf8.zip ${PATCH_DIR}/
+cp -p ../releases/pukiwiki-${PREV}_eucjp.zip ${PATCH_DIR}/
+cp -p $OUTPUT_DIR/$DIST_UTF8 ${PATCH_DIR}/
+cp -p $OUTPUT_DIR/$DIST_EUCJP ${PATCH_DIR}/
+ORI_DIR=$(pwd)
+pushd $PATCH_DIR
+  REV4=$REV4 SUFFIX=$SUFFIX PREV=$PREV NEW=$VERSION $ORI_DIR/create_patch.sh
+popd
+cp -p ${PATCH_DIR}/*.patch.zip $OUTPUT_DIR/
+