← Back to team overview

zorba-coders team mailing list archive

[Merge] lp:~zorba-coders/zorba/bug1068366 into lp:zorba

 

Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1068366 into lp:zorba.

Requested reviews:
  Rodolfo Ochoa (rodolfo-ochoa)
Related bugs:
  Bug #1068366 in Zorba: "Zorba 2.7 Java API gives specified procedure could not be found"
  https://bugs.launchpad.net/zorba/+bug/1068366

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1068366/+merge/158727

Fix that forces to seek first on Zorba directory for libraries from Zorba CMD.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1068366/+merge/158727
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeCPackOptions.cmake.in'
--- CMakeCPackOptions.cmake.in	2013-02-07 17:24:36 +0000
+++ CMakeCPackOptions.cmake.in	2013-04-12 22:50:36 +0000
@@ -28,7 +28,7 @@
   SET(CPACK_NSIS_CONTACT "info@xxxxxxxxxxxxxx")
   
   SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
-    CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Zorba Command Line Client.lnk' 'cmd.exe' '/K set path=%path%;%JAVA_HOME%;%JAVA_HOME%\\client;%cd%\\bin;&echo Start using Zorba: zorba -q 1+1  or  zorba -f -q example.xq'
+    CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Zorba Command Line Client.lnk' 'cmd.exe' '/K set path=%cd%\\bin;%JAVA_HOME%;%JAVA_HOME%\\client;%path%;&echo Start using Zorba: zorba -q 1+1  or  zorba -f -q example.xq'
     CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Zorba Documentation.lnk' '$INSTDIR\\\\share\\\\doc\\\\zorba-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\\zorba\\\\html\\\\index.html'
     CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Modules Documentation.lnk' '$INSTDIR\\\\share\\\\doc\\\\zorba-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\\zorba\\\\xqdoc\\\\xhtml\\\\index.html'
     ")


Follow ups