Reviewing merge request #15: My two bug fixes
1. Mac JAR files need to include the qt_menu.nib files.
2. The OS independent JAR file (qtjambi-4.7.x.jar) should not have hard coded MingW library paths to load. If this was built for MSVC it fails. The MingW builds should already handle loading those libraries properly through the deployment XML file -- though someone on MingW should probably validate that.
Commits that would be merged:
- 36f121e
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
36f121e-2895bc2Comments
I don’t know why it’s showing your changes from typesystem_phonon-common.xml — I merged in your updates to master this morning. The two important files are PlatformJarTask.java and Utilities.java.
There are several other “commits” and “reverts” under the scenes where I was waxing philosophical.
For Utilities.java modifications, those are needed for MinGW builds to work. Instead of removing those lines, please make it to happen only for MinGW and not for MSVC. I’m sorry, but I’m MinGW only guy.
Instead of using QTDIR, open setenv.xml and study how QTDIR is extracted to vars and adjust those paths regarding them. I don’t have Mac so I can’t do it myself really well, so I’d prefer you to do it.
Otherwise it’s good, job well done.
I agree on the QTDIR item and will see what I can do.
As for the MINGW/MSVC issue you aren’t understanding me. This should NOT be here in the default file that all of the OS/Compiler combinations run. It should absolutely be controlled by the deployment.xml which is designed to handle loading necessary libraries — and from what I looked at it should already work. As the MINGW guy, can you make that work?
I talked with odin_ and he promised to rewrite that loading system. The thing is, that it’s so horrible that if you put those libraries in deployment spec, they aren’t loaded in correct order and place, rendering mingw builds not work. Unlike Linux, Windows doesn’t fallback to CWD with library loading, so you must manually instruct it to load the library before you load the one that needs it.
If you want to contribute to it, please contact to him. Otherwise I think you are better off just add the restriction that they’re not loaded in MSVC builds.
All these changes are provided in master via some patch or other now. So am closing as rejected.
We shall see if MaxOSX users like the result in the release of 4.7.4beta4 next week. But the qt_menu.nib subdirectory should be included in the JAR.
This has been fully tested on MacOSX and since http://qt.gitorious.org/qt-jambi/qtjambi-community/commit/066412bcd35ede32b986c888055d3ecb51f8eed7 should be working.


Add a new comment:
Login or create an account to post a comment