toggle quoted messageShow quoted text
I have made some modifications to runtest.py to allow for the tests to be run on windows along with some changes to the cmake files.
I have redone the everything from scratch and have made changes to cmake and the source that should make it easy to build on windows.
I have some extra instructions for setting up some of the dependencies and then modified the cmake routines to find the external libraries as they come from installing and building OIIO.
OIIO cmake routines still need manual help and I may go modify them, instead of having to add a bunch of paths to CMAKE_INSTALL_PREFIX.
I can now run the tests as well but only 35% of them pass.
I was hoping that through including the flex and bison outputs in the project the need for cygwin could be removed, but the testsuite uses diff so it maybe here to stay.
To get around having to modify every test, and having to parse the command lines to pull out the output file names and create a stdout to file pipe, i decieded to write the command to a batch file and have python call that.
This worked except that my install folder is C:\program files (x86)\... and of course the space was now giving me issues.
So i was able to parse the command strings and wrap them commands in quotes and then write them to the batch file and run it.
Now of course that wasn't the end of it. The next issue is that windows uses cr/lf i guess through > even though the output should be writing just lf, so diff was puking on that.
So on windows the diff command has to take an extra cmd parameter --strip-trailing-cr
So now I can run the tests, I will investigate the errors and then should be ready to submit a patch.
On Mon, Jan 25, 2010 at 12:48 PM, Wormszer <worm...@...>
I have been getting things ready for a patch, but now I am stuck on the testsuite.
There seems to be some issues with python and the os.system command not liking spaces in file names.
So a newer method i think is to use subprocess.call, but this doesn't seem to recognize the redirection operator > and it gets passed as a command line arg instead of directing stdout to a file.
The fix for this I believe is to use the subprocess call but instead of > use its options to pass in a file to stdout.
I have been working on parsing the commands to break out the > and determine file names.
Does anyone know if all the tests use out.txt for the output, and the second command appends to it? I haven't had a chance to look at them all yet.
I am trying to find a way with just modifying the main runtest definition.
If I can get them running then I will feel better about submitting a patch that should work.
On Fri, Jan 22, 2010 at 11:50 PM, Wormszer <worm...@...>
I finally have it all building on windows and can run the testshade program.
I had to create some new OSL_DLLPUBLIC defines and place them around, OSLCOMP_DLLPUBLIC, OSLEXEC_DLLPUBLIC
liboslcomp exports some of the base types, and common functions. Basically if oslcomp uses it, then it exports it and anything that was duplicated in oslexec now imports it from oslcomp.
liboslexec uses the objects exported from oslcomp, typespec and a few others.
liboslquery now has dependencies on oslexec, oslcomp.
I don't believe this will affect the GCC build since they are defined to nothing, other than the source has more OSLCOMP_DLLPUBLIC, OSLEXEC_DLLPUBLIC in it.
I did move typespec.cpp to liboslcomp since its used there first.
Due to the way testshader is it makes use of oslexec private includes and I had to basically export a bunch of classes in oslexec private and public headers.
I guess for a test program this is ok, but to me it seems like its breaking the rules, by using classes in oslexec_pvt.h, and if they are indeed public should be moved to the public header
PVT does mean private right? :).
I am probably going to redo everything I did and then submit a patch. If anyone else has found any issues or a better solution for some of the issues in this thread please let me know.
On Fri, Jan 22, 2010 at 12:15 PM, Wormszer <worm...@...>
I have been trying to get the shaders test to build but I have run into lots of issues with linking dependencies, exports imports etc.
The projects cmake generates for example oslquery uses source files from olsexec. This is causing issues with the DLL_PUBLIC etc type of declerations, because other projects use oslexec as a library to import.
I guess this may work fine on GCC but windows is pitches a fit, because in one project the defines are correct import/export in the other they are import when they should be nothing or export.
Are the source files being duplicated in the projects on purpose? Is this just a cmake issue?
Is this just an issue with VS because GCC doesn;t care and just links everything together?
I think i should be able to rearrange the import/export types for windows, and then make olsquery have a depencency to oslexec instead of rebuilding the lexer etc. And for any of the other projects(i think the others are better).
And make sure the projects use the library imports rather than building the code themselves?
Or should i get them to build duplicating the code in areas and just fix the special cases with more defines.
I prefer the first option, and at first i could probably isolate it to windows in cmake and the source. But maybe its a issue for gcc as well in some areas.
Or maybe oslquery needs to run standalone you dont want to inlcude a dll/so.
On Thu, Jan 21, 2010 at 12:39 AM, Wormszer <worm...@...>
I have mcpp integrated into the compiler now. Working like CPP and writing everything to stdout.
A few things, the binary available for download at least on windows doesn't support forcing an include file.
So i had to build it from source, luckily it wasn't to difficult to create a new project for it.
I built it as VS for VS. Now that I think about it I bet I could build it as VS for GCC so that it would support the same command line options.
Another weird issue was I guess the lexer doesn't support c-style /* comments? These might not be defined in the osl language, and if so probably should be removed from the stdosl.h.
Its the only difference i could see, that could of been causing the error.
CL would remove the */ */ comments at the end of the math defines in stdosl.h even though i told it to preserve comments.
mcpp when i told it to leave comments would actually leave them in there(seems like correct behavior), and then the lexer would crash.
I am not sure why comments are needed really at this point, and i think i must of included them for my own debugging, i don't think CPP was set to output them.
Thanks for the suggestions on a easier solution to the pre-processor issue.
I looked real quick for the boost but mcpp seemed easier since i could just get a binary and set it in my path. (but then i had to rebuild it)
Well now to see if I can get anything to happen with my compiled shaders.
On Wed, Jan 20, 2010 at 9:03 PM, Wormszer <worm...@...>
I am fine with either one. I think having something embedded or buildable would be usefull.
Otherwise there maybe issues with different compilers and would probably need some kind of config or something that cmake would generate at least on windows with several versions of VS etc.
Will just have to see how Larry or the other devs feel about using one of those two for Linux builds as well. I would assume it would be wise to have all the preprocessing done with the same tool when possible.
I will look at both real quick but I might lean towards mcpp.
On Jan 20, 2010, at 8:14 PM, Chris Foster <chri...@...
On Thu, Jan 21, 2010 at 11:02 AM, Blair Zajac <bl...@...
The main annoyance with wave is that it causes the compiler to issue truly
horrendous error messages if you get things wrong (the wave internals make
heavy use of template metaprogramming).
(Obviously this is only a problem when integrating wave into the project
source, and that's not really difficult at all.)
There's mcpp which is designed to be an embeddable C-preprocessor.
Ice, which we use at Sony Imageworks for all our middle-tier systems, uses
mcpp for it's own internal IDL type language, so I would recommend that.
mcpp looks nice. In some sense, using wave would mean one less dependency
since OSL already relies on boost, but it does mean linking to libboost-wave,
so if you have a modular boost install the point may be moot...
PS: Sorry to Blair for the duplicate message. I intended to send it
to the list :-(