コミット: 35 - roundedmplus (svn)

コミットメタ情報

• リビジョン: 35 (tree)
• 日時: 2014-02-22 00:50:01
• 作者: mm-rounded

ログメッセージ

スクリプトの内容を大幅に整理

変更サマリ

• modified: trunk/tools/cygwin/allbuild.sh

差分

--- trunk/tools/cygwin/allbuild.sh	(revision 34)
+++ trunk/tools/cygwin/allbuild.sh	(revision 35)
@@ -11,78 +11,91 @@
 # ├■ work (Subversion リポジトリの work ディレクトリへのシンボリックリンク)
 # └■ allbuildver.txt (TESTFLIGHT のバージョンを記載)
 
+# ---------------------------------------------------------------------------
 # 初期設定
+# ---------------------------------------------------------------------------
 YEAR=`date '+%Y'`
 DATE=`date '+%Y%m%d'`
 TESTFLIGHTVER=`cat ~/allbuildver.txt`
+HOMEPATH=~
 
 
+# ---------------------------------------------------------------------------
 # <rect fill="none"> を含まない svg がないかを確認
-if [ -e ~/allbuildcheck.txt ]; then
-  rm ~/allbuildcheck.txt
+# ---------------------------------------------------------------------------
+CheckSVG(){
+
+if [ -e $HOMEPATH/allbuildcheck.txt ]; then
+  rm $HOMEPATH/allbuildcheck.txt
 fi
 echo Checking svg files ...
-find ~/mplus_outline_fonts/svg.d -name '*.svg'   | xargs grep -L 'fill="none"' >> ~/allbuildcheck.txt
-find ~/mplus_outline_fonts-m/svg.d -name '*.svg' | xargs grep -L 'fill="none"' >> ~/allbuildcheck.txt
-find ~/mplus_outline_fonts-x/svg.d -name '*.svg' | xargs grep -L 'fill="none"' >> ~/allbuildcheck.txt
-find ~/mplus_outline_fonts-l/svg.d -name '*.svg' | xargs grep -L 'fill="none"' >> ~/allbuildcheck.txt
+find $HOMEPATH/mplus_outline_fonts/svg.d -name '*.svg'   | xargs grep -L 'fill="none"' >> $HOMEPATH/allbuildcheck.txt
+find $HOMEPATH/mplus_outline_fonts-m/svg.d -name '*.svg' | xargs grep -L 'fill="none"' >> $HOMEPATH/allbuildcheck.txt
+find $HOMEPATH/mplus_outline_fonts-x/svg.d -name '*.svg' | xargs grep -L 'fill="none"' >> $HOMEPATH/allbuildcheck.txt
+find $HOMEPATH/mplus_outline_fonts-l/svg.d -name '*.svg' | xargs grep -L 'fill="none"' >> $HOMEPATH/allbuildcheck.txt
 
-if [ -s ~/allbuildcheck.txt ]; then
-  cat ~/allbuildcheck.txt
+if [ -s $HOMEPATH/allbuildcheck.txt ]; then
+  cat $HOMEPATH/allbuildcheck.txt
   echo 上記ファイルに文字分割用の枠線 rect タグが見つかりません.
   echo Illustrator で再出力してください.
   exit
 fi
 
-rm ~/allbuildcheck.txt
+rm $HOMEPATH/allbuildcheck.txt
 echo done.
 
+}
 
+
+# ---------------------------------------------------------------------------
 # 日付をもとに configdate.py の生成
