[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-25 Thread noreply 
The proposal to merge lp:~zorba-coders/zorba/util-jvm-windows-fix into 
lp:zorba/util-jvm-module has been updated.

Status: Approved => Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-25 Thread Zorba Build Bot 
Validation queue job util-jvm-windows-fix-2012-05-25T18-11-46.465Z is finished. 
The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-25 Thread Zorba Build Bot 
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/util-jvm-windows-fix-2012-05-25T18-11-46.465Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-25 Thread Chris Hillery 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-25 Thread Chris Hillery 
The proposal to merge lp:~zorba-coders/zorba/util-jvm-windows-fix into 
lp:zorba/util-jvm-module has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-25 Thread Chris Hillery 
Ok, Matthias and I did some testing and confirmed that yes, CMake does add this 
#define. So, thank you, Ghislain - I learn something every day.

Given that, I've gone ahead and removed the explicit #defines for 
util_jvm_EXPORTS and will run it through the queue now.
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-25 Thread Ghislain Fourny 
I updated the code accordingly.
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-25 Thread Ghislain Fourny 
Apparently CMake adds this preprocessor definition automatically (name of 
target + _EXPORTS). I thought it was only on Windows, but it seems that, if I 
add an explicit #define, other OSs also complain with a warning that it is 
already there. Since it is only a warning, I could still add it to be on the 
safe side. What do you think?
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-25 Thread Chris Hillery 
Review: Needs Information

Ok, I now understand why this is necessary. However, I have another question - 
doesn't somebody need to define util_jvm_EXPORTS somewhere? Otherwise the 
symbols won't be exported. Either that, or the #ifdef condition is backwards.
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Zorba Build Bot 
The proposal to merge lp:~zorba-coders/zorba/util-jvm-windows-fix into 
lp:zorba/util-jvm-module has been updated.

Status: Approved => Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Zorba Build Bot 
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, 
Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Needs Information.
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Zorba Build Bot 
Validation queue job util-jvm-windows-fix-2012-05-22T21-03-45.027Z is finished. 
The final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Chris Hillery 
Review: Needs Information

As for the change, can you explain why it is necessary? Why is ZORBA_DLL_PUBLIC 
insufficient for this case? Do we need to update that macro as well?
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Zorba Build Bot 
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/util-jvm-windows-fix-2012-05-22T21-03-45.027Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Chris Hillery 
The proposal to merge lp:~zorba-coders/zorba/util-jvm-windows-fix into 
lp:zorba/util-jvm-module has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Chris Hillery 
Launchpad screw up again. Restarting.
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Zorba Build Bot 
The proposal to merge lp:~zorba-coders/zorba/util-jvm-windows-fix into 
lp:zorba/util-jvm-module has been updated.

Status: Approved => Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Zorba Build Bot 
The attempt to merge lp:~zorba-coders/zorba/util-jvm-windows-fix into 
lp:zorba/util-jvm-module failed. Below is the output from the failed tests.


CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 
(message):
  Validation queue job util-jvm-windows-fix-2012-05-22T15-36-41.824Z is
  finished.  The final status was:

  

  Undetermined, probably an error - please email chill...@lambda.nu with the
  number of this job!


Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Zorba Build Bot 
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/util-jvm-windows-fix-2012-05-22T15-36-41.824Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Matthias Brantner 
The proposal to merge lp:~zorba-coders/zorba/util-jvm-windows-fix into 
lp:zorba/util-jvm-module has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Matthias Brantner 
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module

2012-05-22 Thread Ghislain Fourny 
Ghislain Fourny has proposed merging 
lp:~zorba-coders/zorba/util-jvm-windows-fix into lp:zorba/util-jvm-module.

Requested reviews:
  Chris Hillery (ceejatec)
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777

Fixed DLL import which did not work under Windows.
-- 
https://code.launchpad.net/~zorba-coders/zorba/util-jvm-windows-fix/+merge/106777
Your team Zorba Coders is subscribed to branch lp:zorba/util-jvm-module.
=== modified file 'include/JavaVMSingleton.h'
--- include/JavaVMSingleton.h	2012-04-05 09:16:22 +
+++ include/JavaVMSingleton.h	2012-05-22 10:32:32 +
@@ -20,12 +20,33 @@
 #include 
 #include 
 
+# if defined WIN32 || defined CYGWIN
+#   ifdef util_jvm_EXPORTS
+# ifdef __GNUC__
+#   define UTIL_JVM_DLL_PUBLIC __attribute__((dllexport))
+# else
+#   define UTIL_JVM_DLL_PUBLIC __declspec(dllexport)
+# endif /* __GNUC__ */
+#   else /* util_jvm_EXPORTS */
+# ifdef __GNUC__
+#   define UTIL_JVM_DLL_PUBLIC __attribute__((dllimport))
+# else
+#   define UTIL_JVM_DLL_PUBLIC __declspec(dllimport)
+# endif /* __GNUC__ */
+#   endif /* util_jvm_EXPORTS */
+# else
+#   if __GNUC__ >= 4
+# define UTIL_JVM_DLL_PUBLIC __attribute__ ((visibility("default")))
+#   else
+# define UTIL_JVM_DLL_PUBLIC
+#   endif
+# endif
 
 namespace zorba { namespace jvm {
 
 class VMOpenException {};
 
-class ZORBA_DLL_PUBLIC JavaVMSingleton
+class UTIL_JVM_DLL_PUBLIC JavaVMSingleton
 {
 public:
   static JavaVMSingleton* getInstance(const char* classPath);

=== modified file 'src/JavaVMSingleton.cpp'
--- src/JavaVMSingleton.cpp	2012-05-18 10:36:07 +
+++ src/JavaVMSingleton.cpp	2012-05-22 10:32:32 +
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "JavaVMSingleton.h"
+
 #include 
 #include 
 #include 
@@ -22,7 +24,6 @@
 #include 
 #include 
 
-#include "JavaVMSingleton.h"
 #include 
 #include 
 #include 

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp