Revision: 25723
http://sourceforge.net/p/bibdesk/svn/25723
Author: hofman
Date: 2021-04-10 12:50:50 +0000 (Sat, 10 Apr 2021)
Log Message:
-----------
No need to update relnotes.html, this is read from the appcast
Modified Paths:
--------------
trunk/bibdesk/build_release.py
Modified: trunk/bibdesk/build_release.py
===================================================================
--- trunk/bibdesk/build_release.py 2021-04-10 06:30:35 UTC (rev 25722)
+++ trunk/bibdesk/build_release.py 2021-04-10 12:50:50 UTC (rev 25723)
@@ -79,7 +79,6 @@
KEY_NAME = "BibDesk Sparkle Key"
APPCAST_URL = "https://bibdesk.sourceforge.io/bibdesk.xml";
-RELNOTES_URL = "https://bibdesk.sourceforge.io/relnotes.html";
# create a private temporary directory
BUILD_ROOT = os.path.join("/tmp", "BibDesk-%s" % (getuser()))
@@ -95,7 +94,6 @@
BUILT_APP = os.path.join(BUILD_DIR, "BibDesk.app")
DERIVED_DATA_DIR = os.path.join(BUILD_ROOT, "DerivedData")
PLIST_PATH = os.path.join(BUILT_APP, "Contents", "Info.plist")
-RELNOTES_PATH = os.path.join(BUILT_APP, "Contents", "Resources",
"RelNotes.rtf")
def read_versions():
@@ -366,23 +364,20 @@
newFeatures.append(relNotes[start:end])
note = ""
- noteType = 0
start = relNotes.find(noteString1, 0, endNote)
if start is -1:
start = relNotes.find(noteString2, 0, endNote)
- if start is -1:
- start = relNotes.find(noteString3, 0, endNote)
if start is -1:
- start = relNotes.find(noteString4, 0, endNote)
- else:
- noteType = 1
+ start = relNotes.find(noteString3, 0, endNote)
+ if start is -1:
+ start = relNotes.find(noteString4, 0, endNote)
if start is not -1:
end = relNotes.find(relNotes, start, endNote)
- if end is not -1:
+ if end > start:
note = strip(relNotes[start:end])
+
+ return newFeatures, bugsFixed, changesSince, note
- return newFeatures, bugsFixed, changesSince, note, noteType
-
def keyFromSecureNote():
# see
http://www.entropy.ch/blog/Developer/2008/09/22/Sparkle-Appcast-Automation-in-Xcode.html
@@ -436,11 +431,11 @@
else:
type = "application/zip"
- newFeatures, bugsFixed, changesSince, note, noteType = release_notes()
+ newFeatures, bugsFixed, changesSince, note = release_notes()
relNotes = "\n<h1>Version " + newVersionString + "</h1>\n"
- if len(note) > 0 and noteType is 1:
- "\n<p>\n<em><b>Note:</b> " + note + "</em>\n</p>\n"
+ if len(note) > 0:
+ "\n<p>\n<em><b>NOTE:</b> " + note + "</em>\n</p>\n"
if len(newFeatures) > 0:
relNotes = relNotes + "\n<h2>New Features</h2>\n<ul>\n"
for item in newFeatures:
@@ -495,7 +490,7 @@
# construct the ReadMe file
readMe = "Release notes for BibDesk version " + newVersionString + "\n"
if len(note) > 0:
- readMe = readMe + "\nNote: " + note + "\n"
+ readMe = readMe + "\nNOTE: " + note + "\n"
if len(newFeatures) > 0:
readMe = readMe + "\nNew Features\n"
for item in newFeatures:
@@ -511,24 +506,6 @@
readMeFile.write(readMe)
readMeFile.close()
- # construct relnotes.html
- newline = "\n "
- relNotes = "<h1>" + changesSince + "</h1>" + newline + newline
- if len(note) > 0:
- relNotes = relNotes + "<b>Note:</b> " + note + newline + newline
- if len(newFeatures) > 0:
- relNotes = relNotes + "<h2>New Features</h2>" + newline + newline +
"<ul>" + newline
- for item in newFeatures:
- relNotes = relNotes + " <li>" + item + "</li>" + newline
- relNotes = relNotes + "</ul>" + newline + newline
- if len(bugsFixed) > 0:
- relNotes = relNotes + "<h2>Bugs Fixed</h2>" + newline + newline +
"<ul>" + newline
- for item in bugsFixed:
- relNotes = relNotes + " <li>" + item + "</li>" + newline
- relNotes = relNotes + "</ul>" + newline + newline
-
- releaseNotes = urllib.urlopen(RELNOTES_URL).read().decode("utf-8")
-
start = releaseNotes.find("<title>")
end = releaseNotes.find("</title>")
releaseNotes = releaseNotes[:start+7] + "BibDesk " + newVersionString +
releaseNotes[end:]
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
