CVSROOT: /cvsroot/lilypond
Module name: installers
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/15 12:21:11
Modified files:
macos : VERSION buildmac.py
macos/LilyPad : ChangeLog LilyPond.py
Log message:
release commit
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/VERSION.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/buildmac.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/LilyPad/ChangeLog.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/LilyPad/LilyPond.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
Patches:
Index: installers/macos/LilyPad/ChangeLog
diff -u installers/macos/LilyPad/ChangeLog:1.3
installers/macos/LilyPad/ChangeLog:1.4
--- installers/macos/LilyPad/ChangeLog:1.3 Wed Jun 15 11:46:02 2005
+++ installers/macos/LilyPad/ChangeLog Wed Jun 15 12:21:11 2005
@@ -4,6 +4,9 @@
sensitive help.
(lily_version): new function
(open_url): new function
+ (TinyTinyDocument.windowControllerDidLoadNib_):
+ only load welcome if there are no other files loaded.
+ (TinyTinyDocument.windowControllerDidLoadNib_): use firstStart boolean.
* setup.py (plist): set copyright, version and credits for app.
Index: installers/macos/LilyPad/LilyPond.py
diff -u installers/macos/LilyPad/LilyPond.py:1.5
installers/macos/LilyPad/LilyPond.py:1.6
--- installers/macos/LilyPad/LilyPond.py:1.5 Wed Jun 15 11:46:02 2005
+++ installers/macos/LilyPad/LilyPond.py Wed Jun 15 12:21:11 2005
@@ -3,7 +3,7 @@
from PyObjCTools import NibClassBuilder, AppHelper
from Foundation import NSBundle, NSURL
-from AppKit import NSWorkspace
+from AppKit import NSWorkspace, NSDocumentController
NibClassBuilder.extractClasses("TinyTinyDocument")
@@ -19,6 +19,8 @@
from ProcessLog import ProcessLogWindowController
+firstStart = True
+
# utility functions
def open_url (url):
workspace = NSWorkspace.sharedWorkspace ()
@@ -29,11 +31,18 @@
def lily_version ():
bundle = NSBundle.mainBundle ()
appdir = NSBundle.mainBundle().bundlePath()
- pattern = appdir + '/Contents/Resources/share/lilypond/[0-9]*'
+ share = appdir + '/Contents/Resources/share/lilypond'
+
+ if not os.path.exists (share):
+ share = os.environ['HOME'] +
'/Desktop/LilyPond.app/Contents/Resources/share/lilypond'
+
+ pattern = share + '/[0-9]*'
+
versions = glob.glob (pattern)
version = '2.2.31'
if versions:
version = versions[0]
+ version = os.path.split(version)[1]
return tuple (string.split (version, '.'))
@@ -77,13 +86,16 @@
return True
def windowControllerDidLoadNib_(self, controller):
+ global firstStart
if self.startupPath:
self.readFromUTF8 (self.startupPath)
- else:
- appdir = NSBundle.mainBundle().bundlePath()
- prefix = appdir + "/Contents/Resources"
- self.readFromUTF8 (prefix + '/Welcome-to-LilyPond-MacOS.ly')
-
+ elif firstStart:
+ appdir = NSBundle.mainBundle().bundlePath()
+ prefix = appdir + "/Contents/Resources"
+ self.readFromUTF8 (prefix + '/Welcome-to-LilyPond-MacOS.ly')
+
+ firstStart = False
+
def readFromUTF8(self, path):
f = file(path)
text = unicode(f.read(), "utf8")
@@ -161,7 +173,6 @@
(maj,min,pat) = lily_version ()
open_url ('http://lilypond.org/doc/v%s.%s' % (maj, min))
else:
- print r.location, r.length
substr = tv.string()[r.location:r.location + r.length]
google_lilypond (substr)
Index: installers/macos/VERSION
diff -u installers/macos/VERSION:1.1 installers/macos/VERSION:1.2
--- installers/macos/VERSION:1.1 Wed Jun 15 10:40:43 2005
+++ installers/macos/VERSION Wed Jun 15 12:21:10 2005
@@ -1 +1,2 @@
build_number = 1
+
Index: installers/macos/buildmac.py
diff -u installers/macos/buildmac.py:1.34 installers/macos/buildmac.py:1.35
--- installers/macos/buildmac.py:1.34 Wed Jun 15 11:46:02 2005
+++ installers/macos/buildmac.py Wed Jun 15 12:21:10 2005
@@ -34,7 +34,8 @@
image_dir = '%s/image/Applications/' % (builddir)
wrapdest = '%s/%s' % (image_dir, bundle_name)
wrapdir = wrapdest + '.app'
-eval (topdir + '/VERSION')
+build_number = 2
+# eval (open (topdir + '/VERSION').read())
packages = [
'gettext',
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
