From 4cb75ce60ebcdbd80eb0c5c6c180b141b5218ea2 Mon Sep 17 00:00:00 2001
From: Nic Wolfe <nic@wolfeden.ca>
Date: Sun, 29 Apr 2012 13:31:11 -0600
Subject: [PATCH] Added build 495 to the updates list, changed the changelog to
be static and simply point to the wiki
---
.gitignore | 1 -
CHANGELOG.txt | 1 +
setup.py | 40 ----------------------------------------
updates.txt | 1 +
4 files changed, 2 insertions(+), 41 deletions(-)
create mode 100644 CHANGELOG.txt
diff --git a/.gitignore b/.gitignore
index 42b5ed467..7401fb3d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,6 @@ autoProcessTV/build/*
SickBeard-win32-*.zip
*.exe
gc.ini
-CHANGELOG.txt
*.tmp
*.wpr
*.project
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
new file mode 100644
index 000000000..0e3a20076
--- /dev/null
+++ b/CHANGELOG.txt
@@ -0,0 +1 @@
+See https://github.com/midgetspy/Sick-Beard/wiki/ChangeLog
\ No newline at end of file
diff --git a/setup.py b/setup.py
index f95edb65a..5f703e813 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,6 @@ import urllib, ConfigParser
from distutils.core import setup
import py2exe, sys, os, shutil, datetime, zipfile, subprocess, fnmatch
import googlecode_upload
-from lib.pygithub import github
# mostly stolen from the SABnzbd package.py file
name = 'SickBeard'
@@ -164,45 +163,6 @@ setup(
console = ['updater.py'],
)
-if 'test' in oldArgs:
- print "Ignoring changelog for test build"
-else:
- # start building the CHANGELOG.txt
- print 'Creating changelog'
- gh = github.GitHub()
-
- # read the old changelog and find the last commit from that build
- lastCommit = ""
- try:
- cl = open("CHANGELOG.txt", "r")
- lastCommit = cl.readlines()[0].strip()
- cl.close()
- except:
- print "I guess there's no changelog"
-
- newestCommit = ""
- changeString = ""
-
- # cycle through all the git commits and save their commit messages
- for curCommit in gh.commits.forBranch('midgetspy', 'Sick-Beard'):
- if curCommit.id == lastCommit:
- break
-
- if newestCommit == "":
- newestCommit = curCommit.id
-
- changeString += curCommit.message + "\n\n"
-
- # if we didn't find any changes don't make a changelog file
- if newestCommit != "":
- newChangelog = open("CHANGELOG.txt", "w")
- newChangelog.write(newestCommit+"\n\n")
- newChangelog.write("Changelog for build "+str(currentBuildNumber)+"\n\n")
- newChangelog.write(changeString)
- newChangelog.close()
- else:
- print "No changes found, keeping old changelog"
-
# put the changelog in the compile dir
if os.path.exists("CHANGELOG.txt"):
shutil.copy('CHANGELOG.txt', 'dist/')
diff --git a/updates.txt b/updates.txt
index b5b5b4a47..8a68158d7 100644
--- a/updates.txt
+++ b/updates.txt
@@ -1,3 +1,4 @@
+http://sickbeard.googlecode.com/files/SickBeard-win32-alpha-build495.zip
http://sickbeard.googlecode.com/files/SickBeard-win32-alpha-build494.zip
http://sickbeard.googlecode.com/files/SickBeard-win32-alpha-build493.zip
http://sickbeard.googlecode.com/files/SickBeard-win32-alpha-build492.zip
--
GitLab