OSDN Git Service

ブランチが汚れていたかパッケージの作成に失敗するようにした
authormasakih <masakih@users.sourceforge.jp>
Sun, 6 Jul 2014 05:10:29 +0000 (14:10 +0900)
committermasakih <masakih@users.sourceforge.jp>
Sun, 6 Jul 2014 05:10:29 +0000 (14:10 +0900)
Makefile

index 4ef3891..04bc6c1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,11 +28,14 @@ checkLocalizable:
 #      (cd KCD/en.lproj; ${MAKE} $@;)
        (cd KCD/ja.lproj; ${MAKE} $@;)
 
+deploy:
+       test -z "`git status --porcelain`"
+
 release: updateRevision
        xcodebuild -derivedDataPath=build -configuration $(DEPLOYMENT)
-       $(MAKE) restorInfoPlist
+       $(MAKE) restoreInfoPlist
 
-package: release
+package: deploy release
        REV=`git show | head -1 | awk '{printf("%.7s\n", $$2)}'`;       \
        ditto -ck -rsrc --keepParent $(APP) $(APP_NAME)-$(VERSION)-$${REV}.zip
 
@@ -42,7 +45,7 @@ updateRevision:
        sed -e "s/%%%%REVISION%%%%/$${REV}/" $(INFO_PLIST) > $(INFO_PLIST).r ;  \
        mv -f $(INFO_PLIST).r $(INFO_PLIST) ;   \
 
-restorInfoPlist:
+restoreInfoPlist:
        if [ -f $(INFO_PLIST).bak ] ; then mv -f $(INFO_PLIST).bak $(INFO_PLIST) ; fi