Zorba

Merge lp:~zorba-coders/zorba/fix-unversioned-modules into lp:zorba

  1. fix-unversioned-modules
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Approved by: Chris Hillery
Approved revision: 10635
Merged at revision: 10635
Proposed branch: lp:~zorba-coders/zorba/fix-unversioned-modules
Merge into: lp:zorba
Diff against target: 36 lines (+7/-1)
2 files modified
ChangeLog (+1/-0)
cmake_modules/ZorbaModule.cmake (+6/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix-unversioned-modules
Reviewer Review Type Date Requested Status
Dennis Knochenwefel Approve
Chris Hillery Approve
Review via email: mp+90600@code.launchpad.net

Commit message

Fix filename when creating library for unversioned module.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Dennis Knochenwefel (dennis-knochenwefel) wrote :

works

review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-unversioned-modules-2012-01-30T15-55-03.444Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job fix-unversioned-modules-2012-01-30T15-55-03.444Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2012-01-26 22:26:04 +0000
3+++ ChangeLog 2012-01-29 10:12:24 +0000
4@@ -31,6 +31,7 @@
5 * Deprecated StaticContext:getNamespaceURIByPrefix()
6 * Fixed bug #918211 (xqueryx fulltext w3c conformance generation)
7 * Fixed bug #918157 (Add XQFTTS to validation queue)
8+ * Fixed bug with unversioned modules with C++ external functions
9
10 version 2.1
11
12
13=== modified file 'cmake_modules/ZorbaModule.cmake'
14--- cmake_modules/ZorbaModule.cmake 2011-12-21 14:40:33 +0000
15+++ cmake_modules/ZorbaModule.cmake 2012-01-29 10:12:24 +0000
16@@ -250,6 +250,11 @@
17 SET(module_lib_target "modlib${num_zorba_modules}_${module_name}")
18 ADD_LIBRARY(${module_lib_target} SHARED ${SRC_FILES})
19 GET_FILENAME_COMPONENT(module_filewe "${module_filename}" NAME_WE)
20+ IF (MODULE_VERSION)
21+ # If there's a version, insert it into the module library name
22+ SET (module_filewe "${module_filewe}_${MODULE_VERSION}")
23+ ENDIF (MODULE_VERSION)
24+
25 # It seems like it would be nice to set the VERSION and/or
26 # SOVERSION target properties here. However: On Windows, it
27 # doesn't seem to do anything (the .rc file configured above
28@@ -260,7 +265,7 @@
29 # target property isn't desirable.
30 # FOLDER is to group IDE projects into folders.
31 SET_TARGET_PROPERTIES (${module_lib_target} PROPERTIES
32- OUTPUT_NAME "${module_filewe}_${MODULE_VERSION}${SUFFIX}"
33+ OUTPUT_NAME "${module_filewe}${SUFFIX}"
34 ${target_type}_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${module_name}.src"
35 FOLDER "Modules"
36 )

Subscribers

People subscribed via source and target branches