Commit Graph

147 Commits

Author SHA1 Message Date
Jamie Doornbos 8ce8e69b59 Changed BureauRegistry to use Launcher and updated bureau tests
* Moved the thane-specific TestClientMain out into src/thane and renamed 
  BureauTestClient
* Removed server name and port from the registry init and from the Launcher/
  CommandGenerator parameters. These can be inserted by the caller
* Converted all the asc junk to compc/mxmlc the same as msoy does it
* Moved the test client main function into src/as land
* Added extdeps.suffix alternative approach since tests/build.xml does not
  get launched from nifty ooo-libs container
* Fixed bureau test targets
* Moved avmthane to overridable property and corrected out of date default
* Converted BureauRegistry code to deal with Launcher objects and added shim
  to preserve use of CommandGenerator
* Fixed narya build to remove thane-config.xml after building aslib


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5218 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-07-02 23:44:11 +00:00
Par Winzell 242e38a472 Handle swc dependencies with different names.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5184 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-06-13 16:37:25 +00:00
Par Winzell afee3d0b13 Michael points out, from Russia, that I'm in violation of our library naming policy.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5183 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-06-13 15:05:10 +00:00
Par Winzell b88cee2be7 Stop switching different source files into Environment.as's place. Instead build tiny swc's with the player-specific Environment.as and the thane-specific one. Then compile naryalib.swc with one of these tiny swc's as an external library. When we compile the final executables we'll do a inclusive linking to get the right implementation into place.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5182 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-06-13 03:39:26 +00:00
Par Winzell 6b279daff9 Stop building ABC stuff. This can (almost) all be ripped out if we're successful in our transition.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5180 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-06-13 00:07:57 +00:00
Par Winzell ae5cda0ebf This has been misnamed for quite a while and nobody ever noticed... which presumably means this is a rather unimportant fix.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5176 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-06-10 15:46:49 +00:00
Michael Bayne bf77cb1520 Moved location services implementation into LocationManager so that
LocationProvider can be an interface like its brothers and sisters.

Modified the place registry to create PlaceManager instances using the injector
so that we can inject dependencies into managers. Also modified the custom
classloader functionality so that it can/will circumvent this process
entirely. It's not possible to inject using a custom classloader and one
certainly would not want to do so.

Unfortunately this means we can't inject some basic managers into PlaceManager
because it needs to work for games loaded into a sandboxed classloader, but the
big win is that in everything other than GameManager and PlaceManager, we can
inject to our heart's content.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5168 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-06-08 17:18:26 +00:00
Michael Bayne a7c7d853fe Handle the BodyService with a BodyManager instead of a concrete BodyProvider.
More dependency injection (or removal in the case of SpeakUtil).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5163 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-06-08 13:06:03 +00:00
Jamie Doornbos d2b8eaeb6b Removed temporary lib/abc files from narya and replace dependencies with maven ones
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5150 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-06-04 23:59:37 +00:00
Jamie Doornbos 73b52b1e5f Reordered files for narya asc build to fixed static init crash. Also moved the Environment.as out of the auto-generated files since it had to be manually reinserted each time
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5144 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-30 06:27:53 +00:00
Jamie Doornbos 7ac8aa5583 More jiggering pokering workarounds for crapness of asc (files built with AscLibTask cannot be used to execute a VM, only to build a VM)... confusing, I know... ask Zell
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5142 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-30 01:10:29 +00:00
Jamie Doornbos a741f00f0b Temporarily deploy thane and builtin abc files as part of narya-abc
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5128 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-23 07:07:11 +00:00
Jamie Doornbos 732b726063 Yikes, that was unexpected. the flex task prefers absolute paths. Thanks Bamboo!
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5127 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-23 06:40:14 +00:00
Jamie Doornbos 392ed4bf89 Change abc build to use an exclusion file rather than an inclusion one
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5125 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-23 05:48:40 +00:00
Jamie Doornbos d7a8cf4518 Cleaned up abc build using flexTasks.jar
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5124 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-23 05:44:15 +00:00
Jamie Doornbos 3940a13e32 Preparing narya abc for mavenification: renamed naryalib.abc to narya-abc.abc so artifactId does not conflict. Also fixed narya-dist to include bureau classes and swapped in new hard-wired avmthane for test client target.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5114 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-21 23:39:35 +00:00
Charlie Groves 6a00927002 Don't include the source for native libs in the jar
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5110 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-19 20:56:31 +00:00
Par Winzell e279133868 Redundancy.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5098 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-15 21:57:09 +00:00
Par Winzell 8de38e5bbb Add a classpath condition so Yohoho builds again. Oopsie.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5097 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-15 21:48:39 +00:00
Par Winzell 4c46899e23 Really really cluttering the build files up.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5096 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-15 17:37:03 +00:00
Par Winzell 8b7233c5ca This hack we do with Environment.as is really cluttering up the build files.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5095 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-15 17:27:57 +00:00
Par Winzell dbd1d92acc We've got asc.jar in extlibs now, use it.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5093 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-15 16:56:05 +00:00
Par Winzell 3b5e956f35 Build naryalib.abc with debug information.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5077 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-11 05:38:09 +00:00
Par Winzell a3d1884340 More ugly changes because of Tamarin's immaturity. We're switching to the 'Main' frontend of ASC, which means we have to manually arrange the etc/asc-files.txt lines in the correct dependency order. This compiler also lacks an -outdir options, so we have to do a ridiculous <move> at the end.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5070 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-09 23:07:33 +00:00
Par Winzell fc5a2b1b18 Add dependency on the libraries we link against.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5062 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-09 15:52:20 +00:00
Par Winzell 42246d96b5 Split abc compilation out into its own targets for readability.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5061 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-09 14:58:24 +00:00
Jamie Doornbos 3ccea1c218 Make naryalib.abc rebuild when file list changes
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5057 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-09 06:28:00 +00:00
Jamie Doornbos a841233609 tidied up build.xml with Zells permission, which exposed a problem with the Environment switcheroo, also fixed
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5055 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-09 00:03:55 +00:00
Par Winzell b528132e5d Away, spurious line feed.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5046 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-07 15:39:55 +00:00
Par Winzell b174219540 We now build a subset of Narya for execution on Tamarin, the server-side AS3 VM.
- We use the ASC compiler, which works quite differently from compc/mxmlc. It doesn't attempt any mapping between class hierarchy and directory structure. You feed it source, that's it. This compiler is under continuous development, and the one shipped in Flex SDK 3 is buggy, so we supply our own in lib/asc.jar for the time being.
 - Since much of Narya relies on classes that don't exist on Tamarin (e.g. DisplayObject), we have to isolate a specific subset of source. Right now that's done ridiculously explicitly as a list of class files, in etc/asc-files.txt. In the long run we will want to resolve this more elegantly, but there are no trivial solutions at hand.
 - We have not implemented the full flash.utils.describeType() for Tamarin, but rather a subset of its functionality: one method to see if one type derives from another, and another method to extract the public variable names in an object. The environment-specific code has been isolated to com.threerings.util.env.Environment, and build.xml simply copies either Environment.as-tm or Environment.as-fp into place depending on what it's targeting.
 - The ASC compilation links against lib/builtin.abc, which supplies information about core classes such as Object, Array, etc, and lib/thane.abc which is our homegrown emulation library containing e.g. flash.net.Socket and other things we need that's not part of the open-source code Adobe donated to Mozilla, but rather still in their proprietary Flash Player code.

