Mercurial > projects > dwt2

changeset 40:9f32c409fe27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compile problem and extend rakefile
author Frank Benoit <benoit@tionex.de>
date Wed, 25 Mar 2009 15:10:08 +0100
parents 0ecb2b338560
children a9c9a97b3d82
files org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/Listener.d rakefile
diffstat 2 files changed, 21 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/Listener.d	Wed Mar 25 13:20:43 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/Listener.d	Wed Mar 25 15:10:08 2009 +0100
@@ -68,11 +68,11 @@
 
     version(Tango){
         alias ParameterTupleOf!(Dg) DgArgs;
-        static assert( is(DgArgs == Tuple!(CTabFolderEvent,T)),
+        static assert( is(DgArgs == Tuple!(Event,T)),
                 "Delegate args not correct: delegate args: ("~DgArgs.stringof~") vs. passed args: ("~Tuple!(Event,T).stringof~")" );
     } else { // Phobos
         alias ParameterTypeTuple!(Dg) DgArgs;
-        static assert( is(DgArgs == TypeTuple!(CTabFolderEvent,T)),
+        static assert( is(DgArgs == TypeTuple!(Event,T)),
                 "Delegate args not correct: delegate args: ("~DgArgs.stringof~") vs. passed args: ("~Tuple!(Event,T).stringof~")" );
     }
 
--- a/rakefile	Wed Mar 25 13:20:43 2009 +0100
+++ b/rakefile	Wed Mar 25 15:10:08 2009 +0100
@@ -41,6 +41,7 @@
     LIBEXT = ".lib"
     OBJEXT = ".obj"
     EXEEXT = ".exe"
+    MAPEXT = ".map"
 else
     BASEDIR_SWT = "org.eclipse.swt.gtk.linux.x86"
     LIBEXT = ".a"
@@ -103,6 +104,7 @@
 
     rsp = File.new( RSPNAME, "w+" )
     rsp.puts "-H"
+    #rsp.puts "-Hd#{DIMPDIR.to_path}"
     rsp.puts "-I#{srcdir_abs.to_path}"
     rsp.puts "-I#{DIMPDIR.to_path}"
     rsp.puts "-J#{resdir_abs.to_path}"
@@ -121,7 +123,7 @@
     end
     rsp.close
 
-    Dir.chdir(basedir) do
+    Dir.chdir(srcdir_abs) do
         if isWindows
             cmd = "#{DMD} @#{RSPNAME.to_path}"
         else
@@ -148,7 +150,7 @@
         end
     end
 
-    libobjs = Array.new
+    libobjs = FileList.new
     srcdirparts = split_all( srcdir_abs ).length
     Find.find( srcdir_abs ) do |path|
         if FileTest.file?(path) && path =~ /\.o(bj)?$/ then
@@ -175,11 +177,11 @@
             raise "librarian error"
         end
     end
+    FileUtils.rm libobjs
 
 end
 
 def buildApp( basedir, srcdir, resdir, dflags, appname, filelist, libnames )
-    puts "Building #{basedir}[#{appname}]"
     if filelist == nil
         filelist = FileList[ "**/#{appname}.d" ]
     end
@@ -217,7 +219,7 @@
     end
     rsp.close
 
-    Dir.chdir(basedir) do
+    Dir.chdir(srcdir_abs) do
         if isWindows
             cmd = "#{DMD} @#{RSPNAME.to_path}"
         else
@@ -229,9 +231,11 @@
             end
         end
     end
+    if isWindows
+        FileUtils.rm File.join(srcdir_abs,appname+MAPEXT), :force => true
+    end
 
 end
-
 ##########################################################################
 # Targets
 #
@@ -278,7 +282,7 @@
 desc "Build JFace.Text"
 task :jfacetext do
     buildTree( "org.eclipse.text", "src", "res" )
-    buildTree( "org.eclipse.jface.text", "projection", "res", "-Isrc", "org.eclipse.jface.text.projection" )
+    buildTree( "org.eclipse.jface.text", "projection", "res", "-I../src", "org.eclipse.jface.text.projection" )
     buildTree( "org.eclipse.jface.text", "src", "res" )
 end
 
@@ -310,19 +314,19 @@
     snps_exclude = snps_browser + snps_opengl
     allsnippets = FileList[ File.join("org.eclipse.swt.snippets", "src", "**/Snippet*.d" )]
     if args.explicit_snp != nil
-        puts "Building #{args.explicit_snp}"
-        buildApp( "org.eclipse.swt.snippets", "src", "res", "", args.explicit_snp, nil, libnames )
+        snpname = args.explicit_snp
+        puts "Building swtsnippets[#{snpname}]"
+        buildApp( "org.eclipse.swt.snippets", "src", "res", "", snpname, nil, libnames )
     else
         allsnippets.each do | snp |
-            puts "Building #{snp}"
             if snp =~ /.*(Snippet\w+)\.d$/
                 snpname = $1
+                puts "Building swtsnippets[#{snpname}]"
                 if !snps_exclude.include? snpname
                     buildApp( "org.eclipse.swt.snippets", "src", "res", "", snpname, nil, libnames )
                 end
             else
-                puts snp
-                raise "Name does not match"
+                raise "Name does not match #{snp}"
             end
         end
     end
@@ -335,19 +339,20 @@
     snps_exclude = []
     allsnippets = FileList[ File.join("org.eclipse.jface.snippets", "EclipseJfaceSnippets", "**/*.d" )]
     if args.explicit_snp != nil
-        puts "Building #{args.explicit_snp}"
+        snpname = args.explicit_snp
+        puts "Building jfacesnippets[#{snpname}]"
         buildApp( "org.eclipse.jface.snippets", "src", "res", "", args.explicit_snp, nil, libnames )
     else
         allsnippets.each do | snp |
             if snp =~ /.*[\\\/](\w+)\.d$/
                 snpname = $1
-                puts "Building #{snpname}"
+                puts "Building jfacesnippets[#{snpname}]"
                 if !snps_exclude.include? snpname
                     buildApp( "org.eclipse.jface.snippets", "src", "res", "", snpname, nil, libnames )
                 end
             else
                 puts snp
-                raise "Name does not match"
+                raise "Name does not match #{snp}"
             end
         end
     end