Refactor library build configuration #157
Conversation
…tory to exclude the target and all its dependencies. To do that, remove libraries from WITH_NDLLS, since that list works as a list of physical files in the build directory. Move CMake configuration code to each library's subdirectory. Move add_subdirectory(libs) to the end of master CMake file, enabling it to read all settings. Fix libs that grab files from other directories (besides vm, leave that for later). Add static libraries for socket and sha1 and link them in instead of referencing files directly in dependent libraries. Finally, remove WITH_NDLLS and update README to reflect new settings.
…s used. Move add_dependency calls that download sources down to subdirectories that use those sources.
…vior since CPack creates a package according to CMake config rules and ndlls are set to be installed in lib/neko. Remove references to EXCLUDE_X_FROM_ALL variables from lib builds - since we are only building what we have configured it is unnecessary to exclude ndll targets from default target. Disable verbose output of tar (unpack) in Travis CI (revert previous commit).
…cmake_refactor
.travis.yml
Outdated
| @@ -59,7 +59,8 @@ install: | |||
| make source_archive_fat && | |||
| tar xf bin/neko-*-${TRAVIS_OS_NAME}*.tar.gz && | |||
| cd neko-*-${TRAVIS_OS_NAME}* && | |||
| export PATH=`pwd`:$PATH; | |||
| export PATH=`pwd`:$PATH && | |||
| export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib/neko; | |||
There was a problem hiding this comment.
Does LD_LIBRARY_PATH really need to be modified?
With RELOCATABLE=ON, I think it can find libneko. Or is libneko being outputted to somewhere else?
There was a problem hiding this comment.
Good catch, thank you. NEKOPATH should be used instead, NDDLs are in that directory.
There was a problem hiding this comment.
I fixed that in next commit
|
I think it is better to preserve the original flat archive structure, i.e. ndll files are placed next to libneko and others. Although I agree it is good to have a structure identical to how the files are installed, the archives are already being used in the wild, so changing its structure will break people's code. e.g. The TravisCI Haxe support use the binary archive to install Neko. |
|
There must be a way to preserve archive structure, I will look for it.
…On 02/20/2017 19:08, Andy Li wrote:
I think it is better to preserve the original flat archive structure,
i.e. ndll files are placed next to libneko and others. Although I
agree it is good to have a structure identical to how the files are
installed, the archives are already being used in the wild, so
changing its structure will break people's code. e.g. The TravisCI
Haxe support use the binary archive to install Neko.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#157 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/ADMNdQk5yMbIdRul3GuvI18BFMbKzJ9Cks5relUWgaJpZM4MFBDw>.
|
|
I found the layout "fixer" script, just needed to run that after installing ndlls in the new CMake files. Will update the PR tonight. |
…s in libs. CMakeLists.txt - define a variable for "flatten" script location libs - run the script on new targets .travis.yml - revert NEKOPATH change, it is not needed with flat archive
|
Now it should be back to the flat archive layout. |
Move CMake code that builds ndll libraries down into their own directories in libs. Exclude both the library and its dependencies from the build if disabled via "WITH" CMake variables.
This change replaces WITH_NDLLS with a set of "WITH" variables, roughly one per optional library (mod_neko and mod_tora share one). It also brings the structure of "package" archive closer to structure of install directory (NDLLs appear in lib subdirectory).
Will fix #143