Mercurial > projects > dstep

changeset 20:6255d355d752

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made it compile with dmd 1.056
author Jacob Carlborg <doob@me.com>
date Wed, 03 Feb 2010 18:28:01 +0100
parents ae08a08f44d3
children 6b688d8f62c5
files dsss.conf dstep/foundation/NSObject.d dstep/objc/bridge/Bridge.d dstep/objc/objc.d scripts/gen.rb
diffstat 5 files changed, 19 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/dsss.conf	Sun Jan 17 16:25:24 2010 +0100
+++ b/dsss.conf	Wed Feb 03 18:28:01 2010 +0100
@@ -1,4 +1,4 @@
-[dstep]
+[main.d]
 #target=cocoa-d-test
 
 version (GNU){
--- a/dstep/foundation/NSObject.d	Sun Jan 17 16:25:24 2010 +0100
+++ b/dstep/foundation/NSObject.d	Wed Feb 03 18:28:01 2010 +0100
@@ -484,7 +484,7 @@
 	// NSConnectionDelegateMethods
 	bool makeNewConnection (NSConnection conn, NSConnection ancestor)
 	{
-		return invokeObjcSelf!(bool, "makeNewConnection:sender:")(conn, ancestor);
+		return invokeObjcSelf!(bool, "makeNewConnection:sender:", NSConnection, NSConnection)(conn, ancestor);
 	}
 	
 	bool connection (NSConnection ancestor, NSConnection conn)
@@ -499,12 +499,12 @@
 	
 	bool authenticateComponents (NSArray components, NSData signature)
 	{
-		return invokeObjcSelf!(bool, "authenticateComponents:withData:")(components, signature);
+		return invokeObjcSelf!(bool, "authenticateComponents:withData:", NSArray, NSData)(components, signature);
 	}
 	
 	Object createConversationForConnection (NSConnection conn)
 	{
-		return invokeObjcSelf!(Object, "createConversationForConnection:")(conn);
+		return invokeObjcSelf!(Object, "createConversationForConnection:", NSConnection)(conn);
 	}
 	
 	// NSCopyLinkMoveHandler
--- a/dstep/objc/bridge/Bridge.d	Sun Jan 17 16:25:24 2010 +0100
+++ b/dstep/objc/bridge/Bridge.d	Wed Feb 03 18:28:01 2010 +0100
@@ -202,6 +202,7 @@
 {
 	static assert (is(typeof(field) : Object), dstep.objc.bridge.Bridge.buildIBOutletErrorMessage!(field));
 	
+	/// Sets the field
 	void __setMethod (typeof(field) value)
 	{
 		field = value;
--- a/dstep/objc/objc.d	Sun Jan 17 16:25:24 2010 +0100
+++ b/dstep/objc/objc.d	Wed Feb 03 18:28:01 2010 +0100
@@ -151,7 +151,7 @@
 		}  
 	}
 
-	static if (dstep.internal.Version.X86 || X86_64)
+	static if (dstep.internal.Version.X86 || dstep.internal.Version.X86_64)
 	{
 		R msgSend_fpret (R, ARGS...) (SEL op, ARGS args)
 		{
--- a/scripts/gen.rb	Sun Jan 17 16:25:24 2010 +0100
+++ b/scripts/gen.rb	Wed Feb 03 18:28:01 2010 +0100
@@ -143,6 +143,12 @@
 	end
 end
 
+# Prints the message to stderr, exits
+def die (*msg)
+	$stderr.puts msg
+	exit 1
+end
+
 if __FILE__ == $0
 	gen = Generator.new
 	
@@ -194,7 +200,7 @@
 		if ARGV.empty?			
 			die opts.banner
 		else
-			#begin
+			begin
 				opts.parse!(ARGV)
 				
 				ARGV.each do |framework|
@@ -206,12 +212,12 @@
 				die "No output directory given" if gen.out_dir.nil?
 				
 				gen.generate
-			# rescue => e
-			# 	msg = e.message
-			# 	msg = "Internal error" if msg.empty?
-			# 	
-			# 	die msg, opts.banner, help_msg
-			# end
+			rescue => e
+				msg = e.message
+				msg = "Internal error" if msg.empty?
+				
+				die msg, opts.banner, help_msg
+			end
 		end
 	end
 end
\ No newline at end of file