Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

binary releases of cleos and keosd #5727

Closed
wants to merge 6 commits into from
Closed

binary releases of cleos and keosd #5727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9d30b27
made changes to allow for binary release of cleos, keosd and nodeos
larryk85 Sep 17, 2018
690a578
fixed postinst
larryk85 Sep 18, 2018
f196b3a
add rpm
larryk85 Sep 18, 2018
c1e5d10
remove nodeos from the binary list for now
larryk85 Sep 18, 2018
c94843e
reverted wabt
larryk85 Sep 18, 2018
ee6dba7
disable generation and installation of wabt tools
larryk85 Sep 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CMakeModules/installer.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ if(WIN32)
set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
elseif(APPLE)
set(CPACK_GENERATOR "DragNDrop")
elseif(RPM_PACKAGE)
set(CPACK_GENERATOR "RPM")
set(CPACK_RPM_PACKAGE_RELEASE 0)
set(CPACK_RPM_PACKAGE_LICENSE "MIT")
set(CPACK_RPM_PACKAGE_URL "https://github.com/EOSIO/eos")
else()
set(CPACK_GENERATOR "DEB")
set(CPACK_DEBIAN_PACKAGE_RELEASE 0)
Expand Down
4 changes: 4 additions & 0 deletions debian/postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ case "$1" in
adduser --no-create-home --group --system ${USER}
fi
set -e
touch /var/log/${PACKAGE}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All references to /var/log, /var/lib, and /etc should be eliminated. None of those directories are used by the software by default or explicitly by the documentation. Instead, that information is all kept in ~/.local/share/eosio. The old packages needed to install a genesis.json file, which is also no longer required.

With the elimination of installation to both /var and /etc, it's likely that usage of CMAKE_INSTALL_FULL_* is no longer required for any component.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I follow what you expect.

message(WARNING ${CMAKE_INSTALL_FULL_BINDIR})
message(WARNING ${CMAKE_INSTALL_BINDIR})

This gives

CMake Warning at CMakeLists.txt:12 (message):
  /usr/local/bin
CMake Warning at CMakeLists.txt:13 (message):
  bin

mkdir -p /var/lib/${PACKAGE}
mkdir -p /etc/${PACKAGE}
mkdir -p /etc/${PACKAGE}/node_00
chown ${USER}:${GROUP} /var/log/${PACKAGE}
chown ${USER}:${GROUP} /var/lib/${PACKAGE}
chown ${USER}:${GROUP} /etc/${PACKAGE}
Expand Down
2 changes: 1 addition & 1 deletion externals/binaryen
Open in desktop
Submodule binaryen updated 1 files
+1 −1 CMakeLists.txt
1 change: 1 addition & 0 deletions libraries/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ add_subdirectory( abi_generator )

#turn these off for now
set(BUILD_TESTS OFF CACHE BOOL "Build GTest-based tests")
set(BUILD_TOOLS OFF CACHE BOOL "Build wabt tools")
set(RUN_RE2C OFF CACHE BOOL "Run re2c")
add_subdirectory( wabt )
6 changes: 3 additions & 3 deletions libraries/builtins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ target_include_directories( builtins PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
install ( TARGETS
builtins

RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
)
2 changes: 1 addition & 1 deletion libraries/wabt
Open in desktop
Submodule wabt updated 1 files
+5 −0 CMakeLists.txt
2 changes: 1 addition & 1 deletion libraries/wasm-jit/Source/Programs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
add_executable(eosio-wast2wasm Assemble.cpp CLI.h)
target_link_libraries(eosio-wast2wasm Logging IR WAST WASM)
set_target_properties(eosio-wast2wasm PROPERTIES FOLDER Programs)
INSTALL(TARGETS eosio-wast2wasm DESTINATION ${CMAKE_INSTALL_BINDIR})
INSTALL(TARGETS eosio-wast2wasm DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})

add_executable(Disassemble Disassemble.cpp CLI.h)
target_link_libraries(Disassemble Logging IR WAST WASM)
Expand Down
4 changes: 2 additions & 2 deletions libraries/wasm-jit/Source/WASM/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ add_definitions(-DWEBASSEMBLY_API=DLL_EXPORT)
target_link_libraries(WASM Logging IR)

install(TARGETS WASM
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
2 changes: 1 addition & 1 deletion programs/cleos/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ target_link_libraries( ${CLI_CLIENT_EXECUTABLE_NAME}
install( TARGETS
${CLI_CLIENT_EXECUTABLE_NAME}

RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
)
2 changes: 1 addition & 1 deletion programs/keosd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ mas_sign(${KEY_STORE_EXECUTABLE_NAME})
install( TARGETS
${KEY_STORE_EXECUTABLE_NAME}

RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
)