Track version in libsaria

Tracking two different versions for Ocarina and libsaria was too much
work.  From now on, Ocarina and libsaria will have the same version.
Ocarina's version string will be set based on libsaria.
This commit is contained in:
Bryan Schumaker 2011-01-22 11:19:18 -05:00
parent e537f6d1c6
commit 23cd4da304
7 changed files with 23 additions and 30 deletions

View File

@ -3,16 +3,17 @@
__all__ = [ "audio", "sources",
"event", "map", "path", "plugin"]
__major__ = 1
__major__ = 4
__minor__ = 4
__bug__ = 0
__dev__ = True
__vers__ = "Libsaria %s.%s" % (__major__, __minor__)
__vstr__ = "%s.%s" % (__major__, __minor__)
if __bug__ > 0:
__vers__ = "%s.%s" % (__vers__, __bug__)
__vstr__ = "%s.%s" % (__vstr__, __bug__)
if __dev__ == True:
__vers__ += "-dev"
__vstr__ += "-dev"
__vers__ = "Libsaria %s" % __vstr__
import event
import path

View File

@ -12,16 +12,7 @@ import libsaria
gdk = gtk.gdk
main = gtk.main
__major__ = 4
__minor__ = 4
__bug__ = 0
__dev__ = True
__vers__ = "Ocarina %s.%s" % (__major__, __minor__)
if __bug__ > 0:
__vers__ = "%s.%s" % (__vers__, __bug__)
if __dev__ == True:
__vers__ += "-dev"
__vers__ = "Ocarina %s" % libsaria.__vstr__
def uptime():
return now() - __start__

View File

@ -95,8 +95,8 @@ def stop():
footer.remove_page("Lyrics")
def check_version():
if ocarina.__major__ != 4:
if libsaria.__major__ != 4:
return False
if ocarina.__minor__ == 3:
if libsaria.__minor__ == 4:
return True
return False

View File

@ -27,8 +27,8 @@ def stop():
pass
def check_version():
if ocarina.__major__ != 4:
if libsaria.__major__ != 4:
return False
if ocarina.__minor__ == 3:
if libsaria.__minor__ == 4:
return True
return True

View File

@ -4,9 +4,10 @@ import ocarina
import webkit
from ocarina import body
path = ocarina.libsaria.path
audio = ocarina.libsaria.audio
gtk = ocarina.gtk
libsaria = ocarina.libsaria
path = libsaria.path
audio = libsaria.audio
gtk = ocarina.gtk
page = gtk.ScrolledWindow()
box = gtk.VBox()
@ -32,8 +33,8 @@ def stop():
body.remove_page("Web Radio")
def check_version():
if ocarina.__major__ != 4:
if libsaria.__major__ != 4:
return False
if ocarina.__minor__ == 3:
if libsaria.__minor__ == 4:
return True
return False

View File

@ -1,12 +1,12 @@
# Bryan Schumaker (11/13/2010)
import ocarina
import libsaria
import imp
from libsaria.sources import library
from libsaria import threads
from libsaria import lastfm
path = ocarina.libsaria.path
path = libsaria.path
exists = path.exists
join = path.join
sep = path.sep
@ -112,7 +112,7 @@ class HTTPRequest(BaseHTTPRequestHandler):
def start_server():
global server
if ocarina.__dev__ == True:
if libsaria.__dev__ == True:
server = HTTPServer(('', 4243), HTTPRequest)
else:
server = HTTPServer(('', 4242), HTTPRequest)
@ -125,9 +125,9 @@ def stop():
server.shutdown()
def check_version():
if ocarina.__major__ != 4:
if libsaria.__major__ != 4:
return False
if ocarina.__minor__ == 3:
if libsaria.__minor__ == 4:
return True
return False

View File

@ -30,8 +30,8 @@ def stop():
pass
def check_version():
if ocarina.__major__ != 4:
if libsaria.__major__ != 4:
return False
if ocarina.__minor__ == 3:
if libsaria.__minor__ == 4:
return True
return False