Chris Hillery has proposed merging 
lp:~zorba-coders/zorba/bug-1135003-remove-static-build into lp:zorba.

Commit message:
Removed ZORBA_BUILD_STATIC_LIBRARY (has been nonfunctional for a long time).

Requested reviews:
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1135003-remove-static-build/+merge/180452


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1135003-remove-static-build/+merge/180452
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeConfiguration.txt'
--- CMakeConfiguration.txt	2013-07-02 09:28:20 +0000
+++ CMakeConfiguration.txt	2013-08-16 00:55:02 +0000
@@ -95,20 +95,7 @@
 SET(ZORBA_VERIFY_PEER_SSL_CERTIFICATE OFF CACHE BOOL "Disable root certificate validation")
 MESSAGE(STATUS "ZORBA_VERIFY_PEER_SSL_CERTIFICATE:    " ${ZORBA_VERIFY_PEER_SSL_CERTIFICATE})
 
-IF(${ZORBA_WITH_CODE_PROFILE})
-  SET(ZORBA_BUILD_STATIC_LIBRARY ON CACHE BOOL "build a static library, e.g. when creating a profile")
-ELSE(${ZORBA_WITH_CODE_PROFILE})
-  SET(ZORBA_BUILD_STATIC_LIBRARY OFF CACHE BOOL "build a static library, e.g. when creating a release")
-ENDIF(${ZORBA_WITH_CODE_PROFILE})
-MESSAGE(STATUS "ZORBA_WITH_CODE_PROFILE:              " ${ZORBA_WITH_CODE_PROFILE})
-
-MESSAGE(STATUS "ZORBA_BUILD_STATIC_LIBRARY:           " ${ZORBA_BUILD_STATIC_LIBRARY})
-
-IF(MSVC AND NOT ZORBA_BUILD_STATIC_LIBRARY)
-  SET(ZORBA_WIN_DLL ON)
-ELSE (MSVC AND NOT ZORBA_BUILD_STATIC_LIBRARY)
-  SET(ZORBA_WIN_DLL   OFF)
-ENDIF (MSVC AND NOT ZORBA_BUILD_STATIC_LIBRARY)
+SET(ZORBA_WIN_DLL ON)
 MESSAGE(STATUS "ZORBA_WIN_DLL:                        " ${ZORBA_WIN_DLL})
 
 # We need the path to the zorba executable because it will be used during the

=== modified file 'cmake_modules/ZorbaGenerateExe.cmake'
--- cmake_modules/ZorbaGenerateExe.cmake	2013-02-07 17:24:36 +0000
+++ cmake_modules/ZorbaGenerateExe.cmake	2013-08-16 00:55:02 +0000
@@ -17,12 +17,10 @@
 # ZORBA_STORE_NAME and creates one executable with this name.
 # Per convention, the source file that contains the main function of the executable must be located in 
 # the directory where this macro is executabed and must the following name: '${EXE_NAME}.cpp'. 
-# If the cmake variable ZORBA_BUILD_STATIC_LIBRARY is set to "ON", the macro produces additinally a 
-# static executable.
 #
-# The resulting executable has the name ${EXE_NAME}_${ZORBA_STORE_NAME} or 
-# ${EXE_NAME}_${ZORBA_STORE_NAME}_static if the store name is not equal "simplestore". Otherwise, 
-# the name is ${EXE_NAME} or ${EXE_NAME}_static.
+# The resulting executable has the name ${EXE_NAME}_${ZORBA_STORE_NAME} 
+# if the store name is not equal "simplestore". Otherwise, 
+# the name is ${EXE_NAME}.
 #
 # Synatx:
 # 
@@ -91,22 +89,6 @@
     ENDIF (MSVC_IDE)
   ENDIF (WIN32)
   
-  IF (ZORBA_BUILD_STATIC_LIBRARY)
-    ADD_EXECUTABLE ("${EXE_NAME}${SUFFIX}_static" ${SRCS})
-    SET_TARGET_PROPERTIES ("${EXE_NAME}${SUFFIX}_static" PROPERTIES COMPILE_DEFINITIONS BUILDING_ZORBA_STATIC)
-    TARGET_LINK_LIBRARIES (
-      "${EXE_NAME}${SUFFIX}_static" 
-      "zorba_${ZORBA_STORE_NAME}_static"
-      ${DEPEND_LIBS}
-    )
-    IF (NOT ${NEW_NAME} STREQUAL "")
-      SET_TARGET_PROPERTIES ("${EXE_NAME}${SUFFIX}_static" PROPERTIES OUTPUT_NAME "${NEW_NAME}${SUFFIX}_static")
-    ENDIF (NOT ${NEW_NAME} STREQUAL "")
-    IF (INSTALL_DESTINATION)
-      INSTALL (TARGETS "${EXE_NAME}${SUFFIX}_static" DESTINATION ${INSTALL_DESTINATION})
-    ENDIF (INSTALL_DESTINATION)
-  ENDIF (ZORBA_BUILD_STATIC_LIBRARY)
-
 ENDMACRO (ZORBA_GENERATE_EXE)
 
 

