Skip to content

Commit

Permalink
[Build] Fix winxed_mk_header to not use Path instead of old FilePath.…
Browse files Browse the repository at this point in the history
… Add a new header for Net. Make sure it and the correct parse headers are included in the install
  • Loading branch information
Whiteknight committed Apr 13, 2012
1 parent aa93173 commit d84d4ac
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 24 deletions.
48 changes: 25 additions & 23 deletions setup.winxed
Expand Up @@ -497,29 +497,31 @@ function setup_data_files(var rosella)
function setup_include_headers(var rosella)
{
rosella["inst_wxheader"] = {
"src/include/Action.winxed" : "Rosella/Action.winxed",
"src/include/Ascii.winxed" : "Rosella/Ascii.winxed",
"src/include/Builtins.winxed" : "Rosella/Builtins.winxed",
"src/include/CommandLine.winxed" : "Rosella/CommandLine.winxed",
"src/include/Container.winxed" : "Rosella/Container.winxed",
"src/include/Core.winxed" : "Rosella/Core.winxed",
"src/include/Dumper.winxed" : "Rosella/Dumper.winxed",
"src/include/Event.winxed" : "Rosella/Event.winxed",
"src/include/FileSystem.winxed" : "Rosella/FileSystem.winxed",
"src/include/Genetic.winxed" : "Rosella/Genetic.winxed",
"src/include/Harness.winxed" : "Rosella/Harness.winxed",
"src/include/Math_Builtins.winxed" : "Rosella/Math_Builtins.winxed",
"src/include/Memoize.winxed" : "Rosella/Memoize.winxed",
"src/include/MockObject.winxed" : "Rosella/MockObject.winxed",
"src/include/Parsing.winxed" : "Rosella/Parsing.winxed",
"src/include/Proxy.winxed" : "Rosella/Proxy.winxed",
"src/include/Path.winxed" : "Rosella/Path.winxed",
"src/include/Query.winxed" : "Rosella/Query.winxed",
"src/include/Random.winxed" : "Rosella/Random.winxed",
"src/include/Repl.winxed" : "Rosella/Repl.winxed",
"src/include/String.winxed" : "Rosella/String.winxed",
"src/include/Template.winxed" : "Rosella/Template.winxed",
"src/include/Test.winxed" : "Rosella/Test.winxed"
"src/include/Action.winxed" : "Rosella/Action.winxed",
"src/include/Ascii.winxed" : "Rosella/Ascii.winxed",
"src/include/Builtins.winxed" : "Rosella/Builtins.winxed",
"src/include/CommandLine.winxed" : "Rosella/CommandLine.winxed",
"src/include/Container.winxed" : "Rosella/Container.winxed",
"src/include/Core.winxed" : "Rosella/Core.winxed",
"src/include/Dumper.winxed" : "Rosella/Dumper.winxed",
"src/include/Event.winxed" : "Rosella/Event.winxed",
"src/include/FileSystem.winxed" : "Rosella/FileSystem.winxed",
"src/include/Genetic.winxed" : "Rosella/Genetic.winxed",
"src/include/Harness.winxed" : "Rosella/Harness.winxed",
"src/include/Math_Builtins.winxed" : "Rosella/Math_Builtins.winxed",
"src/include/Memoize.winxed" : "Rosella/Memoize.winxed",
"src/include/MockObject.winxed" : "Rosella/MockObject.winxed",
"src/include/Net.winxed" : "Rosella/Net.winxed",
"src/include/Parse.winxed" : "Rosella/Parse.winxed",
"src/include/Parse_builtins.winxed" : "Rosella/Parse_builtins.winxed",
"src/include/Proxy.winxed" : "Rosella/Proxy.winxed",
"src/include/Path.winxed" : "Rosella/Path.winxed",
"src/include/Query.winxed" : "Rosella/Query.winxed",
"src/include/Random.winxed" : "Rosella/Random.winxed",
"src/include/Repl.winxed" : "Rosella/Repl.winxed",
"src/include/String.winxed" : "Rosella/String.winxed",
"src/include/Template.winxed" : "Rosella/Template.winxed",
"src/include/Test.winxed" : "Rosella/Test.winxed"
};
}

Expand Down
44 changes: 44 additions & 0 deletions src/include/Net.winxed
@@ -0,0 +1,44 @@
namespace Rosella.Net {
extern function get_protocol;
extern function tcp_socket_factory;
extern function default_mime_encoder;
}

namespace Rosella.Net.Http {
extern function format_request_header;
extern function get_host_information;
}

namespace Rosella.Net.Http.Response { }

namespace Rosella.Net.Uri {
extern function percent_encode;
extern function percent_encode_component;
extern function default_uri_factory;
extern function get_uri;
}

class Rosella.Net.Http.Header;
class Rosella.Net.Http.Request;
class Rosella.Net.Http.Request.FormData;
class Rosella.Net.Http.Request.FormDataFile;
class Rosella.Net.Http.Request.FormDataPair;
class Rosella.Net.Http.Response;
class Rosella.Net.MimeBase64;
class Rosella.Net.Protocol;
class Rosella.Net.Protocol.Factory;
class Rosella.Net.Protocol.File;
class Rosella.Net.Protocol.Http;
class Rosella.Net.Uri;
class Rosella.Net.Uri.Factory;
class Rosella.Net.Uri.File;
class Rosella.Net.Uri.Http;
class Rosella.Net.UserAgent;
class Rosella.Net.UserAgent.SimpleHttp;
class Rosella.Net.SocketFactory;


function __include_net [anon,init,load] ()
{
Rosella.load_bytecode_file('rosella/net.pbc', 'load');
}
2 changes: 1 addition & 1 deletion src/utilities/mk_winxed_header.winxed
Expand Up @@ -38,7 +38,7 @@ function mk_header_main(var args)
.foreach(function(c) { Rosella.IO.sayf("class %s;", c); });

if (rosella_mode) {
var fpath = new Rosella.FileSystem.FilePath(libpath);
var fpath = new Rosella.FileSystem.Path(libpath, 0);
string libname_short = fpath.short_name_no_ext();
string libname = fpath.short_name();
Rosella.IO.sayf("\n\nfunction __include_%s [anon,init,load] ()\n{", libname_short);
Expand Down

0 comments on commit d84d4ac

Please sign in to comment.