Author: peterw
Date: 2006-01-15 15:46:27 -0500 (Sun, 15 Jan 2006)
New Revision: 55603
Modified:
trunk/mbuild/Monkeywrench/ChangeLog
trunk/mbuild/Monkeywrench/Monkeywrench/BuildfileParser.jay
trunk/mbuild/Mono.Build/ChangeLog
trunk/mbuild/Mono.Build/Mono.Build/MBFile.cs
trunk/mbuild/TODO
trunk/mbuild/mb-gtkconfig/Buildfile
trunk/mbuild/mb-gtkconfig/ChangeLog
Log:
2006-01-15 Peter Williams <[EMAIL PROTECTED]>
* Monkeywrench/BuildfileParser.jay: Let the subdirs statement
take either identifiers or literal strings, so that
subdirectories with spaces in their names can be handled.
2006-01-15 Peter Williams <[EMAIL PROTECTED]>
Patch from Mart Roosmaa <[EMAIL PROTECTED]>
* Mono.Build/MBFile.cs: Track the evolving Mono.Posix API.
2006-01-15 Peter Williams <[EMAIL PROTECTED]>
Patch from Mart Roosmaa <[EMAIL PROTECTED]>
* Buildfile: Now that gtk-sharp-2.0 is out, use that rather
than 1.0.
Modified: trunk/mbuild/Monkeywrench/ChangeLog
===================================================================
--- trunk/mbuild/Monkeywrench/ChangeLog 2006-01-15 20:26:08 UTC (rev 55602)
+++ trunk/mbuild/Monkeywrench/ChangeLog 2006-01-15 20:46:27 UTC (rev 55603)
@@ -1,3 +1,9 @@
+2006-01-15 Peter Williams <[EMAIL PROTECTED]>
+
+ * Monkeywrench/BuildfileParser.jay: Let the subdirs statement
+ take either identifiers or literal strings, so that
+ subdirectories with spaces in their names can be handled.
+
2005-10-10 Peter Williams <[EMAIL PROTECTED]>
The other half of fixing build fingerprints. Update the
Modified: trunk/mbuild/Monkeywrench/Monkeywrench/BuildfileParser.jay
===================================================================
--- trunk/mbuild/Monkeywrench/Monkeywrench/BuildfileParser.jay 2006-01-15
20:26:08 UTC (rev 55602)
+++ trunk/mbuild/Monkeywrench/Monkeywrench/BuildfileParser.jay 2006-01-15
20:46:27 UTC (rev 55603)
@@ -491,7 +491,7 @@
;
subdirs_statement
- : SUBDIRS OPEN_BRACKET identifiers CLOSE_BRACKET
+ : SUBDIRS OPEN_BRACKET identifiers_or_strings CLOSE_BRACKET
{
int count = 0;
@@ -733,6 +733,27 @@
}
;
+/* Identifiers or literal strings - where spaces in names are desired */
+
+identifiers_or_strings
+ : IDENTIFIER
+ {
+ $$ = new IdentList ((string) $1);
+ }
+ | STRING
+ {
+ $$ = new IdentList ((string) $1);
+ }
+ | identifiers IDENTIFIER
+ {
+ $$ = new IdentList ((string) $2, (IdentList) $1);
+ }
+ | identifiers STRING
+ {
+ $$ = new IdentList ((string) $2, (IdentList) $1);
+ }
+ ;
+
/* This hack makes it so commas don't screw us up */
references
Modified: trunk/mbuild/Mono.Build/ChangeLog
===================================================================
--- trunk/mbuild/Mono.Build/ChangeLog 2006-01-15 20:26:08 UTC (rev 55602)
+++ trunk/mbuild/Mono.Build/ChangeLog 2006-01-15 20:46:27 UTC (rev 55603)
@@ -1,3 +1,9 @@
+2006-01-15 Peter Williams <[EMAIL PROTECTED]>
+
+ Patch from Mart Roosmaa <[EMAIL PROTECTED]>
+
+ * Mono.Build/MBFile.cs: Track the evolving Mono.Posix API.
+
2005-12-01 Peter Williams <[EMAIL PROTECTED]>
* Mono.Build/MBFile.cs: Use better method for setting
Modified: trunk/mbuild/Mono.Build/Mono.Build/MBFile.cs
===================================================================
--- trunk/mbuild/Mono.Build/Mono.Build/MBFile.cs 2006-01-15 20:26:08 UTC
(rev 55602)
+++ trunk/mbuild/Mono.Build/Mono.Build/MBFile.cs 2006-01-15 20:46:27 UTC
(rev 55603)
@@ -131,7 +131,7 @@
string path = GetPath (ctxt);
if ((int) Environment.OSVersion.Platform == 4)
- Mono.Unix.UnixFile.SetPermissions (path,
Mono.Unix.Native.FilePermissions.S_IXUSR);
+ new Mono.Unix.UnixFileInfo (path).Protection =
Mono.Unix.Native.FilePermissions.S_IXUSR;
// no action needed on MS
}
Modified: trunk/mbuild/TODO
===================================================================
--- trunk/mbuild/TODO 2006-01-15 20:26:08 UTC (rev 55602)
+++ trunk/mbuild/TODO 2006-01-15 20:46:27 UTC (rev 55603)
@@ -264,3 +264,10 @@
* Create a default hashtable for substing: things like prefix, version,
libdir, compat,
etc.
+
+01/15/06:
+
+* Add an 'allowed' property that is similar to 'default', but if we try
+ to build the target and 'allowed' is false, signal an error. Not sure
+ if allowed = true should imply default = true; almost certainly not,
+ actually.
Modified: trunk/mbuild/mb-gtkconfig/Buildfile
===================================================================
--- trunk/mbuild/mb-gtkconfig/Buildfile 2006-01-15 20:26:08 UTC (rev 55602)
+++ trunk/mbuild/mb-gtkconfig/Buildfile 2006-01-15 20:46:27 UTC (rev 55603)
@@ -5,8 +5,8 @@
Tools.PkgConfig
]
-glade-sharp-pccheck = []
-glade-sharp-pclibs = [] with [ default = false ]
+glade-sharp-2.0-pccheck = []
+glade-sharp-2.0-pclibs = [] with [ default = false ]
# Testing
#adasdasdas-pccheck = []
@@ -21,8 +21,8 @@
../Monkeywrench.dll
/config/mbuild/Mono.GetOptions.dll
- glade-sharp-pclibs
+ glade-sharp-2.0-pclibs
] with [
- default = glade-sharp-pccheck
+ default = glade-sharp-2.0-pccheck
install = /config/mbuild/exe_installer
]
Modified: trunk/mbuild/mb-gtkconfig/ChangeLog
===================================================================
--- trunk/mbuild/mb-gtkconfig/ChangeLog 2006-01-15 20:26:08 UTC (rev 55602)
+++ trunk/mbuild/mb-gtkconfig/ChangeLog 2006-01-15 20:46:27 UTC (rev 55603)
@@ -1,3 +1,10 @@
+2006-01-15 Peter Williams <[EMAIL PROTECTED]>
+
+ Patch from Mart Roosmaa <[EMAIL PROTECTED]>
+
+ * Buildfile: Now that gtk-sharp-2.0 is out, use that rather
+ than 1.0.
+
2005-10-10 Peter Williams <[EMAIL PROTECTED]>
* mb-gtkconfig.cs (LoadConfigItem): Handle BuiltItem changes.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