=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2013-08-09 09:04:36 +0000
+++ cmake_modules/ZorbaModule.cmake	2013-08-16 00:55:02 +0000
@@ -909,11 +909,6 @@
       STRING (REPLACE "/${CMAKE_CFG_INTDIR}" "" TARGET_LOCATION ${TARGET_LOCATION})
     ENDIF (MSVC_IDE)
     STRING (REPLACE ".exe" ".bat" TARGET_LOCATION ${TARGET_LOCATION})
-  ELSE(WIN32)
-    # if building the static library, always use the static executables for testing
-    IF (ZORBA_BUILD_STATIC_LIBRARY)
-      SET(TARGET_LOCATION "${TARGET_LOCATION}_static")
-    ENDIF (ZORBA_BUILD_STATIC_LIBRARY)
   ENDIF(WIN32)
 
   ADD_TEST ("${NAME}" "${TARGET_LOCATION}" ${ARGS})

=== removed file 'scripts/create_release.txt'
--- scripts/create_release.txt	2013-02-07 17:24:36 +0000
+++ scripts/create_release.txt	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-# http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# create a branch
-
-# configure
-mkdir dist
-cd dist
-cmake -D CMAKE_BUILD_TYPE=MinSizeRel -D ZORBA_BUILD_STATIC_LIBRARY=ON -D CMAKE_SKIP_BUILD_RPATH=TRUE ..
-# build
-make && make doc
-
-# test
-ctest
-
-# create binary packages
-cpack
-# create source package
-cpack -G TGZ --config CPackSourceConfig.cmake

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-02-07 17:24:36 +0000
+++ src/CMakeLists.txt	2013-08-16 00:55:02 +0000
@@ -232,29 +232,6 @@
 SET_TARGET_PROPERTIES(zorba_${ZORBA_STORE_NAME} PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 
 #
-# Build the Zorba STATIC library
-#
-IF (ZORBA_BUILD_STATIC_LIBRARY)
-  # Set the ar append flag to "q" instead of "r", which could create incomplete archives by replacing the files with the same names
-  SET(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> <LINK_FLAGS> q <TARGET> <OBJECTS>")
-  SET(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> <LINK_FLAGS> q <TARGET> <OBJECTS>")
-
-  ADD_LIBRARY(zorba_${ZORBA_STORE_NAME}_static STATIC ${ZORBA_SRCS} ${STORE_SRCS})
-  LIST(APPEND ZORBA_LIBRARY_INSTALL_LIST zorba_${ZORBA_STORE_NAME}_static)
-  SET_TARGET_PROPERTIES(zorba_${ZORBA_STORE_NAME}_static PROPERTIES COMPILE_DEFINITIONS BUILDING_ZORBA_STATIC)
-  SET_TARGET_PROPERTIES(zorba_${ZORBA_STORE_NAME}_static PROPERTIES VERSION ${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})  
-  SET_TARGET_PROPERTIES(zorba_${ZORBA_STORE_NAME}_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)  
-  TARGET_LINK_LIBRARIES(zorba_${ZORBA_STORE_NAME}_static ${requiredlibs})
-
-  # on windows, the static lib needs a different name because .lib is already generated when creating the .dll 
-  # on unix, the static library can have the same name because it uses a different file suffix (e.g. .a)
-  IF (UNIX)
-    SET_TARGET_PROPERTIES(zorba_${ZORBA_STORE_NAME}_static PROPERTIES OUTPUT_NAME "zorba_${ZORBA_STORE_NAME}")      
-  ENDIF (UNIX)
-ENDIF (ZORBA_BUILD_STATIC_LIBRARY)
-
-
-#
 # Specify where the zorba libs are to be installed
 # LIB_SUFFIX will be `64' on 64 bit processor
 #

-- 
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

Reply via email to