CVSROOT: /cvsroot/lilypond Module name: installers Branch: Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/10 12:01:04
Modified files:
macos : ChangeLog buildmac.py
macos/INFO : ghostscript.info guile.info
macos/LilyPad : ChangeLog LilyPond.py ProcessLog.py
Welcome-to-LilyPond-MacOS.ly lilycall.py
macos/LilyPad/ProcessLog.nib: keyedobjects.nib
Added files:
macos/INFO : gmp.info
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/ChangeLog.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/buildmac.py.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/INFO/gmp.info?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/INFO/ghostscript.info.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/INFO/guile.info.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/LilyPad/ChangeLog.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/LilyPad/LilyPond.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/LilyPad/ProcessLog.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/LilyPad/Welcome-to-LilyPond-MacOS.ly.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/LilyPad/lilycall.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/installers/macos/LilyPad/ProcessLog.nib/keyedobjects.nib.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: installers/macos/ChangeLog
diff -u installers/macos/ChangeLog:1.32 installers/macos/ChangeLog:1.33
--- installers/macos/ChangeLog:1.32 Tue Jun 21 23:21:57 2005
+++ installers/macos/ChangeLog Sun Jul 10 12:01:03 2005
@@ -1,3 +1,15 @@
+2005-07-08 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * buildmac.py (lilypond_version): retain old DYLD_LIBRARY_PATH.
+
+2005-06-27 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * buildmac.py (file_newer_p): check if f2 exists.
+
+2005-06-24 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * INFO/ghostscript.info: GS without X.
+
2005-06-22 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* buildmac.py (build_lilypad): update build-number of LilyPad too.
Index: installers/macos/INFO/ghostscript.info
diff -u installers/macos/INFO/ghostscript.info:1.1
installers/macos/INFO/ghostscript.info:1.2
--- installers/macos/INFO/ghostscript.info:1.1 Tue May 17 01:09:02 2005
+++ installers/macos/INFO/ghostscript.info Sun Jul 10 12:01:03 2005
@@ -1,6 +1,6 @@
{
'Source': 'espgs-8.15rc3.tar.gz',
- 'CompileScript' : '''./configure --disable-cups --prefix=%(prefix)s
--with-drivers=FILES && make ''',
+ 'CompileScript' : '''./configure --disable-cups --prefix=%(prefix)s
--without-x --with-drivers=FILES && make ''',
'InstallScript' : '''make install'''
}
Index: installers/macos/INFO/guile.info
diff -u installers/macos/INFO/guile.info:1.1
installers/macos/INFO/guile.info:1.2
--- installers/macos/INFO/guile.info:1.1 Tue May 17 01:09:02 2005
+++ installers/macos/INFO/guile.info Sun Jul 10 12:01:03 2005
@@ -1,5 +1,5 @@
{
- 'Source': '/sw/src/guile-1.6.7.tar.gz',
+ 'Source': 'guile-1.6.7.tar.gz',
'CompileScript' : '''./configure --prefix=%(prefix)s && make ''',
'InstallScript' : '''make install'''
}
Index: installers/macos/LilyPad/ChangeLog
diff -u installers/macos/LilyPad/ChangeLog:1.11
installers/macos/LilyPad/ChangeLog:1.12
--- installers/macos/LilyPad/ChangeLog:1.11 Thu Jun 23 15:30:22 2005
+++ installers/macos/LilyPad/ChangeLog Sun Jul 10 12:01:03 2005
@@ -1,3 +1,18 @@
+2005-06-27 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lilycall.py (check_fontconfig): create cache file if not
+ existing. This prevents spurious warnings on the 2nd run.
+
+2005-06-24 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * LilyPond.py (TinyTinyDocument.createProcessLog): set close
+ callback.
+ (TinyTinyDocument.processLogClosed_): remove PLWC reference upon
+ closing. This fixes closing compile window and rerunning it.
+
+ * ProcessLog.py (ProcessLogWindowController.windowWillClose_):
+ hack: add close_callback.
+
2005-06-23 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lilycall.py (Call.__init__): return if error found.
Index: installers/macos/LilyPad/LilyPond.py
diff -u installers/macos/LilyPad/LilyPond.py:1.12
installers/macos/LilyPad/LilyPond.py:1.13
--- installers/macos/LilyPad/LilyPond.py:1.12 Thu Jun 23 15:24:03 2005
+++ installers/macos/LilyPad/LilyPond.py Sun Jul 10 12:01:03 2005
@@ -3,10 +3,10 @@
from PyObjCTools import NibClassBuilder, AppHelper
from Foundation import NSBundle, NSURL
from AppKit import NSWorkspace, NSDocumentController, NSDocument
+import AppKit
NibClassBuilder.extractClasses("TinyTinyDocument")
-
import URLHandlerClass
import lilycall
import subprocess
@@ -121,9 +121,20 @@
else:
self.saveDocument_ (None)
+ def processLogClosed_ (self, data):
+ self.processLogWindowController = None
+
def createProcessLog (self):
if not self.processLogWindowController:
- self.processLogWindowController = ProcessLogWindowController()
+ wc = ProcessLogWindowController()
+ self.processLogWindowController = wc
+ center = NSWorkspace.sharedWorkspace().notificationCenter()
+ notification = AppKit.NSWindowWillCloseNotification
+# center.addObserver_selector_name_object_(self, "processLogClosed:",
+# notification,
+# wc.window ())
+
+ wc.close_callback = self.processLogClosed_
else:
self.processLogWindowController.showWindow_ (None)
@@ -163,12 +174,14 @@
appdir = NSBundle.mainBundle().bundlePath()
call = lilycall.Call (appdir, [self.fileName()])
- call.set_gui_options ()
+
self.createProcessLog ()
wc = self.processLogWindowController
if call.error_string:
wc.addText (call.error_string)
return None
+
+ call.set_gui_options ()
if call.need_fc_update:
wc.addText ('\nCaching font details.\nThis may take a few
minutes.\n\n\n')
Index: installers/macos/LilyPad/ProcessLog.nib/keyedobjects.nib
diff -u installers/macos/LilyPad/ProcessLog.nib/keyedobjects.nib:1.3
installers/macos/LilyPad/ProcessLog.nib/keyedobjects.nib:1.4
--- installers/macos/LilyPad/ProcessLog.nib/keyedobjects.nib:1.3 Wed Jun
15 10:40:43 2005
+++ installers/macos/LilyPad/ProcessLog.nib/keyedobjects.nib Sun Jul 10
12:01:04 2005
@@ -11,22 +11,22 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>158</integer>
+ <integer>146</integer>
</dict>
<key>NSClassesKeys</key>
<dict>
<key>CF$UID</key>
- <integer>139</integer>
+ <integer>127</integer>
</dict>
<key>NSClassesValues</key>
<dict>
<key>CF$UID</key>
- <integer>140</integer>
+ <integer>128</integer>
</dict>
<key>NSConnections</key>
<dict>
<key>CF$UID</key>
- <integer>110</integer>
+ <integer>98</integer>
</dict>
<key>NSFontManager</key>
<dict>
@@ -41,34 +41,34 @@
<key>NSNamesKeys</key>
<dict>
<key>CF$UID</key>
- <integer>132</integer>
+ <integer>120</integer>
</dict>
<key>NSNamesValues</key>
<dict>
<key>CF$UID</key>
- <integer>133</integer>
+ <integer>121</integer>
</dict>
<key>NSNextOid</key>
<integer>276</integer>
<key>NSObjectsKeys</key>
<dict>
<key>CF$UID</key>
- <integer>129</integer>
+ <integer>117</integer>
</dict>
<key>NSObjectsValues</key>
<dict>
<key>CF$UID</key>
- <integer>131</integer>
+ <integer>119</integer>
</dict>
<key>NSOidsKeys</key>
<dict>
<key>CF$UID</key>
- <integer>141</integer>
+ <integer>129</integer>
</dict>
<key>NSOidsValues</key>
<dict>
<key>CF$UID</key>
- <integer>142</integer>
+ <integer>130</integer>
</dict>
<key>NSRoot</key>
<dict>
@@ -126,7 +126,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>32</integer>
+ <integer>97</integer>
</dict>
<key>NS.objects</key>
<array>
@@ -140,22 +140,22 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>109</integer>
+ <integer>96</integer>
</dict>
<key>NSMaxSize</key>
<dict>
<key>CF$UID</key>
- <integer>108</integer>
+ <integer>95</integer>
</dict>
<key>NSMinSize</key>
<dict>
<key>CF$UID</key>
- <integer>107</integer>
+ <integer>94</integer>
</dict>
<key>NSScreenRect</key>
<dict>
<key>CF$UID</key>
- <integer>106</integer>
+ <integer>93</integer>
</dict>
<key>NSViewClass</key>
<dict>
@@ -205,12 +205,12 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>105</integer>
+ <integer>92</integer>
</dict>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>104</integer>
+ <integer>91</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -227,7 +227,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>49</integer>
+ <integer>36</integer>
</dict>
<key>NS.objects</key>
<array>
@@ -237,11 +237,11 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>89</integer>
+ <integer>76</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>94</integer>
+ <integer>81</integer>
</dict>
</array>
</dict>
@@ -249,7 +249,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>88</integer>
+ <integer>75</integer>
</dict>
<key>NSContentView</key>
<dict>
@@ -259,12 +259,12 @@
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>87</integer>
+ <integer>74</integer>
</dict>
<key>NSHScroller</key>
<dict>
<key>CF$UID</key>
- <integer>84</integer>
+ <integer>71</integer>
</dict>
<key>NSNextKeyView</key>
<dict>
@@ -289,7 +289,7 @@
<key>NSVScroller</key>
<dict>
<key>CF$UID</key>
- <integer>80</integer>
+ <integer>67</integer>
</dict>
<key>NSsFlags</key>
<integer>18</integer>
@@ -300,7 +300,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>49</integer>
+ <integer>36</integer>
</dict>
<key>NS.objects</key>
<array>
@@ -310,11 +310,11 @@
</dict>
<dict>
<key>CF$UID</key>
- <integer>80</integer>
+ <integer>67</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>84</integer>
+ <integer>71</integer>
</dict>
</array>
</dict>
@@ -322,17 +322,17 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>79</integer>
+ <integer>66</integer>
</dict>
<key>NSBGColor</key>
<dict>
<key>CF$UID</key>
- <integer>53</integer>
+ <integer>40</integer>
</dict>
<key>NSCursor</key>
<dict>
<key>CF$UID</key>
- <integer>77</integer>
+ <integer>64</integer>
</dict>
<key>NSDocView</key>
<dict>
@@ -342,7 +342,7 @@
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>76</integer>
+ <integer>63</integer>
</dict>
<key>NSNextKeyView</key>
<dict>
@@ -373,7 +373,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>49</integer>
+ <integer>36</integer>
</dict>
<key>NS.objects</key>
<array>
@@ -387,27 +387,22 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>75</integer>
+ <integer>62</integer>
</dict>
<key>NSDelegate</key>
<dict>
<key>CF$UID</key>
<integer>0</integer>
</dict>
- <key>NSDragTypes</key>
- <dict>
- <key>CF$UID</key>
- <integer>20</integer>
- </dict>
<key>NSFrameSize</key>
<dict>
<key>CF$UID</key>
- <integer>33</integer>
+ <integer>20</integer>
</dict>
<key>NSMaxSize</key>
<dict>
<key>CF$UID</key>
- <integer>74</integer>
+ <integer>61</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -417,7 +412,7 @@
<key>NSSharedData</key>
<dict>
<key>CF$UID</key>
- <integer>52</integer>
+ <integer>39</integer>
</dict>
<key>NSSuperview</key>
<dict>
@@ -429,97 +424,22 @@
<key>NSTextContainer</key>
<dict>
<key>CF$UID</key>
- <integer>34</integer>
+ <integer>21</integer>
</dict>
<key>NSvFlags</key>
- <integer>274</integer>
- </dict>
- <dict>
- <key>$class</key>
- <dict>
- <key>CF$UID</key>
- <integer>32</integer>
- </dict>
- <key>NS.objects</key>
- <array>
- <dict>
- <key>CF$UID</key>
- <integer>21</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>22</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>23</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>24</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>25</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>26</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>27</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>28</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>29</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>30</integer>
- </dict>
- <dict>
- <key>CF$UID</key>
- <integer>31</integer>
- </dict>
- </array>
- </dict>
- <string>Apple PDF pasteboard type</string>
- <string>Apple PICT pasteboard type</string>
- <string>NSStringPboardType</string>
- <string>NeXT Rich Text Format v1.0 pasteboard type</string>
- <string>NeXT Encapsulated PostScript v1.2 pasteboard
type</string>
- <string>Apple HTML pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NeXT TIFF v4.0 pasteboard type</string>
- <string>NeXT RTFD pasteboard type</string>
- <string>CorePasteboardFlavorType 0x6D6F6F76</string>
- <string>NSColor pasteboard type</string>
- <dict>
- <key>$classes</key>
- <array>
- <string>NSMutableSet</string>
- <string>NSSet</string>
- <string>NSObject</string>
- </array>
- <key>$classname</key>
- <string>NSMutableSet</string>
+ <integer>2066</integer>
</dict>
<string>{463, 309}</string>
<dict>
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>51</integer>
+ <integer>38</integer>
</dict>
<key>NSLayoutManager</key>
<dict>
<key>CF$UID</key>
- <integer>35</integer>
+ <integer>22</integer>
</dict>
<key>NSTCFlags</key>
<integer>1</integer>
@@ -535,7 +455,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>50</integer>
+ <integer>37</integer>
</dict>
<key>NSDelegate</key>
<dict>
@@ -547,24 +467,24 @@
<key>NSTextContainers</key>
<dict>
<key>CF$UID</key>
- <integer>48</integer>
+ <integer>35</integer>
</dict>
<key>NSTextStorage</key>
<dict>
<key>CF$UID</key>
- <integer>36</integer>
+ <integer>23</integer>
</dict>
</dict>
<dict>
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>47</integer>
+ <integer>34</integer>
</dict>
<key>NSAttributes</key>
<dict>
<key>CF$UID</key>
- <integer>38</integer>
+ <integer>25</integer>
</dict>
<key>NSDelegate</key>
<dict>
@@ -574,7 +494,7 @@
<key>NSString</key>
<dict>
<key>CF$UID</key>
- <integer>37</integer>
+ <integer>24</integer>
</dict>
</dict>
<dict>
@@ -590,28 +510,28 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>46</integer>
+ <integer>33</integer>
</dict>
<key>NS.keys</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>39</integer>
+ <integer>26</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>40</integer>
+ <integer>27</integer>
</dict>
</array>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>41</integer>
+ <integer>28</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>44</integer>
+ <integer>31</integer>
</dict>
</array>
</dict>
@@ -621,12 +541,12 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>43</integer>
+ <integer>30</integer>
</dict>
<key>NSName</key>
<dict>
<key>CF$UID</key>
- <integer>42</integer>
+ <integer>29</integer>
</dict>
<key>NSSize</key>
<real>11</real>
@@ -647,7 +567,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>45</integer>
+ <integer>32</integer>
</dict>
<key>NSTabStops</key>
<dict>
@@ -689,13 +609,13 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>49</integer>
+ <integer>36</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>34</integer>
+ <integer>21</integer>
</dict>
</array>
</dict>
@@ -731,12 +651,12 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>73</integer>
+ <integer>60</integer>
</dict>
<key>NSBackgroundColor</key>
<dict>
<key>CF$UID</key>
- <integer>53</integer>
+ <integer>40</integer>
</dict>
<key>NSDefaultParagraphStyle</key>
<dict>
@@ -748,12 +668,12 @@
<key>NSInsertionColor</key>
<dict>
<key>CF$UID</key>
- <integer>55</integer>
+ <integer>42</integer>
</dict>
<key>NSLinkAttributes</key>
<dict>
<key>CF$UID</key>
- <integer>65</integer>
+ <integer>52</integer>
</dict>
<key>NSMarkedAttributes</key>
<dict>
@@ -763,14 +683,14 @@
<key>NSSelectedAttributes</key>
<dict>
<key>CF$UID</key>
- <integer>56</integer>
+ <integer>43</integer>
</dict>
</dict>
<dict>
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>54</integer>
+ <integer>41</integer>
</dict>
<key>NSColorSpace</key>
<integer>3</integer>
@@ -792,7 +712,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>54</integer>
+ <integer>41</integer>
</dict>
<key>NSColorSpace</key>
<integer>3</integer>
@@ -805,28 +725,28 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>46</integer>
+ <integer>33</integer>
</dict>
<key>NS.keys</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>57</integer>
+ <integer>44</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>58</integer>
+ <integer>45</integer>
</dict>
</array>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>59</integer>
+ <integer>46</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>63</integer>
+ <integer>50</integer>
</dict>
</array>
</dict>
@@ -836,22 +756,22 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>54</integer>
+ <integer>41</integer>
</dict>
<key>NSCatalogName</key>
<dict>
<key>CF$UID</key>
- <integer>60</integer>
+ <integer>47</integer>
</dict>
<key>NSColor</key>
<dict>
<key>CF$UID</key>
- <integer>62</integer>
+ <integer>49</integer>
</dict>
<key>NSColorName</key>
<dict>
<key>CF$UID</key>
- <integer>61</integer>
+ <integer>48</integer>
</dict>
<key>NSColorSpace</key>
<integer>6</integer>
@@ -862,7 +782,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>54</integer>
+ <integer>41</integer>
</dict>
<key>NSColorSpace</key>
<integer>3</integer>
@@ -875,22 +795,22 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>54</integer>
+ <integer>41</integer>
</dict>
<key>NSCatalogName</key>
<dict>
<key>CF$UID</key>
- <integer>60</integer>
+ <integer>47</integer>
</dict>
<key>NSColor</key>
<dict>
<key>CF$UID</key>
- <integer>55</integer>
+ <integer>42</integer>
</dict>
<key>NSColorName</key>
<dict>
<key>CF$UID</key>
- <integer>64</integer>
+ <integer>51</integer>
</dict>
<key>NSColorSpace</key>
<integer>6</integer>
@@ -900,36 +820,36 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>46</integer>
+ <integer>33</integer>
</dict>
<key>NS.keys</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>66</integer>
+ <integer>53</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>67</integer>
+ <integer>54</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>58</integer>
+ <integer>45</integer>
</dict>
</array>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>68</integer>
+ <integer>55</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>69</integer>
+ <integer>56</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>72</integer>
+ <integer>59</integer>
</dict>
</array>
</dict>
@@ -940,14 +860,14 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>71</integer>
+ <integer>58</integer>
</dict>
<key>NSCursorType</key>
<integer>13</integer>
<key>NSHotSpot</key>
<dict>
<key>CF$UID</key>
- <integer>70</integer>
+ <integer>57</integer>
</dict>
</dict>
<string>{8, -8}</string>
@@ -964,7 +884,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>54</integer>
+ <integer>41</integer>
</dict>
<key>NSColorSpace</key>
<integer>1</integer>
@@ -1001,14 +921,14 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>71</integer>
+ <integer>58</integer>
</dict>
<key>NSCursorType</key>
<integer>1</integer>
<key>NSHotSpot</key>
<dict>
<key>CF$UID</key>
- <integer>78</integer>
+ <integer>65</integer>
</dict>
</dict>
<string>{4, -5}</string>
@@ -1027,19 +947,19 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>83</integer>
+ <integer>70</integer>
</dict>
<key>NSAction</key>
<dict>
<key>CF$UID</key>
- <integer>82</integer>
+ <integer>69</integer>
</dict>
<key>NSCurValue</key>
<real>1</real>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>81</integer>
+ <integer>68</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -1077,19 +997,19 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>83</integer>
+ <integer>70</integer>
</dict>
<key>NSAction</key>
<dict>
<key>CF$UID</key>
- <integer>86</integer>
+ <integer>73</integer>
</dict>
<key>NSCurValue</key>
<real>1</real>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>85</integer>
+ <integer>72</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -1131,17 +1051,17 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>93</integer>
+ <integer>80</integer>
</dict>
<key>NSDrawMatrix</key>
<dict>
<key>CF$UID</key>
- <integer>90</integer>
+ <integer>77</integer>
</dict>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>92</integer>
+ <integer>79</integer>
</dict>
<key>NSMaxValue</key>
<real>100</real>
@@ -1164,7 +1084,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>91</integer>
+ <integer>78</integer>
</dict>
</dict>
<dict>
@@ -1192,19 +1112,19 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>103</integer>
+ <integer>90</integer>
</dict>
<key>NSCell</key>
<dict>
<key>CF$UID</key>
- <integer>96</integer>
+ <integer>83</integer>
</dict>
<key>NSEnabled</key>
<true/>
<key>NSFrame</key>
<dict>
<key>CF$UID</key>
- <integer>95</integer>
+ <integer>82</integer>
</dict>
<key>NSNextResponder</key>
<dict>
@@ -1224,17 +1144,17 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>102</integer>
+ <integer>89</integer>
</dict>
<key>NSAlternateContents</key>
<dict>
<key>CF$UID</key>
- <integer>100</integer>
+ <integer>87</integer>
</dict>
<key>NSAlternateImage</key>
<dict>
<key>CF$UID</key>
- <integer>98</integer>
+ <integer>85</integer>
</dict>
<key>NSButtonFlags</key>
<integer>-2038284033</integer>
@@ -1247,17 +1167,17 @@
<key>NSContents</key>
<dict>
<key>CF$UID</key>
- <integer>97</integer>
+ <integer>84</integer>
</dict>
<key>NSControlView</key>
<dict>
<key>CF$UID</key>
- <integer>94</integer>
+ <integer>81</integer>
</dict>
<key>NSKeyEquivalent</key>
<dict>
<key>CF$UID</key>
- <integer>101</integer>
+ <integer>88</integer>
</dict>
<key>NSPeriodicDelay</key>
<integer>200</integer>
@@ -1266,7 +1186,7 @@
<key>NSSupport</key>
<dict>
<key>CF$UID</key>
- <integer>98</integer>
+ <integer>85</integer>
</dict>
</dict>
<string>Stop</string>
@@ -1274,12 +1194,12 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>43</integer>
+ <integer>30</integer>
</dict>
<key>NSName</key>
<dict>
<key>CF$UID</key>
- <integer>99</integer>
+ <integer>86</integer>
</dict>
<key>NSSize</key>
<real>13</real>
@@ -1345,44 +1265,54 @@
<string>NSWindowTemplate</string>
</dict>
<dict>
+ <key>$classes</key>
+ <array>
+ <string>NSMutableSet</string>
+ <string>NSSet</string>
+ <string>NSObject</string>
+ </array>
+ <key>$classname</key>
+ <string>NSMutableSet</string>
+ </dict>
+ <dict>
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>49</integer>
+ <integer>36</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>111</integer>
+ <integer>99</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>114</integer>
+ <integer>102</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>116</integer>
+ <integer>104</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>118</integer>
+ <integer>106</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>120</integer>
+ <integer>108</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>122</integer>
+ <integer>110</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>125</integer>
+ <integer>113</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>127</integer>
+ <integer>115</integer>
</dict>
</array>
</dict>
@@ -1390,17 +1320,17 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>113</integer>
+ <integer>101</integer>
</dict>
<key>NSDestination</key>
<dict>
<key>CF$UID</key>
- <integer>94</integer>
+ <integer>81</integer>
</dict>
<key>NSLabel</key>
<dict>
<key>CF$UID</key>
- <integer>112</integer>
+ <integer>100</integer>
</dict>
<key>NSSource</key>
<dict>
@@ -1423,7 +1353,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>113</integer>
+ <integer>101</integer>
</dict>
<key>NSDestination</key>
<dict>
@@ -1433,7 +1363,7 @@
<key>NSLabel</key>
<dict>
<key>CF$UID</key>
- <integer>115</integer>
+ <integer>103</integer>
</dict>
<key>NSSource</key>
<dict>
@@ -1446,7 +1376,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>113</integer>
+ <integer>101</integer>
</dict>
<key>NSDestination</key>
<dict>
@@ -1456,7 +1386,7 @@
<key>NSLabel</key>
<dict>
<key>CF$UID</key>
- <integer>117</integer>
+ <integer>105</integer>
</dict>
<key>NSSource</key>
<dict>
@@ -1469,7 +1399,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>113</integer>
+ <integer>101</integer>
</dict>
<key>NSDestination</key>
<dict>
@@ -1479,7 +1409,7 @@
<key>NSLabel</key>
<dict>
<key>CF$UID</key>
- <integer>119</integer>
+ <integer>107</integer>
</dict>
<key>NSSource</key>
<dict>
@@ -1492,7 +1422,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>113</integer>
+ <integer>101</integer>
</dict>
<key>NSDestination</key>
<dict>
@@ -1502,7 +1432,7 @@
<key>NSLabel</key>
<dict>
<key>CF$UID</key>
- <integer>121</integer>
+ <integer>109</integer>
</dict>
<key>NSSource</key>
<dict>
@@ -1515,7 +1445,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>124</integer>
+ <integer>112</integer>
</dict>
<key>NSDestination</key>
<dict>
@@ -1525,12 +1455,12 @@
<key>NSLabel</key>
<dict>
<key>CF$UID</key>
- <integer>123</integer>
+ <integer>111</integer>
</dict>
<key>NSSource</key>
<dict>
<key>CF$UID</key>
- <integer>94</integer>
+ <integer>81</integer>
</dict>
</dict>
<string>cancelProcess:</string>
@@ -1548,17 +1478,17 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>113</integer>
+ <integer>101</integer>
</dict>
<key>NSDestination</key>
<dict>
<key>CF$UID</key>
- <integer>89</integer>
+ <integer>76</integer>
</dict>
<key>NSLabel</key>
<dict>
<key>CF$UID</key>
- <integer>126</integer>
+ <integer>114</integer>
</dict>
<key>NSSource</key>
<dict>
@@ -1571,17 +1501,17 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>113</integer>
+ <integer>101</integer>
</dict>
<key>NSDestination</key>
<dict>
<key>CF$UID</key>
- <integer>94</integer>
+ <integer>81</integer>
</dict>
<key>NSLabel</key>
<dict>
<key>CF$UID</key>
- <integer>128</integer>
+ <integer>116</integer>
</dict>
<key>NSSource</key>
<dict>
@@ -1594,33 +1524,33 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>130</integer>
+ <integer>118</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>13</integer>
+ <integer>19</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>89</integer>
+ <integer>8</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>8</integer>
+ <integer>76</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>19</integer>
+ <integer>15</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>94</integer>
+ <integer>13</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>15</integer>
+ <integer>81</integer>
</dict>
</array>
</dict>
@@ -1637,29 +1567,29 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>130</integer>
+ <integer>118</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>8</integer>
+ <integer>15</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>13</integer>
+ <integer>2</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>2</integer>
+ <integer>13</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>15</integer>
+ <integer>13</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>13</integer>
+ <integer>8</integer>
</dict>
<dict>
<key>CF$UID</key>
@@ -1671,33 +1601,33 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>130</integer>
+ <integer>118</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>8</integer>
+ <integer>19</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>89</integer>
+ <integer>8</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>19</integer>
+ <integer>76</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>94</integer>
+ <integer>15</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>15</integer>
+ <integer>2</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>2</integer>
+ <integer>81</integer>
</dict>
</array>
</dict>
@@ -1705,39 +1635,38 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>130</integer>
+ <integer>118</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>10</integer>
+ <integer>122</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>134</integer>
+ <integer>10</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>135</integer>
+ <integer>123</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>136</integer>
+ <integer>124</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>137</integer>
+ <integer>125</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>138</integer>
+ <integer>126</integer>
</dict>
</array>
</dict>
- <string>11</string>
<string>NSTextView</string>
- <string>NSButton111</string>
+ <string>11</string>
<string>NSScrollView2</string>
<dict>
<key>$class</key>
@@ -1748,11 +1677,12 @@
<key>NS.string</key>
<string>File's Owner</string>
</dict>
+ <string>NSButton111</string>
<dict>
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>130</integer>
+ <integer>118</integer>
</dict>
<key>NS.objects</key>
<array/>
@@ -1761,7 +1691,7 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>130</integer>
+ <integer>118</integer>
</dict>
<key>NS.objects</key>
<array/>
@@ -1770,69 +1700,69 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>130</integer>
+ <integer>118</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>111</integer>
+ <integer>106</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>94</integer>
+ <integer>8</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>13</integer>
+ <integer>102</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>122</integer>
+ <integer>2</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>118</integer>
+ <integer>113</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>127</integer>
+ <integer>104</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>8</integer>
+ <integer>108</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>114</integer>
+ <integer>15</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>2</integer>
+ <integer>110</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>116</integer>
+ <integer>19</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>120</integer>
+ <integer>115</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>15</integer>
+ <integer>81</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>19</integer>
+ <integer>76</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>89</integer>
+ <integer>99</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>125</integer>
+ <integer>13</integer>
</dict>
</array>
</dict>
@@ -1840,87 +1770,87 @@
<key>$class</key>
<dict>
<key>CF$UID</key>
- <integer>130</integer>
+ <integer>118</integer>
</dict>
<key>NS.objects</key>
<array>
<dict>
<key>CF$UID</key>
- <integer>143</integer>
+ <integer>131</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>144</integer>
+ <integer>132</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>145</integer>
+ <integer>133</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>146</integer>
+ <integer>134</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>147</integer>
+ <integer>135</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>148</integer>
+ <integer>136</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>149</integer>
+ <integer>137</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>150</integer>
+ <integer>138</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>151</integer>
+ <integer>139</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>152</integer>
+ <integer>140</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>153</integer>
+ <integer>141</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>154</integer>
+ <integer>142</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>155</integer>
+ <integer>143</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>156</integer>
+ <integer>144</integer>
</dict>
<dict>
<key>CF$UID</key>
- <integer>157</integer>
+ <integer>145</integer>
</dict>
</array>
</dict>
- <integer>250</integer>
- <integer>249</integer>
- <integer>2</integer>
- <integer>266</integer>
<integer>263</integer>
- <integer>271</integer>
<integer>21</integer>
<integer>253</integer>
<integer>1</integer>
+ <integer>270</integer>
<integer>262</integer>
<integer>264</integer>
<integer>246</integer>
+ <integer>266</integer>
<integer>247</integer>
+ <integer>271</integer>
+ <integer>249</integer>
<integer>269</integer>
- <integer>270</integer>
+ <integer>250</integer>
+ <integer>2</integer>
<dict>
<key>$classes</key>
<array>
Index: installers/macos/LilyPad/ProcessLog.py
diff -u installers/macos/LilyPad/ProcessLog.py:1.2
installers/macos/LilyPad/ProcessLog.py:1.3
--- installers/macos/LilyPad/ProcessLog.py:1.2 Fri Jun 17 00:30:43 2005
+++ installers/macos/LilyPad/ProcessLog.py Sun Jul 10 12:01:03 2005
@@ -76,7 +76,7 @@
def initEmpty_(self):
self = self.initWithWindowNibName_("ProcessLog")
self.setWindowTitle_('Process')
-
+ self.close_callback = None
self.processLog = ProcessLog.alloc().init_()
self.window().makeFirstResponder_(self.textView)
self.showWindow_(self)
@@ -89,6 +89,14 @@
return self
def windowWillClose_(self, notification):
+
+ ## UGH.
+ if self.close_callback:
+ self.close_callback (self)
+ self.cancelProcess_ (self)
+ self.suicide()
+
+ def suicide (self):
# see comment in self.initWithObject_()
self.autorelease()
Index: installers/macos/LilyPad/Welcome-to-LilyPond-MacOS.ly
diff -u installers/macos/LilyPad/Welcome-to-LilyPond-MacOS.ly:1.2
installers/macos/LilyPad/Welcome-to-LilyPond-MacOS.ly:1.3
--- installers/macos/LilyPad/Welcome-to-LilyPond-MacOS.ly:1.2 Fri Jun 17
00:30:43 2005
+++ installers/macos/LilyPad/Welcome-to-LilyPond-MacOS.ly Sun Jul 10
12:01:03 2005
@@ -32,4 +32,4 @@
}
-\version "2.5.25" % necessary for upgrading to future LilyPond versions.
+\version "2.6.0" % necessary for upgrading to future LilyPond versions.
Index: installers/macos/LilyPad/lilycall.py
diff -u installers/macos/LilyPad/lilycall.py:1.5
installers/macos/LilyPad/lilycall.py:1.6
--- installers/macos/LilyPad/lilycall.py:1.5 Thu Jun 23 15:30:22 2005
+++ installers/macos/LilyPad/lilycall.py Sun Jul 10 12:01:04 2005
@@ -83,7 +83,11 @@
<fontconfig>
<cache>%s</cache>
</fontconfig>''' % fc_cache)
- return not os.path.exists (fc_cache)
+ need_update = not os.path.exists (fc_cache)
+ if need_update:
+ open (fc_cache, 'w').write ('')
+
+ return need_update
def get_env (prefix):
p = ''
Index: installers/macos/buildmac.py
diff -u installers/macos/buildmac.py:1.40 installers/macos/buildmac.py:1.41
--- installers/macos/buildmac.py:1.40 Thu Jun 23 15:30:22 2005
+++ installers/macos/buildmac.py Sun Jul 10 12:01:03 2005
@@ -28,13 +28,16 @@
bindir = contents_dir + "/MacOS/"
lp_builddir = builddir + "/" + "lilypond"
+if 'stable' in sys.argv:
+ lp_builddir += '-stable'
+
lilypond_cvs_dir = lp_builddir
bundle_name = 'LilyPond'
image_dir = '%s/image/Applications/' % (builddir)
wrapdest = '%s/%s' % (image_dir, bundle_name)
wrapdir = wrapdest + '.app'
-build_number = 2
+build_number = 1
# eval (open (topdir + '/VERSION').read())
packages = [
@@ -43,6 +46,7 @@
'glib2',
'freetype',
'fontconfig',
+# 'gmp',
'guile',
'pango',
'libpng',
@@ -89,13 +93,21 @@
os.environ['CPPFLAGS'] = ' -no-cpp-precomp -isystem %s/include ' % prefix
os.environ['LDFLAGS'] = ' -L%s' % libdir
-os.environ['DYLD_LIBRARY_PATH'] = libdir
+
+try:
+ p = os.environ['DYLD_LIBRARY_PATH']
+except:
+ p = ''
+
+os.environ['DYLD_LIBRARY_PATH'] = libdir + ":" + p
+
os.environ['PKG_CONFIG_PATH'] = libdir + '/pkgconfig/'
# don't want Fink to be in front of the path.
os.environ['PATH'] = (prefix +"/bin/:"
+ os.environ["PATH"]
- + "/usr/bin/:/usr/local/bin:")
+ + "/usr/bin/:/usr/local/bin:"
+ )
################################################################
@@ -190,7 +202,8 @@
open (success_file, 'w').write ("")
def file_newer_p (f1, f2):
- return os.stat (f1).st_mtime > os.stat (f2).st_mtime
+ return not os.path.exists (f2) \
+ or os.stat (f1).st_mtime > os.stat (f2).st_mtime
def build_lilypond ():
"Compile LilyPond from CVS."
@@ -203,6 +216,7 @@
os.chdir (lp_builddir)
lp_prefix = builddir + '/LilyPond.app/Contents/Resources'
+
if (file_newer_p ('config.make.in', 'config.make')
or file_newer_p ('configure.in', 'config.make')
@@ -217,8 +231,8 @@
+ ' PYTHON=/usr/bin/python' )
if os.path.exists ( lp_prefix +'/share/lilypond'):
- system ('cd %s && rm -rf lilypond' % (lp_prefix + '/share'))
-
+ system ('rm -rf %s' % lp_prefix)
+
system ('make install')
system ('cd %s && ln -sf %s current' % (lp_prefix + '/share/lilypond',
lilypond_version))
@@ -250,6 +264,8 @@
'share/ghostscript/8.15/Resource/',
'info',
'bin/msg*',
+ 'bin/xmlwf',
+ 'bin/pango-querymodules',
'bin/*gettext*',
'bin/*-config',
'bin/[cd]jpeg',
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