I'm committing thane.abc and builtin.abc directly now, but they will shortly be built by the Thane project and published as maven whatnots. We could auto-publish lib/asc.jar too, but I think we may want more explicit control over how we version that.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5045 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-05-07 15:33:07 +00:00
Michael Bayne cde838dc45 Call the Flash libraries {library}lib.swc to match the pattern of flexlib.swc
and also to make the Maven artifact not look like a meta-artifact that brings
in all Narya/Nenya/Vilya dependencies.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4936 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-02-18 19:12:29 +00:00
Michael Bayne 4bb7a2f6a3 Build our Flash libraries like we build our Java libraries.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4935 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-02-18 18:33:25 +00:00
Michael Bayne 34875278b3 Only run ninstall on "unix" operating systems (which includes Mac OS X).
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4921 542714f4-19e9-0310-aa3c-eee0fc999fb1
2008-01-08 22:22:38 +00:00
Michael Bayne 6e901ec83a Let's call that ninstall since we don't actually compile anything.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4866 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-11-07 02:20:54 +00:00
Michael Bayne 0d377d8e0b Never mind. Those are committed. And I need to be committed.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4864 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-11-07 02:02:29 +00:00
Michael Bayne 0cd1be4728 Clean our our native libraries when we run clean.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4863 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-11-07 01:57:04 +00:00
Michael Bayne 87a1e8968e Target 1.5 when building.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4860 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-10-30 06:20:06 +00:00
Michael Bayne cd599586be Nixed wacky comment.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4800 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-08-01 17:24:32 +00:00
Michael Bayne 3f7705dfc2 Split SpeakProvider into SpeakHandler and SpeakUtil. SpeakProvider is now a
proper interface like all the other new invocation service backends.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4795 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-07-31 21:05:23 +00:00
Jonathan Le Plastrier 01ed8c5ca5 We're going to have our distclean projects not call clean which will complain that dist/ has been wiped out if you call distclean again. Look for these exciting changes in other rings near you.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4792 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-07-28 01:37:54 +00:00
Michael Bayne 839aaf05dd Nix whole depends business. We can reinstate it if we ever again need it.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4784 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-07-26 20:17:31 +00:00
Par Winzell 9aaf4de2b5 Depot is always built, now.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4781 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-07-26 20:00:48 +00:00
Par Winzell 20719ee3f1 OK, so even this little change is going to have to wait for a few days until after the massive Depot restructure. The current version gets fields and columns a little confused from time to time.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4774 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-07-18 18:54:47 +00:00
Par Winzell 30a8179c5f Let's switch the peristent peer stuff over to a schema-comaptible Depot implementation. I think only Bang uses presents.peer and crowd.peer -- apart from Whirled -- and Bang already uses Depot.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4772 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-07-18 18:08:11 +00:00
Par Winzell 1ea3195551 Add genrecord task and Depot dependency test.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4755 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-07-11 23:29:30 +00:00
Jonathan Le Plastrier 5f0ffa11d4 Fix the docs link.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4725 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-30 22:26:24 +00:00
Michael Bayne ef43b9d41a Re-revamp. I may re-re-revamp later to eliminate the reflection based streaming
altogether as that also solves the "Class.getDeclaredFields() is not required
to return fields in declaration order" problem which has been looming. However,
this should work for now.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4701 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-09 00:20:35 +00:00
Michael Bayne ef384f2a95 Streamables show up all over the place in Narya.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4698 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-07 19:57:41 +00:00
Michael Bayne 4c73734afb Well pants, we can't not build the instrumentation code because we want to run
it on Narya itself and there's no way to say "only execute this task if the
supplied condition is met" without bringing in extra bullshit from ant-contrib
which I really don't want to do.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4696 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-07 19:24:35 +00:00
Michael Bayne 8df35549df Only build the instrumenter if we have the necessary dependencies.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4694 542714f4-19e9-0310-aa3c-eee0fc999fb1
2007-05-07 19:19:20 +00:00