Move ReleaseNotes.{css,md} and update scripts

With the addition of `render-release-notes.sh`, ReleaseNotes.md and the stylesheet should no longer live in a specific installer's directory. This commit moves ReleaseNotes.md and ReleaseNotes.css to the `build-extra` directory to live with the `render-release-notes.sh` script (which going forward, will be the only script "consuming" ReleaseNotes.md). All installers will call upon `render-release-notes.sh` to render the release notes for inclusion with the particular installatiotn package. Updates to various scripts that referenced ReleaseNotes.md and/or ReleaseNotes.css were made to reflect the new location of these files. Signed-off-by: Craig E. Shea <craig.e.shea@gmail.com>
github · May 23, 2016 · e3704d6 · e3704d6
1 parent c89cd0b
commit e3704d6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/installer/usr/share/git/ReleaseNotes.css → ReleaseNotes.css b/installer/usr/share/git/ReleaseNotes.css → ReleaseNotes.css
diff --git a/installer/ReleaseNotes.md → ReleaseNotes.md b/installer/ReleaseNotes.md → ReleaseNotes.md
diff --git a/installer/release.sh b/installer/release.sh
@@ -8,7 +8,7 @@ die () {
 render_release_notes () {
 	# Generate the ReleaseNotes.html file
 	test -f ReleaseNotes.html &&
-	test ReleaseNotes.html -nt ReleaseNotes.md &&
+	test ReleaseNotes.html -nt ../ReleaseNotes.md &&
 	test ReleaseNotes.html -nt release.sh || {
 		test -x /usr/bin/markdown ||
 		export PATH="$PATH:$(readlink -f "$PWD"/..)/../../bin"
@@ -45,7 +45,7 @@ render_release_notes () {
 			'<body class="details">' \
 			"$links" \
 			'<div class="content">'
-		 markdown ReleaseNotes.md ||
+		 markdown ../ReleaseNotes.md ||
 		 die "Could not generate ReleaseNotes.html"
 		 printf '</div>\n</body>\n</html>\n') >ReleaseNotes.html
 	}
@@ -132,7 +132,7 @@ fi
 
 printf "; List of files\n%s\n%s\n%s\n%s\n%s\n" \
 	"Source: \"{#SourcePath}\\package-versions.txt\"; DestDir: {app}\\etc; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore" \
-	"Source: \"{#SourcePath}\\usr\\share\\git\\ReleaseNotes.css\"; DestDir: {app}\\usr\\share\\git; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore" \
+	"Source: \"{#SourcePath}\\..\\ReleaseNotes.css\"; DestDir: {app}\\usr\\share\\git; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore" \
 	"Source: \"cmd\\git.exe\"; DestDir: {app}\\bin; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore" \
 	"Source: \"mingw$BITNESS\\share\\git\\compat-bash.exe\"; DestName: bash.exe; DestDir: {app}\\bin; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore" \
 	"Source: \"mingw$BITNESS\\share\\git\\compat-bash.exe\"; DestName: sh.exe; DestDir: {app}\\bin; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore" \

diff --git a/nuget/GitForWindows.nuspec.in b/nuget/GitForWindows.nuspec.in
@@ -16,7 +16,7 @@
   </metadata>
   <files>
     <file src="$buildextra$\nuget\ReleaseNotes.html" />
-    <file src="$buildextra$\installer\usr\share\git\ReleaseNotes.css" target="content" />
+    <file src="$buildextra$\ReleaseNotes.css" target="content" />
     <file src="$buildextra$\nuget\Install.ps1" target="tools" />
     <file src="$buildextra$\post-install.bat" target="tools" />
     <file src="$buildextra$\nuget\package-versions.txt" target="tools\etc" />

diff --git a/nuget/release.sh b/nuget/release.sh
@@ -51,7 +51,7 @@ esac
 
 # Generate release notes for NuGet
 RELNOTES="$BUILDEXTRA"/nuget/ReleaseNotes.html
-RELNOTESMD="$BUILDEXTRA"/installer/ReleaseNotes.md
+RELNOTESMD="$BUILDEXTRA"/ReleaseNotes.md
 test -f "$RELNOTES" &&
 test "$RELNOTES" -nt "$RELNOTESMD" || {
 	# Install markdown

diff --git a/please.sh b/please.sh
@@ -419,19 +419,19 @@ tag_git () { #
 	nextver="$(sed -ne \
 		'1s/.* \(v[0-9][.0-9]*\)(\([0-9][0-9]*\)) .*/\1.windows.\2/p' \
 		-e '1s/.* \(v[0-9][.0-9]*\) .*/\1.windows.1/p' \
-		<"$build_extra_dir/installer/ReleaseNotes.md")"
+		<"$build_extra_dir/ReleaseNotes.md")"
 	! git --git-dir="$git_src_dir" rev-parse --verify \
 		refs/tags/"$nextver" >/dev/null 2>&1 ||
 	die "Already tagged: %s\n" "$nextver"
 
 	notes="$("$sdk64/git-cmd.exe" --command=usr\\bin\\sh.exe -l -c \
-		'markdown </usr/src/build-extra/installer/ReleaseNotes.md |
+		'markdown </usr/src/build-extra/ReleaseNotes.md |
 		 w3m -dump -cols 72 -T text/html | \
 		 sed -n "/^Changes since/,\${:1;p;n;/^Changes/q;b1}"')"
 
 	tag_message="$(printf "%s\n\n%s" \
 		"$(sed -n '1s/.*\(Git for Windows v[^ ]*\).*/\1/p' \
-		<"$build_extra_dir/installer/ReleaseNotes.md")" "$notes")" &&
+		<"$build_extra_dir/ReleaseNotes.md")" "$notes")" &&
 	(cd "$git_src_dir" &&
 	 git tag -m "$tag_message" -a "$nextver" git-for-windows/master) ||
 	die "Could not tag %s in %s\n" "$nextver" "$git_src_dir"
@@ -615,12 +615,12 @@ set_version_from_sdks_git () {
 
 version_from_release_notes () {
 	sed -e '1s/^# Git for Windows v\(.*\) Release Notes$/\1/' -e 1q \
-		"$sdk64/usr/src/build-extra/installer/ReleaseNotes.md"
+		"$sdk64/usr/src/build-extra/ReleaseNotes.md"
 }
 
 previous_version_from_release_notes () {
 	sed -n "/^## Changes since/{s/## .* v\([^ ]*\) (.*/\1/p;q}" \
-		<"$sdk64"/usr/src/build-extra/installer/ReleaseNotes.md
+		<"$sdk64"/usr/src/build-extra/ReleaseNotes.md
 }
 
 today () {
@@ -642,7 +642,7 @@ mention () { # <what, e.g. bug-fix, new-feature> <release-notes-item>
 	up_to_date usr/src/build-extra ||
 	die "build-extra is not up-to-date\n"
 
-	relnotes="$sdk64"/usr/src/build-extra/installer/ReleaseNotes.md
+	relnotes="$sdk64"/usr/src/build-extra/ReleaseNotes.md
 	latest="$(version_from_release_notes)"
 	if test "$latest" != "$(previous_version_from_release_notes)"
 	then
@@ -674,7 +674,7 @@ mention () { # <what, e.g. bug-fix, new-feature> <release-notes-item>
 	 what_singular="$(echo "$what" |
 		 sed -e 's/Fixes/Fix/' -e 's/Features/Feature/')" &&
 	 git commit -s -m "Mention $what_singular in release notes" \
-		-m "$(echo "$*" | fmt -72)" installer/ReleaseNotes.md) ||
+		-m "$(echo "$*" | fmt -72)" ReleaseNotes.md) ||
 	die "Could not commit release note edits\n"
 
 	(cd "$sdk32"/usr/src/build-extra &&
@@ -730,12 +730,12 @@ finalize () { # <what, e.g. release-notes>
 
 	sed -i -e "1s/.*/# Git for Windows v$displayver Release Notes/" \
 		-e "2s/.*/Latest update: $(today)/" \
-		"$sdk64"/usr/src/build-extra/installer/ReleaseNotes.md ||
+		"$sdk64"/usr/src/build-extra/ReleaseNotes.md ||
 	die "Could not edit release notes\n"
 
 	(cd "$sdk64"/usr/src/build-extra &&
 	 git commit -s -m "Prepare release notes for v$displayver" \
-		installer/ReleaseNotes.md) ||
+		ReleaseNotes.md) ||
 	die "Could not commit finalized release notes\n"
 
 	(cd "$sdk32"/usr/src/build-extra &&
@@ -776,7 +776,7 @@ release () { #
 	die "Incorrect version in the release notes\n"
 
 	test "Latest update: $(today)" = "$(sed -n 2p \
-		<"$sdk64/usr/src/build-extra/installer/ReleaseNotes.md")" ||
+		<"$sdk64/usr/src/build-extra/ReleaseNotes.md")" ||
 	die "Incorrect release date in the release notes\n"
 
 	for sdk in "$sdk32" "$sdk64"
@@ -852,7 +852,7 @@ publish () { #
 	name="Git for Windows $displayver"
 	text="$(sed -n \
 		"/^## Changes since/,\${s/## //;:1;p;n;/^## Changes/q;b1}" \
-		<"$sdk64"/usr/src/build-extra/installer/ReleaseNotes.md)"
+		<"$sdk64"/usr/src/build-extra/ReleaseNotes.md)"
 	checksums="$(printf 'Filename | SHA-256\n-------- | -------\n'
 		(cd "$HOME" && sha256sum.exe \
 			Git-"$ver"-64-bit.exe \