From 7eb8ad68244c9f7bb4277358e59dfe003aa74700 Mon Sep 17 00:00:00 2001 From: beville Date: Fri, 30 Nov 2012 05:30:03 +0000 Subject: [PATCH] release notes in windows installer makefiles push installer to release folder git-svn-id: http://comictagger.googlecode.com/svn/trunk@173 6c5673fe-1810-88d6-992b-cd32ca31540c --- mac/Makefile | 5 ++++- windows/Makefile | 2 +- windows/nsis/comictagger.nsi | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mac/Makefile b/mac/Makefile index d7978b4..d2c1074 100644 --- a/mac/Makefile +++ b/mac/Makefile @@ -32,7 +32,7 @@ diskimage: #Set up disk image staging folder rm -rf $(STAGING) mkdir $(STAGING) - #cp $(TAGGER_BASE)/README.txt $(STAGING) + cp $(TAGGER_BASE)/release_notes.txt $(STAGING) cp -a $(APP_BUNDLE) $(STAGING) cp $(MAC_BASE)/volume.icns $(STAGING)/.VolumeIcon.icns SetFile -c icnC $(STAGING)/.VolumeIcon.icns @@ -58,3 +58,6 @@ diskimage: hdiutil convert raw-$(DMG_FILE) -format UDZO -o $(DMG_FILE) rm -f raw-$(DMG_FILE) + #move finished product to release folder + mv $(DMG_FILE) $(TAGGER_BASE)/release + diff --git a/windows/Makefile b/windows/Makefile index 65992cd..6ce7b1a 100644 --- a/windows/Makefile +++ b/windows/Makefile @@ -23,7 +23,7 @@ dist: package: echo !define RELEASE_STR $(VERSION) > $(TAGGER_BASE)\windows\nsis\release.nsh $(NSIS_CMD) "$(TAGGER_BASE)\windows\nsis\comictagger.nsi" - mv "$(TAGGER_BASE)\windows\nsis\ComicTagger*.exe" "$(TAGGER_BASE)\windows" + mv "$(TAGGER_BASE)\windows\nsis\ComicTagger*.exe" "$(TAGGER_BASE)\release" clean: -rm -rf dist diff --git a/windows/nsis/comictagger.nsi b/windows/nsis/comictagger.nsi index e3e54c3..c3a4396 100644 --- a/windows/nsis/comictagger.nsi +++ b/windows/nsis/comictagger.nsi @@ -47,7 +47,7 @@ !define MUI_FINISHPAGE_NOAUTOCLOSE - !define MUI_FINISHPAGE_SHOWREADME "todo.txt" + !define MUI_FINISHPAGE_SHOWREADME "release_notes.txt" !define MUI_FINISHPAGE_SHOWREADME_TEXT "Show Release Notes" !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED @@ -98,7 +98,7 @@ Section "Install Section" SecInstall SetOutPath "$INSTDIR" File /r ..\dist\* - File ..\..\todo.txt + File ..\..\release_notes.txt ;Store installation folder WriteRegStr HKLM "Software\ComicTagger" "" $INSTDIR