Permalink
Browse files

Quick experiment to break up compilation of individual .winxed files …

…and use pbc_merge to combine them (with correct annotations et al.). Does not work. pbc_merge fails trying to load sys_ops dyoplib
  • Loading branch information...
Whiteknight committed May 25, 2012
1 parent 8335465 commit 2ac28bf93ef17284bc78666e5db6ba6f8ce5d806
View
@@ -301,8 +301,7 @@ function setup_stable_libraries(var rosella)
);
// Library for working with date and time
- setup_winxed_lib(rosella, "date", ["Core", "Ascii", "Parse_builtins", "Parse"],
- "date/Includes",
+ setup_lib_separate(rosella, "date",
"date/Date",
"date/DateFormatter",
"date/Doomsday",
@@ -567,6 +566,27 @@ function setup_lib_internal(var rosella, string name, string prefix,
rosella["manifest_includes"].push(pir_lib_name);
}
+function setup_lib_separate(var rosella, string name, var files [slurpy])
+{
+ setup_lib_internal_separate(rosella, name, "src/", files);
+}
+
+function setup_lib_internal_separate(var rosella, string name, string prefix, var files)
+{
+ string pbc_lib_name = "rosella/" + name + ".pbc";
+ rosella["pbc_pbc"][pbc_lib_name] = [];
+
+ for (string file in files) {
+ string pir_name = "rosella/" + file + ".pir";
+ string pbc_name = "rosella/" + file + ".pbc";
+ string winxed_name = prefix + file + ".winxed";
+ rosella["pir_winxed"][pir_name] = winxed_name;
+ rosella["pbc_pir"][pbc_name] = pir_name;
+ push(rosella["pbc_pbc"][pbc_lib_name], pbc_name);
+ }
+ rosella["inst_lib"].push(pbc_lib_name);
+}
+
function setup_lib_constants(var rosella, string name, string prefix, var args)
{
var constants_files = args["constants"];
View
@@ -1,3 +1,5 @@
+$include "src/date/Includes.winxed";
+
/* Rosella Date Library
The Date library provides utilities for working with dates and times. It is
not guaranteed to produce perfectly accurate results in all cases for all
@@ -1,3 +1,5 @@
+$include "src/date/Includes.winxed";
+
/* Date String Formatter
Formats a Date object into a string according to the given formatting string
*/
View
@@ -1,3 +1,5 @@
+$include "src/date/Includes.winxed";
+
namespace Rosella.Date.Doomsday
{
// doomsdays[N] is the day of month N that falls on a doomsday.
@@ -1,3 +1,5 @@
+$include "src/date/Includes.winxed";
+
namespace Rosella.Date.ISO8601_101
{
// TODO: Need a format sequence for fractions of a second (millisecond)
View
@@ -1,6 +1,11 @@
$loadlib "sys_ops";
$include_const "tm.pasm";
+$include "src/include/Core.winxed";
+$include "src/include/Ascii.winxed";
+$include "src/include/Parse_builtins.winxed";
+$include "src/include/Parse.winxed";
+
inline decodetime(int sys_time) return var
{
var d;
@@ -1,3 +1,5 @@
+$include "src/date/Includes.winxed";
+
/* Special Date Class
This class represents certain special dates which are not real dates.
*/
View
@@ -1,3 +1,5 @@
+$include "src/date/Includes.winxed";
+
/* Time Span Class
These objects represent a length of time without defined start and end
times
@@ -1,3 +1,5 @@
+$include "src/date/Includes.winxed";
+
/* TimeSpan String Formatter
Formats a TimeSpan object into a string according to the given formatting
string

0 comments on commit 2ac28bf

Please sign in to comment.