Update of /var/lib/cvs/fundev/Sources/project-manager/projects
In directory cantor:/tmp/cvs-serv7135/projects
Modified Files:
Tag: fundev-2-1-jam
compilation.dylan implementation.dylan projects-library.dylan
Log Message:
Bug: 7003
Instead of allowing the the choice of a linker, the new build-system
allows a build-script to be chosen.
Index: compilation.dylan
===================================================================
RCS file:
/var/lib/cvs/fundev/Sources/project-manager/projects/compilation.dylan,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -d -r1.1.1.1 -r1.1.1.1.2.1
--- compilation.dylan 12 Mar 2004 00:09:47 -0000 1.1.1.1
+++ compilation.dylan 24 Jun 2004 06:50:41 -0000 1.1.1.1.2.1
@@ -66,13 +66,12 @@
define method link-library(project :: <project>, #rest keys,
#key target-type,
- linker = unsupplied(),
extent = #"changes",
+ build-script,
progress-callback,
mode, release?,
#all-keys)
=> (linked? :: <boolean>)
- let linker = if (supplied?(linker)) linker else default-linker() end;
let type = target-type | project-target-type(project);
let build-options
= concatenate(select (extent)
@@ -84,12 +83,12 @@
#"exports" => #["exports"];
#"dll" =>
select (mode)
- #"combine" => #["unify-all", "dll"];
+ #"combine" => #["unify-dll", "dll"];
otherwise => #["dll"];
end;
#"executable" =>
select (mode)
- #"combine" => #["unify-all", "exe"];
+ #"combine" => #["unify-exe", "exe"];
otherwise => #["exe"];
end;
end,
@@ -97,7 +96,7 @@
let build-location = project-build-location(project);
build-system(build-options,
directory: build-location,
- linker: linker,
+ build-script: build-script,
progress-callback: progress-callback,
project-build-info: project-build-info)
end method;
Index: implementation.dylan
===================================================================
RCS file:
/var/lib/cvs/fundev/Sources/project-manager/projects/implementation.dylan,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -d -r1.1.1.1 -r1.1.1.1.2.1
--- implementation.dylan 12 Mar 2004 00:09:47 -0000 1.1.1.1
+++ implementation.dylan 24 Jun 2004 06:50:41 -0000 1.1.1.1.2.1
@@ -677,10 +677,9 @@
project-remove-database(project);
// remove compiler & link products
makefile-exists?(project) &
- build-system(if (recursive?) #["clean-all"]
- else #["clean"] end,
+ build-system(if (recursive?) #["clean-all"] else #["clean"] end,
directory: project.project-build-location,
- progress-callback: method(#rest args) end);
+ progress-callback: ignore);
end;
// no-op for system projects
end;
Index: projects-library.dylan
===================================================================
RCS file:
/var/lib/cvs/fundev/Sources/project-manager/projects/projects-library.dylan,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -d -r1.1.1.1 -r1.1.1.1.2.1
--- projects-library.dylan 12 Mar 2004 00:09:47 -0000 1.1.1.1
+++ projects-library.dylan 24 Jun 2004 06:50:41 -0000 1.1.1.1.2.1
@@ -131,7 +131,7 @@
},
export: all;
use build-system,
- import: { default-linker, default-linker-setter },
+ import: { default-build-script, default-build-script-setter },
export: all;
end module;
_______________________________________________
Gd-chatter mailing list
Gd-chatter@xxxxxxxxxxxxxxxx
http://www.gwydiondylan.org/mailman/listinfo/gd-chatter
|
