valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 02:45:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CI broken, reverting following PRs

Browse Source 
reverted https://github.com/apache/thrift/pull/2025
reverted https://github.com/apache/thrift/pull/2026
Reverted https://github.com/apache/thrift/pull/2021
This commit is contained in:
Jens Geyer 2020-02-26 22:01:18 +01:00
parent 56700e469d
commit 1b7b00cde9
6 changed files with 0 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -113,14 +113,6 @@ if(BUILD_JAVA)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib/java)
endif()
if(BUILD_JAVASCRIPT)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib/js)
endif()
if(BUILD_NODEJS)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib/nodejs)
endif()
if(BUILD_PYTHON)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib/py)
if(BUILD_TESTING)

4
compiler/cpp/CMakeLists.txt
View File

@ -115,10 +115,6 @@ set_target_properties(thrift-compiler PROPERTIES OUTPUT_NAME thrift)
target_link_libraries(thrift-compiler parse)
add_custom_command(TARGET thrift-compiler POST_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_SOURCE_DIR}/compiler/cpp"
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/bin/thrift${CMAKE_EXECUTABLE_SUFFIX}" "${CMAKE_SOURCE_DIR}/compiler/cpp/")
install(TARGETS thrift-compiler DESTINATION bin)
if(BUILD_TESTING)

45
lib/js/CMakeLists.txt
View File

@ -1,45 +0,0 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.
#
if(NOT JAVASCRIPT_INSTALL_DIR)
if(IS_ABSOLUTE "${LIB_INSTALL_DIR}")
set(JAVASCRIPT_INSTALL_DIR "${LIB_INSTALL_DIR}/js")
else()
set(JAVASCRIPT_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/js")
endif()
endif()
if(IS_ABSOLUTE "${DOC_INSTALL_DIR}")
set(JAVASCRIPT_DOC_INSTALL_DIR "${DOC_INSTALL_DIR}/js")
else()
set(JAVASCRIPT_DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}/js")
endif()
add_custom_target(ThriftJavascript ALL
COMMENT "Building Javascript library using npm + Grunt Wrapper"
COMMAND npm install
COMMAND npx grunt
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist/
DESTINATION ${JAVASCRIPT_INSTALL_DIR}
FILES_MATCHING PATTERN "thrift*.js")
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/
DESTINATION ${JAVASCRIPT_DOC_INSTALL_DIR})

1
lib/js/Makefile.am
View File

@ -58,6 +58,5 @@ EXTRA_DIST = \
package.json \
package-lock.json \
README.md \
CMakeLists.txt \
src \
test

44
lib/nodejs/CMakeLists.txt
View File

@ -1,44 +0,0 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you 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.
#
if(NOT NODEJS_INSTALL_DIR)
if(IS_ABSOLUTE "${LIB_INSTALL_DIR}")
set(NODEJS_INSTALL_DIR "${LIB_INSTALL_DIR}/nodejs")
else()
set(NODEJS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/nodejs")
endif()
endif()
# Currently no doc
#if(IS_ABSOLUTE "${DOC_INSTALL_DIR}")
# set(NODEJS_DOC_INSTALL_DIR "${DOC_INSTALL_DIR}/nodejs")
#else()
# set(NODEJS_DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}/nodejs")
#endif()
add_custom_target(ThriftNodeJS ALL
COMMENT "Installing NodeJS dependencies npm"
COMMAND npm install
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/
DESTINATION ${NODEJS_INSTALL_DIR})
#install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/
# DESTINATION ${NODEJS_DOC_INSTALL_DIR})

1
lib/nodejs/Makefile.am
View File

@ -42,5 +42,4 @@ EXTRA_DIST = \
lib \
test \
coding_standards.md \
CMakeLists.txt \
README.md