-echo year = \"$YEAR\" > ~/configdate.py
-echo version = \"1.$TESTFLIGHTVER.$DATE\" >> ~/configdate.py
-cp ~/configdate.py ~/mplus_outline_fonts-m/scripts
-cp ~/configdate.py ~/mplus_outline_fonts-l/scripts
-cp ~/configdate.py ~/mplus_outline_fonts-x/scripts
-cp ~/configdate.py ~/mplus_outline_fonts/scripts/config.py
+# ---------------------------------------------------------------------------
+GenerateConfig(){
 
+echo year = \"$YEAR\" > $HOMEPATH/configdate.py
+echo version = \"1.$TESTFLIGHTVER.$DATE\" >> $HOMEPATH/configdate.py
+cp $HOMEPATH/configdate.py $HOMEPATH/mplus_outline_fonts-m/scripts
+cp $HOMEPATH/configdate.py $HOMEPATH/mplus_outline_fonts-l/scripts
+cp $HOMEPATH/configdate.py $HOMEPATH/mplus_outline_fonts-x/scripts
+cp $HOMEPATH/configdate.py $HOMEPATH/mplus_outline_fonts/scripts/config.py
 
-# Rounded M+ 生成 & workにコピー
-echo `date +'%Y/%m/%d %H:%M:%S'` ": Building Rounded M+"
-cd ~/mplus_outline_fonts-m
-make MPLUS_FULLSET=yes SPLIT_CONCURRENCY=2 -j2 &> log.txt
-cd release
-make
-rm ../../work/m/*.ttf
-cp fonts/* ../../work/m
-echo done.
+}
 
 
-# Rounded-X M+ 生成 & workにコピー
-echo `date +'%Y/%m/%d %H:%M:%S'` ": Building Rounded-X M+"
-cd ~/mplus_outline_fonts-x
+# ---------------------------------------------------------------------------
+# Rounded M+ 生成
+# ---------------------------------------------------------------------------
+BuildRoundedMPlus(){
+
+echo `date +'%Y/%m/%d %H:%M:%S'` ": Building Rounded$2 M+"
+cd $HOMEPATH/mplus_outline_fonts-$1
 make MPLUS_FULLSET=yes SPLIT_CONCURRENCY=2 -j2 &> log.txt
 cd release
 make
-rm ../../work/x/*.ttf
-cp fonts/* ../../work/x
 echo done.
 
+}
 
-# Rounded-L M+ 生成 & workにコピー
-echo `date +'%Y/%m/%d %H:%M:%S'` ": Building Rounded-L M+"
-cd ~/mplus_outline_fonts-l
-make MPLUS_FULLSET=yes SPLIT_CONCURRENCY=2 -j2 &> log.txt
-cd release
-make
-rm ../../work/l/*.ttf
-cp fonts/* ../../work/l
+# ---------------------------------------------------------------------------
+# Rounded M+ workにコピー
+# ---------------------------------------------------------------------------
+CopyWorkRoundedMPlus(){
+
+echo `date +'%Y/%m/%d %H:%M:%S'` ": Copy to Work Rounded$2 M+"
+rm $HOMEPATH/work/$1/*.ttf
+cp $HOMEPATH/mplus_outline_fonts-$1/release/fonts/* $HOMEPATH/work/$1
 echo done.
 
+}
 
+
+# ---------------------------------------------------------------------------
 # M+ 生成
+# ---------------------------------------------------------------------------
+BuildMPlus(){
+
 echo `date +'%Y/%m/%d %H:%M:%S'` ": Building M+"
-cd ~/mplus_outline_fonts
+cd $HOMEPATH/mplus_outline_fonts
 make MPLUS_FULLSET=yes SPLIT_CONCURRENCY=2 -j2 &> log.txt
 cd release
 rm *.tar.xz
@@ -90,39 +103,108 @@
 make
 echo done.
 
+}
 
+
+# ---------------------------------------------------------------------------
 # 生成した M+ のアーカイブを再度解凍して work にコピー
-rm ~/work/limited/*.ttf
-cp -f mplus-TESTFLIGHT-*.tar.xz ~/work/archives/mplus-$DATE.tar.xz
+# ---------------------------------------------------------------------------
+CopyWorkMPlus(){
+
+echo `date +'%Y/%m/%d %H:%M:%S'` ": Copy to work M+"
+cd $HOMEPATH/mplus_outline_fonts
+rm $HOMEPATH/work/limited/*.ttf
+cp -f mplus-TESTFLIGHT-*.tar.xz $HOMEPATH/work/archives/mplus-$DATE.tar.xz
 tar Jxvf mplus-TESTFLIGHT-*.tar.xz
-cp mplus-TESTFLIGHT-*/*.ttf ~/work/limited
+cp mplus-TESTFLIGHT-*/*.ttf $HOMEPATH/work/limited
 rm -rf mplus-TESTFLIGHT*
+echo done.
 
+}
 
+
+# ---------------------------------------------------------------------------
 # 配布用アーカイブの作成
+# ---------------------------------------------------------------------------
+MakeArchives(){
+
 echo `date +'%Y/%m/%d %H:%M:%S'` ": Making distribution archives"
-cd ~/work
+cd $HOMEPATH/work
 ./allzip.bat
 echo done.
 
+}
 
+
+# ---------------------------------------------------------------------------
 # limited 版フォントの生成
-echo `date +'%Y/%m/%d %H:%M:%S'` ": Create limited fonts"
-cp ~/work/m/*.ttf ~/work/limited
-cp ~/work/l/*.ttf ~/work/limited
-cp ~/work/x/*.ttf ~/work/limited
-cd ~/work/limited
+# ---------------------------------------------------------------------------
+GenerateLimited(){
+
+echo `date +'%Y/%m/%d %H:%M:%S'` ": Generating limited fonts"
+cp $HOMEPATH/work/m/*.ttf $HOMEPATH/work/limited
+cp $HOMEPATH/work/l/*.ttf $HOMEPATH/work/limited
+cp $HOMEPATH/work/x/*.ttf $HOMEPATH/work/limited
+cd $HOMEPATH/work/limited
 ./limited.sh
+echo done.
+
+}
+
+
+# ---------------------------------------------------------------------------
+# limited 版フォントの配布用アーカイブの作成
+# ---------------------------------------------------------------------------
+ArchiveLimited(){
+
+echo `date +'%Y/%m/%d %H:%M:%S'` ": Archiving limited fonts"
+cd $HOMEPATH/work/limited
 ./release.bat
 echo done.
 
+}
 
+
+# ---------------------------------------------------------------------------
 # 生成したアーカイブを日付フォルダに整理
-cd ~/work/archives
+# ---------------------------------------------------------------------------
+MoveArchives(){
+
+cd $HOMEPATH/work/archives
 mkdir $DATE
 mv -f *$DATE.* $DATE
 
+}
 
+
+# ---------------------------------------------------------------------------
 # スタンバイ
+# ---------------------------------------------------------------------------
+ShutDownNow(){
+
 echo `date +'%Y/%m/%d %H:%M:%S'` ": Completed. Shutdown now !"
 shutdown -p now
+
+}
+
+# ---------------------------------------------------------------------------
+
+CheckSVG
+GenerateConfig
+
+BuildRoundedMPlus m
+CopyWorkRoundedMPlus m
+BuildRoundedMPlus x -X
+CopyWorkRoundedMPlus x -X
+BuildRoundedMPlus l -L
+CopyWorkRoundedMPlus l -L
+
+BuildMPlus
+CopyWorkMPlus
+
+MakeArchives
+GenerateLimited
+ArchiveLimited
+MoveArchives
+
+ShutDownNow